Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1

87 files changed, 27277 insertions, 13455 deletions

diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index c9f888cc..5d2e4bdf 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -33,8 +33,11 @@ N:1:of Galadriel
 I:39:100:4
 W:20:10:10:10000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEARCH | LITE3 | LUCK
-F:INSTA_ART | HIDE_TYPE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:LUCK
 a:LIGHT
 D:A small crystal phial, with the light of Earendil's Star contained inside.  
 D:Its light is imperishable, and near it darkness cannot endure.
@@ -46,8 +49,14 @@ N:2:of Elendil
 I:39:101:1
 W:30:25:5:32500
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE |
-F:INSTA_ART | SPEED | LITE3 | LITE1 | HIDE_TYPE
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:LITE3
+F:SEE_INVIS
+F:SPEED
 a:MAP_LIGHT
 Z:detect curses
 D:The shining Star of the West, a famed heirloom of Elendil's house.
@@ -61,8 +70,19 @@ N:3:of Thrain
 I:39:102:3
 W:50:50:5:50000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_CHAOS | HIDE_TYPE | LUCK
-F:INSTA_ART | SPEED | RES_LITE | RES_DARK | ESP_ORC | LITE3 | SPECIAL_GENE
+F:ACTIVATE
+F:ESP_ORC
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
 a:THRAIN
 D:A great globe seemingly filled with moonlight, the famed Heart of the 
 D:Mountain, which splinters the light that falls upon it into a thousand 
@@ -73,8 +93,13 @@ D:glowing shards.
 N:4:of Annatar
 I:40:10:10
 W:70:30:3:90000
-F:HIDE_TYPE | MANA | LIFE | SPELL | DRAIN_EXP | AGGRAVATE
+F:AGGRAVATE
+F:DRAIN_EXP
+F:HIDE_TYPE
 F:INSTA_ART
+F:LIFE
+F:MANA
+F:SPELL
 D:This fiery golden circle once belonged to one who was known to the elves 
 D:of Eregion as 'The Lord of Gifts'. Treacherous were his gifts, as was his 
 D:teaching. Sauron the Sorcerer lurked behind the guise and his gifts, like 
@@ -85,10 +110,18 @@ D:this necklace, were not without cost.
 N:5:of Ingwe
 I:40:11:3
 W:65:30:3:90000
-F:INT | WIS | CHR | SEARCH | INFRA | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | ACTIVATE | 
-F:RES_ACID | RES_COLD | RES_ELEC | 
+F:ACTIVATE
+F:CHR
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:WIS
 a:DISP_EVIL
 D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing 
 D:of evil could stand.
@@ -100,9 +133,19 @@ D:of evil could stand.
 N:6:'Nauglamir'
 I:40:12:3
 W:70:50:3:75000
-F:STR | CON | DEX | INFRA | HIDE_TYPE | RES_FEAR | 
-F:SEE_INVIS | FREE_ACT | REGEN | LITE3 | SPEED | 
-F:INSTA_ART | SPECIAL_GENE
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:LITE3
+F:REGEN
+F:RES_FEAR
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
 a:DIM_DOOR
 D:A carencet of gold, set with a multitude of shining gems of 
 D:Valinor.  Despite its size, its weight seems as that of gossamer.
@@ -114,7 +157,31 @@ N:7:'Ancanaur'
 I:23:32:3
 W:80:120:45:5000000
 P:0:12d12:10:10:0
-F:CHR | CON | DEX | DRAIN_EXP | FREE_ACT | HEAVY_CURSE | HIDE_TYPE | HOLD_LIFE | IM_FIRE | INT | KILL_DEMON | LEVELS | LITE1 | REGEN | RES_DARK | RES_FEAR | RES_NETHER | RES_NEXUS | SEE_INVIS | SHOW_MODS | SLAY_EVIL | SLAY_UNDEAD | SPEED | STR | WIS
+F:CHR
+F:CON
+F:DEX
+F:DRAIN_EXP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_FIRE
+F:INT
+F:KILL_DEMON
+F:LEVELS
+F:LITE1
+F:REGEN
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 Z:mind blast
 D:"The Jaws of Fire", this is the sword that Feanor forged in secret 
 D:to do battle against his enemies. The sword which threatened Fingolfin, 
@@ -125,9 +192,19 @@ D:the sword which in the end did not prevent its owner's untimely death.
 N:8:of Barahir
 I:45:32:1
 W:50:25:2:75000
-F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE | 
-F:RES_POIS | RES_DARK | ACTIVATE | SEE_INVIS | SEARCH |
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
 F:INSTA_ART
+F:INT
+F:RES_DARK
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:STR
+F:WIS
 a:BARAHIR
 D:A ring shaped into twinned serpents with eyes of emerald meeting beneath 
 D:a crown of flowers, an ancient treasure of Isildur's house.
@@ -140,7 +217,13 @@ N:9:'Dramborleg'
 I:24:30:5
 W:90:60:300:500000
 P:0:5d7:18:25:0
-F:CRIT | HIDE_TYPE | KILL_DEMON | SHOW_MODS | VORPAL | WOUNDING | ACTIVATE
+F:ACTIVATE
+F:CRIT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 a:TULKAS
 D:The great axe of Tuor, Thudder-Sharp is its name. The axe that smote 
 D:both a heavy dint as of a club and cleft as a sword. When it was swung 
@@ -154,11 +237,28 @@ N:10:of Power 'Narya'
 I:45:34:1
 W:70:30:2:100000
 P:0:1d1:6:6:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK
-F:ACTIVATE | FREE_ACT | SEE_INVIS | 
-F:SUST_STR | SUST_CON | SUST_WIS | SUST_CHR | SPECIAL_GENE |
-F:IM_FIRE | RES_NETHER | RES_FEAR | REGEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
+F:INT
+F:LUCK
+F:REGEN
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 a:NARYA
 D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -171,11 +271,28 @@ N:11:of Power 'Nenya'
 I:45:35:2
 W:80:40:2:200000
 P:0:1d1:9:9:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | SUST_CHR |
-F:IM_COLD | RES_BLIND | STEALTH | ESP_ALL | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:ESP_ALL
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_COLD
 F:INSTA_ART
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:RES_BLIND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:STR
+F:SUST_CHR
+F:SUST_INT
+F:SUST_WIS
+F:WIS
 a:NENYA
 D:The Ring of Adamant, with a pure white stone as centrepiece.  Nenya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -188,12 +305,30 @@ N:12:of Power 'Vilya'
 I:45:36:3
 W:90:50:2:300000
 P:0:1d1:12:12:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:FEATHER | SLOW_DIGEST | REGEN | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:IM_ELEC | RES_POIS | RES_DISEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ELEC
 F:INSTA_ART
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:REGEN
+F:RES_DISEN
+F:RES_POIS
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIS
 a:VILYA
 D:The Ring of Sapphire, with clear blue gems that shine like stars, 
 D:glittering untouchable despite all that Sauron ever wrought.  Vilya is 
@@ -207,15 +342,47 @@ N:13:of Power 'The One Ring'
 I:45:37:5
 W:100:100:2:5000000
 P:0:1d1:15:15:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | 
-F:ACTIVATE | AUTO_CURSE | HEAVY_CURSE | INVIS | SPELL | MANA |
-F:SEE_INVIS | REGEN | FREE_ACT | CURSED | CURSE_NO_DROP | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | PERMA_CURSE |
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:SUST_INT | SUST_WIS | SUST_CHR | 
-F:RES_BLIND | RES_POIS | RES_DISEN | RES_NETHER | ESP_ALL | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP | 
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_ALL
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
 F:INSTA_ART
+F:INT
+F:INVIS
+F:MANA
+F:PERMA_CURSE
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SEE_INVIS
+F:SPEED
+F:SPELL
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 a:POWER
 Z:change the world
 D:"Ash nazg durbatuluk, ash nazg gimbatul, ash nazg thrakatuluk agh 
@@ -230,7 +397,8 @@ N:14:of Space-Time
 I:39:105:0
 W:30:12:15:50000
 P:0:1d1:0:0:0
-F:INSTA_ART | LITE1
+F:INSTA_ART
+F:LITE1
 D:A powerful stone that provides a strong light for any who 
 D:wields it. It is rumoured that it may even protect the wearer from 
 D:the passing of time.
@@ -244,8 +412,11 @@ N:15:of Orthanc
 I:39:106:0
 W:15:12:15:20000
 P:0:1d1:0:0:0
-F:ACTIVATE | SPECIAL_GENE | EASY_USE | LITE1 | 
+F:ACTIVATE
+F:EASY_USE
 F:INSTA_ART
+F:LITE1
+F:SPECIAL_GENE
 a:STONE_LORE
 D:The key to the tower of Saruman, which fills your mind 
 D:with images of knowledge and dreadful understanding. It 
@@ -259,10 +430,19 @@ N:16:'Lothronfaun'
 I:38:6:0
 W:90:9:500:400000
 P:30:2d4:-4:0:25
-F:FREE_ACT | IM_ELEC | SPECIAL_GENE |
-F:RES_FIRE | RES_COLD | RES_POIS | RES_LITE | RES_DARK | 
-F:LITE1 | SEE_INVIS | AGGRAVATE | ESP_DRAGON
 F:ACTIVATE
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FREE_ACT
+F:IM_ELEC
+F:LITE1
+F:RES_COLD
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
 a:RAZORBACK
 D:A massive suit of heavy dragon scales deeply saturated with many colours.  
 D:It throbs with angry energies. May-cloud it is called, after the 
@@ -274,12 +454,33 @@ N:17:of the Sun
 I:38:30:0
 W:100:16:600:500000
 P:50:2d4:-8:0:35
-F:HOLD_LIFE | REGEN | ESP_DRAGON | 
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FEATHER | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK | ULTIMATE | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SPECIAL_GENE
 F:ACTIVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
 a:BLADETURNER
 D:A suit of tilkal, set with scales of every colour, surrounded in a nimbus 
 D:of perfectly untramelled yet inextricably intermingled and utterly mastered 
@@ -292,9 +493,20 @@ N:18:of Melkor
 I:22:2:-4
 W:65:45:200:100000
 P:0:4d6:12:24:0
-F:STEALTH | WIS | CURSED | HEAVY_CURSE | TY_CURSE | ESP_GOOD | 
-F:DRAIN_MANA | DRAIN_HP | 
-F:RES_DARK | RES_BLIND | RES_LITE | RES_NETHER | BRAND_POIS | RES_CONF
+F:BRAND_POIS
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:RES_BLIND
+F:RES_CONF
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:STEALTH
+F:TY_CURSE
+F:WIS
 D:The mighty spear used once by Melkor to slay the trees of Valinor.
 
 # The Galvorn Plate Mail of Eol
@@ -303,10 +515,19 @@ N:19:of Eol
 I:37:30:2
 W:75:9:420:300000
 P:40:2d4:-4:0:20
-F:CON | 
-F:HOLD_LIFE | SUST_CON | ESP_UNDEAD | RES_CONF | RES_FEAR | 
-F:RES_ACID | RES_COLD | RES_DARK | RES_NETHER | RES_NEXUS | RES_CHAOS | 
 F:ACTIVATE
+F:CON
+F:ESP_UNDEAD
+F:HOLD_LIFE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SUST_CON
 a:CURE_1000
 D:A suit of imperishable galvorn, with unconquerable strength to endure evil 
 D:and disruptive magics. It protects the life force of its wearer like 
@@ -319,9 +540,14 @@ N:20:of Isildur
 I:37:15:1
 W:30:3:300:50000
 P:25:2d4:0:0:25
-F:CON | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_SOUND | RES_CONF | RES_NEXUS
+F:CON
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SOUND
 D:A gleaming steel suit covering the wearer from neck to foot, with runes of 
 D:warding and stability deeply engraved into its surface.
 
@@ -332,8 +558,18 @@ N:21:of the Rohirrim
 I:37:9:2
 W:30:3:200:30000
 P:19:1d4:0:0:15
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_CONF | RES_SOUND
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STR
 D:A stiff suit of armour composed of small metal plates sewn to an 
 D:inner layer of heavy canvas, and covered with a second layer of 
 D:cloth.  Within it is the spirit of Eorl the Young, matchless in combat.
@@ -345,11 +581,19 @@ N:22:'Belegennon'
 I:37:20:4
 W:40:10:150:135000
 P:28:1d4:-1:0:20
-F:STEALTH | WIS | INT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:HOLD_LIFE | RES_DARK | RES_FEAR |
-F:SEE_INVIS |
 F:ACTIVATE
+F:HOLD_LIFE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:WIS
 a:BELEGENNON
 D:This wondrous suit of fine-linked chain shimmers as though of pure silver.  
 D:It stands untouched amidst the fury of the elements, and a power of 
@@ -362,9 +606,18 @@ N:23:of Celeborn
 I:37:25:4
 W:40:3:250:150000
 P:35:2d4:-3:0:25
-F:STR | CHR | HIDE_TYPE | ESP_ORC
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK | 
-F:RES_DISEN | ACTIVATE
+F:ACTIVATE
+F:CHR
+F:ESP_ORC
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:STR
 a:GENOCIDE
 D:A shimmering suit of true-silver, forged long ago by dwarven smiths of 
 D:legend.  It gleams with purest white as you gaze upon it, and mighty are 
@@ -377,8 +630,16 @@ N:24:of Arvedui
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:-2:0:15
-F:STR | CHR | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SHARDS | RES_NEXUS
+F:CHR
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SHARDS
+F:STR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, well padded 
 D:with leather. You feel strong and tall as Arvedui, last king of Arnor, 
 D:as you put it on.
@@ -390,8 +651,15 @@ N:25:of Caspanion
 I:37:6:3
 W:25:9:270:40000
 P:16:1d4:-2:0:20
-F:INT | WIS | CON | HIDE_TYPE | 
-F:RES_ACID | RES_POIS | RES_CONF | ACTIVATE
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_CONF
+F:RES_POIS
+F:WIS
 a:DEST_DOOR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, strategically 
 D:reinforced at vital locations with a second layer of chain.  Magics to 
@@ -406,7 +674,11 @@ N:26:of Gil-galad
 I:32:8:10
 W:50:80:50:20000
 P:6:1d3:0:0:10
-F:ACTIVATE | HIDE_TYPE | INFRA | LITE2 | LITE3 | SEARCH
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:LITE2
+F:LITE3
 a:SUNLIGHT
 D:The shining helm that Gil-galad, legendary Elven-king, wore in battle.
 
@@ -419,7 +691,14 @@ N:27:of Tom Bombadil
 I:36:12:1
 W:10:10:70:30000
 P:40:2d4:0:0:0
-F:CHR | CON | DEX | HIDE_TYPE | INT | STR | WIS
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:STR
+F:WIS
 Z:teleport
 D:This garment was once the property of Tom Bombadil - 
 D:a strange being rumoured to be older than Arda itself. It 
@@ -432,8 +711,13 @@ N:28:'Thalkettoth'
 I:36:11:3
 W:20:3:60:25000
 P:11:1d1:-1:0:25
-F:DEX | SPEED | HIDE_TYPE | SPECIAL_GENE |
-F:RES_ACID | RES_SHARDS
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
 D:A tunic and skirt sewn with thick, overlapping scales of hardened 
 D:leather whose wearer moves with agility and assurance.
 
@@ -444,8 +728,18 @@ N:29:of Wormtongue
 I:30:2:3
 W:40:20:20:50000
 P:2:1d1:-10:-10:10
-F:INT | DEX | CHR | STEALTH | SEARCH | SPEED | HIDE_TYPE | 
-F:FREE_ACT | FEATHER | RES_DARK | RES_LITE | ESP_GOOD | ESP_UNIQUE
+F:CHR
+F:DEX
+F:ESP_GOOD
+F:ESP_UNIQUE
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
 Z:panic hit
 D:The pair of boots used by Grima son of Galmod, also named the Wormtongue:  
 D:a treacherous but persuasive counsellor, ever ready to betray, sneak, 
@@ -458,9 +752,15 @@ N:30:of Thorin
 I:34:7:4
 W:30:6:65:60000
 P:5:1d2:0:0:25
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | IM_ACID | RES_SOUND | 
-F:RES_CHAOS | ESP_ORC
+F:CON
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:RANDOM_RESIST
+F:RES_CHAOS
+F:RES_SOUND
+F:STR
 D:Invoking the strength and endurance of Thorin, King under the Mountain, 
 D:this little shield forged of true-silver is proof against the Element 
 D:of Earth.
@@ -471,7 +771,13 @@ N:31:of Celegorm
 I:34:4:0
 W:30:3:60:12000
 P:4:1d2:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_DARK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
 D:This shield emblazoned with a multitude of creatures not seen for ages 
 D:once protected Celegorm, lord of Himlad; around it lies a mystic balance 
 D:that contains the conflicts of the elements.
@@ -483,8 +789,18 @@ N:32:of Anarion
 I:34:5:0
 W:40:9:120:160000
 P:5:1d3:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SUST_STR | SUST_INT | 
-F:SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR | ESP_EVIL
+F:ESP_EVIL
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:The great metal-bound shield of Anarion, son of Elendil, who Sauron found 
 D:himself powerless to wither or diminish.
 
@@ -495,9 +811,19 @@ N:33:of Hurin
 I:22:10:3
 W:20:15:180:90000
 P:0:2d6:12:20:0
-F:STR | CON | HIDE_TYPE | BRAND_ACID | RES_ACID | LITE1 | DRAIN_MANA | 
-F:SLAY_ORC | KILL_DEMON | SLAY_TROLL | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ACID
+F:CON
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
 F:MUST2H
+F:RES_ACID
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 a:HURIN
 D:Wielded by Hurin Thalion in the Fifth Battle of Beleriand, this 
@@ -510,12 +836,32 @@ N:34:of Morgoth
 I:33:50:125
 W:100:1:20:10000000
 P:0:1d1:0:0:0
-F:STR | INT | WIS | DEX | CON | CHR | INFRA | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:RES_LITE | RES_DARK | RES_CONF | RES_NEXUS | RES_NETHER | 
-F:LITE1 | SEE_INVIS | ESP_ALL |
-F:CURSED | HEAVY_CURSE | PERMA_CURSE |
-F:INSTA_ART | SPECIAL_GENE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:INT
+F:LITE1
+F:PERMA_CURSE
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:STR
+F:WIS
 D:Two Silmarils of Feanor blaze from the thunderous crown of twisted 
 D:iron. The corrupted metal feels at once as infernal as hellfire 
 D:and as chilling as the Outer Darkness. One protrusion from the 
@@ -528,9 +874,19 @@ N:35:of Beruthiel
 I:33:10:-5
 W:40:12:20:0
 P:0:1d1:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:FREE_ACT | SEE_INVIS | ESP_ANIMAL | ESP_EVIL | ESP_NONLIVING | ESP_ALL | 
-F:CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:SEE_INVIS
+F:STR
 D:The midnight-hued steel circlet of the sorceress-queen Beruthiel, which 
 D:grants extraordinary powers of sight and awareness at a terrible physical 
 D:cost.
@@ -542,8 +898,14 @@ N:36:of Thranduil
 I:32:2:2
 W:20:2:15:50000
 P:2:0d0:0:0:10
-F:INT | WIS | HIDE_TYPE | 
-F:RES_BLIND | ESP_ORC | ESP_EVIL | ESP_TROLL
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_BLIND
+F:WIS
 D:The hunting cap of King Thranduil, to whose ears come all the secrets of 
 D:his forest domain.
 
@@ -554,7 +916,11 @@ N:37:of Thengel
 I:32:3:3
 W:10:2:20:22000
 P:3:1d1:0:0:12
-F:WIS | CHR | RES_CONF | HIDE_TYPE | LUCK
+F:CHR
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:WIS
 D:A ridged helmet made of steel, and embossed with scenes of valour in fine-
 D:engraved silver.  It grants the wearer nobility, clarity of thought and 
 D:understanding.
@@ -566,9 +932,20 @@ N:38:of Hammerhand
 I:32:6:3
 W:20:2:60:45000
 P:6:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | SPECIAL_GENE | RES_FEAR | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:RES_ACID | RES_NEXUS | RES_COLD | RES_DARK | SLOW_DIGEST | 
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_FEAR
+F:RES_NEXUS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 Z:berserk
 D:A great helm as steady as the heroes of the Westdike. Mighty were the 
 D:blows of Helm, the Hammerhand!
@@ -580,9 +957,21 @@ N:39:of Dor-Lomin
 I:32:7:4
 W:40:12:75:300000
 P:8:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_BLIND | 
-F:LITE1 | SEE_INVIS | ESP_DRAGON | ESP_THUNDERLORD | ACTIVATE
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_DRAGON
+F:ESP_THUNDERLORD
+F:HIDE_TYPE
+F:LITE1
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:STR
 a:GORLIM
 D:The legendary dragon helm of Turin Turambar, an object of dread to the 
 D:servants of Morgoth.
@@ -593,8 +982,12 @@ N:40:'Holhenneth'
 I:32:5:2
 W:20:5:75:100000
 P:5:1d3:0:0:10
-F:INT | WIS | SEARCH | HIDE_TYPE | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
 a:DETECT_ALL
 D:A famous helm of forged iron granting extraordinary powers of mind and 
 D:awareness.
@@ -606,11 +999,25 @@ N:41:of Gorlim
 I:32:5:-5
 W:20:5:75:0
 P:5:1d3:25:25:10
-F:INT | WIS | SEARCH | HIDE_TYPE | SHOW_MODS |
-F:SEE_INVIS | NO_MAGIC | HEAVY_CURSE | TY_CURSE
-F:RES_DISEN | RES_FEAR | FREE_ACT | RES_ACID | RES_FIRE | RES_POIS |
-F:IM_COLD | ACTIVATE | DRAIN_HP | 
-F:TELEPORT | CURSED
+F:ACTIVATE
+F:CURSED
+F:DRAIN_HP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:NO_MAGIC
+F:RES_ACID
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:SHOW_MODS
+F:TELEPORT
+F:TY_CURSE
+F:WIS
 a:GORLIM
 D:A headpiece, gaudy and barbaric, that betrayed a warrior when he most 
 D:needed succor.
@@ -622,9 +1029,25 @@ N:42:of Gondor
 I:33:11:3
 W:40:40:30:125000
 P:0:1d1:0:0:15
-F:STR | WIS | CON | HIDE_TYPE | SPEED | RES_CONF | RES_SOUND | 
-F:RES_COLD | RES_FIRE | RES_LITE | RES_BLIND | RES_ELEC | RES_CHAOS |
-F:LITE1 | SEE_INVIS | REGEN | ACTIVATE
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STR
+F:WIS
 a:CURE_700
 D:The shining winged circlet brought by Elendil from dying Numenor, emblem of 
 D:Gondor through an age of the world.
@@ -637,11 +1060,21 @@ N:43:of Numenor
 I:33:12:3
 W:60:30:40:50000
 P:0:1d1:0:0:18
-F:INT | DEX | CHR | SEARCH | SPEED | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | RES_DARK | RES_BLIND | 
-F:RES_SHARDS | RES_SOUND | RES_LITE | RES_COLD | 
-F:LITE1 | ACTIVATE | DRAIN_MANA
-a:NUMENOR
+F:CHR
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:RES_BLIND
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:RES_SHARDS
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
 D:A crown of massive gold, set with wondrous jewels of thought and warding, 
 D:worn by the kings of ancient Numenor.  Its wearer may go into battle 
 D:always knowing what he faces - unless his own folly blinds him to the 
@@ -655,7 +1088,12 @@ N:44:of Valinor
 I:35:1:0
 W:60:90:10:40000
 P:1:0d0:0:0:20
-F:ACTIVATE | IM_ACID | IM_COLD | IM_ELEC | IM_FIRE | RES_POIS
+F:ACTIVATE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:RES_POIS
 a:COLLUIN
 D:A cape worn by a hero from Valinor, a land utterly beyond the strife 
 D:of the elements.
@@ -666,8 +1104,13 @@ N:45:'Holcolleth'
 I:35:1:2
 W:5:25:10:13000
 P:1:0d0:0:0:4
-F:INT | WIS | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:SPEED
+F:STEALTH
+F:WIS
 a:SLEEP
 D:This elven-grey mantle possesses great powers of tranquility and of 
 D:concealment, and grants the wearer the knowledge and understanding of 
@@ -680,8 +1123,15 @@ N:46:of Thingol
 I:35:1:3
 W:10:50:10:35000
 P:1:0d0:0:0:18
-F:DEX | CHR | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
 a:RECHARGE
 D:A sable-hued cloak, with glowing elven-runes to restore magic showing calm 
 D:and clear as moonlight on still water.
@@ -693,7 +1143,10 @@ N:47:of Thorongil
 I:35:1:0
 W:5:10:10:8000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_ACID | SEE_INVIS | RES_FEAR
+F:FREE_ACT
+F:RES_ACID
+F:RES_FEAR
+F:SEE_INVIS
 D:A cloak of shimmering green and brown that grants sight beyond sight and 
 D:shakes off holding magics, worn by Aragorn son of Arathorn in his youth 
 D:as he adventured under the name of Thorongil.
@@ -705,8 +1158,11 @@ N:48:'Colannon'
 I:35:1:3
 W:5:20:10:11000
 P:1:0d0:0:0:15
-F:STEALTH | SPEED | RES_NEXUS | 
-F:RES_ACID | ACTIVATE
+F:ACTIVATE
+F:RES_ACID
+F:RES_NEXUS
+F:SPEED
+F:STEALTH
 a:TELEPORT
 D:A crystal-blue cape of fine silk worn by a silent messenger of 
 D:the forces of Law. Somehow, its wearer is always able to escape 
@@ -719,8 +1175,22 @@ N:49:of Luthien
 I:35:6:2
 W:40:40:5:55000
 P:6:0d0:0:0:20
-F:INT | WIS | CHR | HIDE_TYPE | SPEED | STEALTH | INVIS | LUCK
-F:RES_ACID | RES_FIRE | RES_COLD | SPECIAL_GENE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INT
+F:INVIS
+F:LUCK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:SPELL_CONTAIN
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 a:REST_LIFE
 D:The opaque midnight folds, inset with a multitude of tiny diamonds, of 
 D:this cloak swirl around you and you feel a hint, a fragment of the 
@@ -734,8 +1204,15 @@ N:50:of Tuor
 I:35:6:4
 W:40:40:5:35000
 P:6:0d0:0:0:12
-F:STEALTH | DEX | HIDE_TYPE | INVIS | WATER_BREATH
-F:FREE_ACT | IM_ACID | SEE_INVIS | CLIMB
+F:CLIMB
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:INVIS
+F:SEE_INVIS
+F:STEALTH
+F:WATER_BREATH
 D:From the ruin of Gondolin did Tuor escape, through secret ways and travail, 
 D:shielded by his cloak from a multitude of hostile eyes.
 
@@ -745,7 +1222,10 @@ N:51:of Azaghal
 I:23:5:0
 W:15:30:30:40000
 P:0:2d5:12:14:0
-F:KILL_DRAGON | IM_FIRE | ESP_DRAGON | RES_FEAR
+F:ESP_DRAGON
+F:IM_FIRE
+F:KILL_DRAGON
+F:RES_FEAR
 D:The weapon of Azaghal when he wounded Glaurung.  It is deadly 
 D:when fighting dragons and is said to make the breaths of fire 
 D:completely harmless.
@@ -757,8 +1237,11 @@ N:52:'Cambeleg'
 I:31:1:2
 W:10:6:5:36000
 P:1:0d0:8:8:15
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | SHOW_MODS
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:STR
 D:A hero's handgear that lends great prowess in battle.
 
 
@@ -768,8 +1251,12 @@ N:53:'Cammithrim'
 I:31:1:0
 W:10:3:5:30000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_LITE | SUST_CON | LITE1 | ACTIVATE
+F:ACTIVATE
+F:FREE_ACT
+F:LITE1
+F:RES_LITE
 F:SPECIAL_GENE
+F:SUST_CON
 a:BO_MISS_1
 D:These gloves glow so brightly as to light the way for their owner and cast 
 D:magical bolts with great frequency.
@@ -780,8 +1267,13 @@ N:54:of Eregion
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_FIRE | ACTIVATE |
-F:SUST_STR | STR | REGEN | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:REGEN
+F:RES_FIRE
+F:SPELL_CONTAIN
+F:STR
+F:SUST_STR
+F:WIELD_CAST
 a:BO_FIRE_1
 D:A fiery set of gauntlets that can even shoot fire from the user's 
 D:hands. Wrought by Curufin's people, they guard the wearer's 
@@ -793,8 +1285,13 @@ N:55:of Nargothrond
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_COLD | ACTIVATE |
-F:SUST_CON | CON | REGEN | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:REGEN
+F:RES_COLD
+F:SPELL_CONTAIN
+F:SUST_CON
+F:WIELD_CAST
 a:BO_COLD_1
 D:A set of handgear so icy as to be able to fire frost bolts. Wrought by 
 D:Finrod Felagund himself, it is inscribed with runes that guard and 
@@ -806,8 +1303,13 @@ N:56:of Lorien
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_ELEC | ACTIVATE | FREE_ACT |
-F:SUST_DEX | DEX | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:RES_ELEC
+F:SPELL_CONTAIN
+F:SUST_DEX
+F:WIELD_CAST
 a:BO_ELEC_1
 D:A set of handgear wrought by the Galadhrim. Sparks surround it, enabling 
 D:the wearer to fire bolts of electricity. Ever has lightning improved and 
@@ -819,8 +1321,12 @@ N:57:of Ossiriand
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_ACID | ACTIVATE | 
-F:SUST_CHR | CHR | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CHR
+F:RES_ACID
+F:SPELL_CONTAIN
+F:SUST_CHR
+F:WIELD_CAST
 a:BO_ACID_1
 D:Mighty was the woodcraft of the Laiquendi, for they learned to control the 
 D:element of acid to a level theretofore unknown. This set of handgear is so 
@@ -832,9 +1338,22 @@ N:58:'Camlost'
 I:31:2:-3
 W:10:20:25:0
 P:2:1d1:-11:-12:0
-F:STR | DEX | HIDE_TYPE | DRAIN_MANA | 
-F:RES_POIS | IM_FIRE | IM_COLD | RES_DISEN | RES_NETHER | FREE_ACT | 
-F:AGGRAVATE | SHOW_MODS | HEAVY_CURSE | TY_CURSE | TELEPORT | CURSED
+F:AGGRAVATE
+F:CURSED
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_FIRE
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SHOW_MODS
+F:STR
+F:TELEPORT
+F:TY_CURSE
 D:A pair of gauntlets that sap combat ability, named after the empty hand 
 D:of Beren that once clasped a Silmaril.
 
@@ -845,8 +1364,14 @@ N:59:of Fingolfin
 I:31:5:4
 W:40:15:40:110000
 P:5:1d1:10:10:20
-F:DEX | HIDE_TYPE | LUCK
-F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RANDOM_POWER
+F:RES_ACID
+F:SHOW_MODS
 a:BO_MISS_2
 Z:magic missile
 D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who gave 
@@ -859,8 +1384,10 @@ N:60:of Feanor
 I:30:3:15
 W:40:120:40:300000
 P:3:1d1:0:0:20
-F:SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SPEED
 a:SPEED
 D:This wondrous pair of leather boots once sped Feanor, creator of the 
 D:Silmarils and the mightiest of the Eldar, along the Grinding Ice and to 
@@ -873,9 +1400,16 @@ N:61:'Dal-i-thalion'
 I:30:2:5
 W:10:25:20:40000
 P:2:1d1:0:0:15
-F:DEX | HIDE_TYPE | CHR | SUST_CHR |
-F:ACTIVATE | FREE_ACT |
-F:RES_NETHER | RES_CHAOS | RES_CONF | SUST_CON
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_CHAOS
+F:RES_CONF
+F:RES_NETHER
+F:SUST_CHR
+F:SUST_CON
 a:CURE_POISON
 D:A pair of high-laced shoes, strong against the powers of corruption and 
 D:withering, that grant the wearer extraordinary agility.
@@ -887,7 +1421,13 @@ N:62:of Thror
 I:30:6:3
 W:30:25:80:15000
 P:6:1d1:0:0:20
-F:STR | CON | HIDE_TYPE | SPEED | RES_FEAR | CLIMB
+F:CLIMB
+F:CON
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_FEAR
+F:SPEED
+F:STR
 D:Sturdy footwear of leather and steel as enduring as the long-suffering 
 D:Dwarven King-in-exile who wore them.  Of dwarven make, these boots will 
 D:make their wearer completely at home in the mountains.
@@ -905,9 +1445,20 @@ N:63:of Bard
 I:17:2:0
 W:55:30:2:50000
 P:0:8d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | KILL_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DRAGON
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:Deadliest of arrows, imbued with elemental strength, this shaft is 
 D:feared especially by the wyrmkin.
 
@@ -918,8 +1469,17 @@ N:64:of Maedhros
 I:23:5:3
 W:15:30:30:22500
 P:0:2d5:12:15:0
-F:INT | DEX | HIDE_TYPE | SPEED | SPECIAL_GENE
-F:SLAY_TROLL | SLAY_GIANT | FREE_ACT | SEE_INVIS | SHOW_MODS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RES_OR_POWER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:SPEED
 D:A short thrusting blade with a large guard worn by Maedhros the Tall, 
 D:eldest son of Feanor, and wielded with his left hand after the loss of 
 D:his right hand in the pits of Thangorodrim.
@@ -930,7 +1490,20 @@ N:65:'Angrist'
 I:23:1:4
 W:25:80:12:150000
 P:0:2d4:10:15:5
-F:BRAND_ACID | BRAND_POIS | DEX | FREE_ACT | HIDE_TYPE | LUCK | RES_DARK | SEARCH | SEE_INVIS | SHOW_MODS | SLAY_EVIL | SLAY_ORC | SLAY_TROLL | STEALTH | SUST_DEX
+F:BRAND_ACID
+F:BRAND_POIS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:SUST_DEX
 D:The knife Beren Barahir`s son took from Curufin and with which he cut 
 D:out a Silmaril from the crown of Morgoth, The blade snapped and broke 
 D:when he tried to gain one more and the splint hit Morgoth at his chin.  
@@ -943,7 +1516,13 @@ N:66:of Samwise
 I:23:4:0
 W:4:100:12:12000
 P:0:1d4:4:6:0
-F:ACTIVATE | BRAND_FIRE | LEVELS | LITE1 | RES_FIRE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_FIRE
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_FIRE
+F:SHOW_MODS
 a:BO_FIRE_1
 D:The blade of Samwise Gamgee, chosen by him from the hoard of the 
 D:Barrow-wights. A fiery dagger finely balanced for deadly throws.
@@ -954,7 +1533,12 @@ N:67:of Peregrin
 I:23:4:0
 W:3:100:12:11000
 P:0:1d4:4:6:0
-F:ACTIVATE | BRAND_COLD | LEVELS | RES_COLD | SHOW_MODS
+F:ACTIVATE
+F:BRAND_COLD
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_COLD
+F:SHOW_MODS
 a:BO_COLD_1
 D:The blade of Peregrin Took, chosen by him from the hoard of the 
 D:Barrow-wights. A frosty dagger finely balanced for deadly throws.
@@ -965,7 +1549,12 @@ N:68:of Meriadoc
 I:23:4:0
 W:5:100:12:13000
 P:0:1d4:4:6:0
-F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS | LEVELS
+F:ACTIVATE
+F:BRAND_ELEC
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_ELEC
+F:SHOW_MODS
 a:BO_ELEC_1
 D:The blade of Meriadoc Brandybuck, chosen by him from the hoard of 
 D:the Barrow-wights. A dagger covered in sparks and finely balanced 
@@ -977,7 +1566,12 @@ N:69:of Rilia
 I:23:4:0
 W:5:40:12:35000
 P:0:2d4:4:3:0
-F:SLAY_ORC | RES_POIS | RES_DISEN | ACTIVATE | SHOW_MODS | BRAND_POIS
+F:ACTIVATE
+F:BRAND_POIS
+F:RES_DISEN
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ORC
 a:BA_POIS_1
 D:A large stiletto dagger that glistens with odourless poison, to which the 
 D:wearer seems oddly immune.
@@ -989,10 +1583,18 @@ N:70:'Belangil'
 I:23:4:2
 W:10:40:12:50000
 P:0:2d4:6:9:0
-F:DEX | HIDE_TYPE | SPEED | BLOWS |
-F:BRAND_COLD | RES_COLD |
-F:SEE_INVIS | SLOW_DIGEST | REGEN |
-F:ACTIVATE | SHOW_MODS | BRAND_POIS
+F:ACTIVATE
+F:BLOWS
+F:BRAND_COLD
+F:BRAND_POIS
+F:DEX
+F:HIDE_TYPE
+F:REGEN
+F:RES_COLD
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
 a:BELANGIL
 D:A frosty dagger surrounded in a nimbus of ice with a hilt of elk horn and 
 D:an edge to wound the wind.
@@ -1004,11 +1606,22 @@ N:71:'Calris'
 I:23:21:5
 W:30:15:140:100000
 P:0:5d4:-20:20:0
-F:CON | HIDE_TYPE | DRAIN_HP | 
-F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN | 
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | ESP_DRAGON | ESP_DEMON |
-F:AUTO_CURSE |
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CON
 F:COULD2H
+F:CURSED
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_DRAGON
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
 f:COULD2H
 D:This sword has runes of power incised on its ornate hilt and a single 
 D:blood channel that gleams coldly blue as you grasp this mighty weapon of 
@@ -1021,13 +1634,28 @@ N:72:'Aranruth'
 I:23:16:4
 W:20:45:150:125000
 P:0:3d5:20:12:0
-F:STR | DEX | CON | SUST_CON | SUST_STR
-F:REGEN | FREE_ACT | SEE_INVIS |
-F:RES_CHAOS | RES_NETHER | HOLD_LIFE | RES_FEAR |
-F:RES_COLD |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD |
-F:BRAND_COLD |
-F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED
+F:BLESSED
+F:BRAND_COLD
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_CHAOS
+F:RES_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The beautiful sword of Thingol with a hilt of gold and silver inlay, 
 D:glistening icily enough to freeze the hearts of demons.  You feel supple 
 D:and lightfooted as you hold it.
@@ -1039,9 +1667,20 @@ N:73:'Glamdring'
 I:23:16:1
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | HIDE_TYPE | BLESSED | SLAY_DEMON | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_ORC | RES_FIRE | RES_LITE | LITE1 | 
-F:SLOW_DIGEST | SHOW_MODS | ESP_ORC | SPECIAL_GENE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
+F:SPECIAL_GENE
 D:This fiery, shining blade earned its sobriquet "Foe-Hammer" from dying orcs 
 D:who dared to come near hidden Gondolin. Inscribed upon the guard in Cirth 
 D:is the following -- 
@@ -1054,7 +1693,13 @@ N:74:of Thranduil
 I:21:3:0
 W:20:18:150:50000
 P:0:1d9:10:20:0
-F:BRAND_POIS | COULD2H | RES_POIS | SLAY_ANIMAL | HIDE_TYPE | SHOW_MODS | ESP_ANIMAL
+F:BRAND_POIS
+F:COULD2H
+F:ESP_ANIMAL
+F:HIDE_TYPE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:The carven oak staff of the King of the Woodland Realm, 
 D:this weapon is a fighter's best friend in a forest.
@@ -1065,9 +1710,20 @@ N:75:'Orcrist'
 I:23:16:3
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | ESP_ORC | SLAY_DRAGON | ESP_DRAGON | RES_COLD | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_ORC | RES_COLD | LITE1 | RES_DARK | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BRAND_COLD
+F:ESP_DRAGON
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_COLD
+F:RES_COLD
+F:RES_DARK
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
 D:This coldly gleaming blade is called simply "Biter", by orcs who came to 
 D:know its power all too well.
 
@@ -1077,10 +1733,23 @@ N:76:'Anglachel'
 I:23:25:2
 W:30:30:200:100000
 P:0:3d6:13:17:0
-F:STR | HIDE_TYPE | VORPAL | ESP_DRAGON | DRAIN_HP | 
-F:RES_FIRE | RES_POIS | BRAND_FIRE | BRAND_POIS | 
-F:KILL_DRAGON | SLAY_TROLL | FREE_ACT | SLOW_DIGEST | REGEN | SHOW_MODS | 
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_HP
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:STR
+F:VORPAL
 f:MUST2H
 D:A giant sword once wielded by mighty Turin, and a great dragonbane which 
 D:bathed in Glaurung's blood. Its blade once shone brightly, it can cleave 
@@ -1094,11 +1763,29 @@ N:77:'Zarcuthra'
 I:23:25:4
 W:30:180:250:205000
 P:0:4d6:19:21:0
-F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | DRAIN_MANA | 
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_FIRE |
-F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:RES_FIRE | RES_CHAOS | FREE_ACT | SEE_INVIS | AGGRAVATE | SHOW_MODS |
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:STR
+F:VORPAL
 f:MUST2H
 D:Dark and deadly runes stand stark against the naked steel of this awesome 
 D:weapon, and you feel a stunning power of slaying and rending as you 
@@ -1111,10 +1798,25 @@ N:78:'Mormegil'
 I:23:33:2
 W:30:15:250:0
 P:0:6d7:0:0:-20
-F:SPEED | IM_FIRE | RES_FIRE | BRAND_FIRE | RES_DISEN | RES_FEAR |
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | LEVELS | TY_CURSE | 
-F:BLOWS | SLAY_DRAGON | RES_CHAOS | ANTIMAGIC_50 | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP
+F:AGGRAVATE
+F:ANTIMAGIC_50
+F:BLOWS
+F:BRAND_FIRE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:HEAVY_CURSE
+F:IM_FIRE
+F:LEVELS
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SPEED
+F:TY_CURSE
 D:A foul, twisted sword with blackened spines and knobs, whose very name is a 
 D:curse upon the lips of Elves and Men.
 
@@ -1125,9 +1827,17 @@ N:79:'Gondricam'
 I:23:12:3
 W:20:8:110:28000
 P:0:1d7:10:11:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:DEX
+F:FEATHER
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
 D:Famed sea-defender of Lebennin.  A short, slightly curved chopping blade  
 D:with a perfect edge shining cleanly in the sun, an object of hate to the 
 D:men of Umbar who met it in combat.
@@ -1139,9 +1849,18 @@ N:80:'Crisdurian'
 I:23:28:0
 W:40:15:260:111000
 P:0:4d5:18:19:0
-F:SLAY_DRAGON | SLAY_EVIL | SLAY_UNDEAD | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS | WOUNDING |
+F:BRAND_POIS
 F:MUST2H
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:VORPAL
+F:WOUNDING
 f:MUST2H
 D:A giant's weapon, with a long blade tall and straight thrusting out from a 
 D:massive double-pronged hilt.  On its blade are written doomspells against 
@@ -1154,7 +1873,15 @@ N:81:'Herugrim'
 I:23:17:2
 W:60:40:130:300000
 P:0:3d5:8:9:0
-F:ACTIVATE | ESP_EVIL | FREE_ACT | HIDE_TYPE | INT | RES_CONF | RES_DARK | SHOW_MODS | VORPAL
+F:ACTIVATE
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_CONF
+F:RES_DARK
+F:SHOW_MODS
+F:VORPAL
 a:CURE_INSANITY
 D:The ancient blade of Theoden, King of the Mark. It was taken from 
 D:the king by Grima the Wormtongue, and hidden from him in a dusty 
@@ -1167,10 +1894,24 @@ N:82:'Ringil'
 I:23:17:10
 W:20:120:130:300000
 P:0:4d5:22:25:0
-F:SPEED | HIDE_TYPE | RES_FEAR | BLESSED | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_UNDEAD | KILL_DEMON | SLAY_TROLL | 
-F:FREE_ACT | RES_COLD | RES_LITE | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_FEAR
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPEED
 a:BA_COLD_2
 D:The weapon of Fingolfin, High King of the Noldor; it shines like a column 
 D:of ice lit by light unquenchable.  Morgoth came but unwillingly to meet it 
@@ -1183,10 +1924,27 @@ N:83:'Anduril'
 I:23:17:4
 W:20:40:130:100000
 P:0:3d5:10:15:5
-F:STR | DEX | HIDE_TYPE | RES_FEAR | FREE_ACT | BLESSED | LUCK
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_FIRE | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS | LITE1 |
-F:RES_DISEN | SPECIAL_GENE
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:DEX
+F:FREE_ACT
+F:FREE_ACT
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:STR
+F:SUST_DEX
 a:BA_FIRE_1
 D:The famed "Flame of the West", the sword that was broken and is forged 
 D:again.  It glows with the essence of fire, its wearer is mighty in combat, 
@@ -1202,10 +1960,23 @@ N:84:'Anguirel'
 I:23:17:2
 W:20:30:130:40000
 P:0:2d5:8:12:0
-F:STR | CON | SPEED | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_ELEC | SLAY_DEMON | FREE_ACT | RES_ELEC | 
-F:RES_LITE | RES_DARK | SEE_INVIS | SHOW_MODS | VORPAL | WOUNDING | 
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:BRAND_ELEC
+F:CON
+F:CURSED
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Forged of black galvorn by the Dark-Elven smith Eol, this blade has the 
 D:living lightning trapped inside.
 
@@ -1216,8 +1987,17 @@ N:85:'Elvagil'
 I:23:17:2
 W:20:8:130:20000
 P:0:2d5:5:7:0
-F:DEX | CHR | STEALTH | HIDE_TYPE | ESP_ORC | ESP_TROLL
-F:SLAY_TROLL | SLAY_ORC | FEATHER | SEE_INVIS | SHOW_MODS
+F:CHR
+F:DEX
+F:ESP_ORC
+F:ESP_TROLL
+F:FEATHER
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
 D:The "Singing Blade", whose wearer can slay Orcs and Trolls in the hidden 
 D:and secret places of the earth.
 
@@ -1228,7 +2008,11 @@ N:86:'Forasgil'
 I:23:7:0
 W:15:8:40:15000
 P:0:1d6:12:19:0
-F:SLAY_ANIMAL | BRAND_COLD | RES_COLD | RES_LITE | SHOW_MODS
+F:BRAND_COLD
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A slender, tapered blade whose wielder strikes icy blows with deadly 
 D:accuracy.
 
@@ -1239,9 +2023,17 @@ N:87:'Careth Asdriag'
 I:23:11:2
 W:15:8:50:25000
 P:0:2d7:6:8:0
-F:DEX | BLOWS | SPEED | CON | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SHOW_MODS | ESP_ANIMAL
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ANIMAL
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
 D:An heirloom of the Lords of Rhun far to the east, and a name of 
 D:dismay to creatures natural and unnatural.
 
@@ -1251,9 +2043,25 @@ N:88:'Sting'
 I:23:10:2
 W:20:205:75:100000
 P:0:1d7:7:8:0
-F:BLOWS | CON | DEX | ESP_ORC | ESP_SPIDER | ESP_UNDEAD | FREE_ACT | 
-F:LEVELS | LITE1 | RES_LITE | SEE_INVIS | SHOW_MODS | SLAY_ANIMAL |
-F:SLAY_EVIL | SLAY_ORC | SLAY_UNDEAD | SPEED | STR
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ORC
+F:ESP_SPIDER
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
 D:The perfect size for Bilbo, and stamped forever by the courage he found 
 D:in Mirkwood, this sturdy little blade grants the wearer combat prowess 
 D:and survival abilities they did not know they had. The blade is inscribed 
@@ -1265,11 +2073,21 @@ N:89:'Haradekket'
 I:23:18:2
 W:20:8:130:111111
 P:0:2d5:9:11:0
-F:INT | WIS | BLOWS |
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DRAGON | SLAY_DEMON |
-F:RES_CHAOS | RES_DISEN | RES_NEXUS | 
-F:SEE_INVIS | BLESSED |
+F:BLESSED
+F:BLOWS
+F:INT
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:WIS
 D:A damascened scimitar that seems wondrously easy to hold.  Famed in song as 
 D:the "Sickle of Harad", and a deadly foe to the undead.
 
@@ -1280,8 +2098,14 @@ N:90:'Gilettar'
 I:23:10:2
 W:20:8:80:35000
 P:0:1d7:3:7:0
-F:BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLOW_DIGEST | REGEN | SHOW_MODS | SEE_INVIS | RES_DISEN
+F:BLOWS
+F:HIDE_TYPE
+F:REGEN
+F:RES_DISEN
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
 D:A stubby blade worn by Beren, whose horn sounded of old in the glades of 
 D:Brethil.
 
@@ -1291,10 +2115,27 @@ N:91:'Daedheloth'
 I:23:30:0
 W:70:25:180:250000
 P:0:6d5:18:28:-50
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_COLD | SLAY_TROLL | 
-F:SLAY_ORC | FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_CHAOS | SEE_INVIS | ESP_EVIL | AGGRAVATE | SHOW_MODS | 
-F:CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | SPECIAL_GENE
+F:AGGRAVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:ESP_EVIL
+F:FREE_ACT
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:VORPAL
 D:This weapon of wrath, cursed with a violent anger, dives hungrily 
 D:into the flesh of its enemies. It gathers shadows of death into its 
 D:owner as they inflict wounds that will never heal.
@@ -1305,7 +2146,17 @@ N:92:'Sereghathol'
 I:23:17:2
 W:50:30:150:250000
 P:0:5d5:32:32:0
-F:DEX | FREE_ACT | LEVELS | REGEN | SEE_INVIS | SLAY_EVIL | SLOW_DIGEST | SPEED | STR | VORPAL | WOUNDING
+F:DEX
+F:FREE_ACT
+F:LEVELS
+F:REGEN
+F:SEE_INVIS
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Blood-Sword it is called, after its thirst for the blood of foes. 
 
 # The Beaked Axe of Dain Ironfoot
@@ -1314,8 +2165,15 @@ N:93:of Dain Ironfoot
 I:22:10:3
 W:20:15:180:40000
 P:0:2d6:8:10:0
-F:WIS | CON | HIDE_TYPE | 
-F:SLAY_DRAGON | ESP_EVIL | ESP_UNDEAD | SLOW_DIGEST | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:CON
+F:ESP_EVIL
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WIS
 a:DRAIN_2
 D:The narrow axe head of this weapon, finely balanced by a crow's beak, 
 D:would pierce even the armour of Smaug, and its wielder becomes aware of 
@@ -1328,8 +2186,10 @@ N:94:of Pain
 I:22:13:0
 W:30:155:190:50000
 P:0:9d6:0:30:0
-F:SHOW_MODS | LEVELS | DRAIN_MANA | 
 F:COULD2H
+F:DRAIN_MANA
+F:LEVELS
+F:SHOW_MODS
 f:COULD2H
 D:The massive chopper that crowns this glaive glows blood-red and black; 
 D:fell spells of annihilation swirl and dance as you swing death's myrmidon 
@@ -1342,10 +2202,18 @@ N:95:'Osondir'
 I:22:15:3
 W:20:8:190:22000
 P:0:3d5:6:9:0
-F:CHR | HIDE_TYPE | 
-F:BRAND_FIRE | SLAY_UNDEAD | SLAY_GIANT | RES_FIRE | RES_SOUND | 
-F:FEATHER | SEE_INVIS | SHOW_MODS | ESP_GIANT | 
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_UNDEAD
 f:COULD2H
 D:Lordly and tall did Osondir stand against the wrath of giants, and 
 D:clear-eyed in barrows fell, wielding a halberd glowing ruby red.
@@ -1357,10 +2225,20 @@ N:96:'Til-i-arc'
 I:22:8:2
 W:20:15:160:32000
 P:0:2d5:10:12:10
-F:INT | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | ESP_GIANT
-F:RES_FIRE | RES_COLD | SUST_INT | SLOW_DIGEST | SHOW_MODS |
+F:BRAND_COLD
+F:BRAND_FIRE
 F:COULD2H
+F:ESP_GIANT
+F:HIDE_TYPE
+F:INT
+F:RES_COLD
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:SUST_INT
 f:COULD2H
 D:Within this long thrusting spear lie the spirits of frost giants and fire 
 D:demons, who war forever, trapped by magely spells.
@@ -1371,11 +2249,24 @@ N:97:'Aiglos'
 I:22:2:4
 W:15:45:50:180000
 P:0:3d6:15:25:5
-F:DEX | WIS | HIDE_TYPE |
-F:BRAND_COLD | BRAND_ELEC | LITE1 | 
-F:SLAY_TROLL | SLAY_ORC | SLAY_GIANT | KILL_UNDEAD | 
-F:FREE_ACT | RES_COLD | RES_ELEC | RES_LITE |
-F:SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:LITE1
+F:RES_COLD
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:WIS
 a:BA_ELEC_2
 D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of 
 D:Elves, against which all the foul corruptions of Sauron dashed in vain.
@@ -1391,11 +2282,28 @@ N:98:of Caradhras
 I:22:2:4
 W:15:45:50:77777
 P:0:4d6:15:15:0
-F:INT | WIS | SPEED | TUNNEL | INFRA | HIDE_TYPE | SEARCH |
-F:BRAND_FIRE |
-F:SLAY_GIANT | SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | SLAY_DRAGON |
-F:RES_FIRE | RES_LITE | HOLD_LIFE | RES_FEAR | FEATHER | ESP_GIANT |
-F:SEE_INVIS | ACTIVATE | BLESSED | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INFRA
+F:INT
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_UNDEAD
+F:SPEED
+F:TUNNEL
+F:WIS
 a:STONE_MUD
 D:A magical spear, rumoured to have been forged by Orome himself 
 D:in the coldest reach of the cruel Redhorn.
@@ -1406,8 +2314,16 @@ N:99:'Nimloth'
 I:22:2:3
 W:15:12:50:30000
 P:0:1d6:11:13:0
-F:STEALTH | RES_DARK | INFRA | SPEED | BLESSED | 
-F:BRAND_COLD | SLAY_UNDEAD | RES_COLD | SEE_INVIS | SHOW_MODS
+F:BLESSED
+F:BRAND_COLD
+F:INFRA
+F:RES_COLD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_UNDEAD
+F:SPEED
+F:STEALTH
 D:A thin spike of thrice-forged steel caps a straight sylvan shaft cut from 
 D:a legendary tree; spells to break the will of the undead and strike cold 
 D:fear into the hearts of foes lie on this perfectly balanced spear.
@@ -1419,9 +2335,17 @@ N:100:of Eorlingas
 I:22:20:2
 W:20:23:360:55000
 P:0:3d8:3:21:0
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS | 
+F:DEX
+F:HIDE_TYPE
 F:MUST2H
+F:RES_FEAR
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
+F:STR
 f:MUST2H
 D:"Forth Eorlingas!".  To the field of Cormallen came Eorl the Young 
 D:to save beleaguered Gondor, and from his lance fled massive trolls 
@@ -1434,11 +2358,26 @@ N:101:of Durin
 I:24:25:3
 W:30:90:230:150000
 P:0:4d4:10:20:15
-F:STR | CON | TUNNEL | HIDE_TYPE | ESP_EVIL | RES_FEAR | 
-F:SLAY_DRAGON | KILL_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_FIRE | RES_LITE | RES_DARK | RES_CHAOS | SHOW_MODS | 
-F:BRAND_ACID | BRAND_FIRE | 
+F:BRAND_ACID
+F:BRAND_FIRE
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
 F:MUST2H
+F:RES_ACID
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 f:MUST2H
 D:The twin massive axe heads of this ancient demon's dread gleam with 
 D:mithril inlay, which tell sagas of endurance, invoking the powers of 
@@ -1451,10 +2390,25 @@ N:102:of Eonwe
 I:24:25:2
 W:30:120:230:200000
 P:0:4d4:15:18:8
-F:STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | KILL_DEMON | SLAY_UNDEAD | ESP_NONLIVING
-F:SLAY_ORC | FREE_ACT | IM_COLD | SEE_INVIS | ACTIVATE | 
-F:BLESSED | SHOW_MODS
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:CHR
+F:CON
+F:DEX
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:KILL_DEMON
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:STR
+F:WIS
 a:MASS_GENO
 D:The axe of Eonwe, leader of the Hosts of the West before the gates of 
 D:Thangorodrim, strikes with icy wrath at the undead, disperses hosts of 
@@ -1467,11 +2421,25 @@ N:103:of Balli Stonehand
 I:22:22:3
 W:30:15:170:90000
 P:0:3d8:8:11:5
-F:STR | CON | STEALTH | HIDE_TYPE | ESP_NONLIVING
-F:SLAY_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_BLIND | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS | 
+F:CON
 F:COULD2H
+F:ESP_NONLIVING
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:STR
 f:COULD2H
 D:The twin blades of this weapon were forged in Belegost, and powerful forces 
 D:to resist and endure lie ready for he who shall wield it once more.
@@ -1483,8 +2451,13 @@ N:104:'Lotharang'
 I:22:22:1
 W:30:15:170:21000
 P:0:2d8:4:3:0
-F:STR | DEX | HIDE_TYPE | 
-F:SLAY_TROLL | SLAY_ORC | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 a:CURE_MW
 D:A superbly crafted double-bladed axe that slays the creatures of earth and 
 D:allows rapid recovery from their blows.
@@ -1496,10 +2469,17 @@ N:105:of the Dwarves
 I:22:28:10
 W:30:8:250:80000
 P:0:3d8:12:17:0
-F:SLAY_EVIL | TUNNEL | INFRA | SEARCH | SLAY_GIANT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_FEAR |
-F:SHOW_MODS | 
 F:COULD2H
+F:INFRA
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:TUNNEL
 f:COULD2H
 D:A massive axe with twin razor-sharp heads, so large that it usually 
 D:requires two hands to wield, intricately engraved in gold with spells 
@@ -1511,10 +2491,15 @@ N:106:'Barukkheled'
 I:24:11:3
 W:20:8:160:50000
 P:0:2d6:13:19:0
-F:CON | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:SEE_INVIS | SHOW_MODS | 
+F:CON
 F:COULD2H
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
 f:COULD2H
 D:A royal heirloom of the southern coast, strong in combat against evil 
 D:creatures of the earth.
@@ -1526,8 +2511,15 @@ N:107:'Guthwine'
 I:23:16:1
 W:30:10:150:45000
 P:0:2d6:6:7:0
-F:CRIT | ESP_ORC | HIDE_TYPE | LITE1 | RES_BLIND | RES_FEAR | 
-F:SHOW_MODS | SLAY_ORC | WOUNDING
+F:CRIT
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RES_BLIND
+F:RES_FEAR
+F:SHOW_MODS
+F:SLAY_ORC
+F:WOUNDING
 D:The sword of Eomer, son of Eomund, leader of the Riders of the Mark. 
 D:As one flashed this sword with Anduril during a battle long ago. 
 D:Legendary are its powers in the rallying of desperate troops.
@@ -1538,10 +2530,22 @@ N:108:of Osse
 I:22:5:4
 W:30:90:70:120000
 P:0:4d8:15:19:0
-F:DEX | HIDE_TYPE | 
-F:SLAY_DRAGON | SLAY_ANIMAL | FREE_ACT | HOLD_LIFE | IM_ACID | 
-F:RES_NETHER | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:BLESSED | SHOW_MODS | WATER_BREATH
+F:ACTIVATE
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ACID
+F:RANDOM_POWER
+F:REGEN
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WATER_BREATH
 a:TELE_AWAY
 D:The awesome weapon imbued with some of the power of the Vala Ulmo, 
 D:Lord of Waters. It allows the wearer to laugh in scorn at the dread 
@@ -1553,10 +2557,19 @@ N:109:'Avavir'
 I:22:17:3
 W:40:8:250:18000
 P:0:5d3:8:8:10
-F:DEX | CHR | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | FREE_ACT | RES_FIRE | RES_COLD | 
-F:RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS | 
+F:ACTIVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_COLD
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
 f:COULD2H
 a:RECALL
 D:With elemental powers whose struggles turn this weapon red and purest 
@@ -1570,9 +2583,26 @@ N:110:of Dernhelm
 I:23:17:5
 W:70:50:150:250000
 P:0:3d5:20:25:0
-F:BLESSED | ESP_UNIQUE | FREE_ACT | HIDE_TYPE | HOLD_LIFE | KILL_UNDEAD | 
-F:LITE1 | LUCK | RES_DISEN | RES_FEAR | RES_MORGUL | SEE_INVIS | 
-F:SHOW_MODS | SLAY_EVIL | SPEED | STEALTH | VORPAL | WOUNDING | SPECIAL_GENE
+F:BLESSED
+F:ESP_UNIQUE
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:KILL_UNDEAD
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_MORGUL
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:VORPAL
+F:WOUNDING
 D:Eomer's sister Eowyn once wielded this shining sword when she 
 D:battled the Witch-King of Angmar, hiding her true identity to 
 D:join the battle.  Others are less likely to notice the wielder 
@@ -1586,11 +2616,28 @@ N:111:'Grond'
 I:21:50:2
 W:100:1:1000:500000
 P:0:9d9:25:25:10
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | IMPACT | KILL_UNDEAD | NO_MAGIC |
-F:KILL_DEMON | SLAY_TROLL | SLAY_ORC | RES_ACID | RES_ELEC | RES_FIRE | 
-F:RES_COLD | SEE_INVIS | ESP_ALL | AGGRAVATE | SHOW_MODS | INSTA_ART |
-F:LEVELS | ACTIVATE | SPECIAL_GENE | 
+F:ACTIVATE
+F:AGGRAVATE
+F:ESP_ALL
+F:IMPACT
+F:INSTA_ART
+F:KILL_DEMON
+F:KILL_DRAGON
+F:KILL_UNDEAD
+F:LEVELS
 F:MUST2H
+F:NO_MAGIC
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 f:MUST2H
 a:GROND
 D:The mighty Hammer of the Underworld, blackened by doomspells of shattering, 
@@ -1602,10 +2649,15 @@ N:112:'Totila'
 I:21:13:2
 W:20:8:150:55000
 P:0:3d6:6:8:0
-F:STEALTH | 
-F:SLAY_EVIL | BRAND_FIRE | RES_FIRE | RES_CONF | ACTIVATE | 
-F:SHOW_MODS | LITE1 | 
+F:ACTIVATE
+F:BRAND_FIRE
 F:COULD2H
+F:LITE1
+F:RES_CONF
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STEALTH
 f:COULD2H
 a:CONFUSE
 D:A flail whose head befuddles those who stare as you whirl it around, and 
@@ -1618,10 +2670,20 @@ N:113:'Thunderfist'
 I:21:18:4
 W:45:38:300:160000
 P:0:3d6:5:18:0
-F:STR | CON | HIDE_TYPE | RES_FEAR | 
-F:SLAY_ANIMAL | BRAND_FIRE | BRAND_ELEC | SLAY_TROLL | SLAY_ORC | 
-F:RES_ELEC | RES_FIRE | RES_DARK | SHOW_MODS |
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
 F:MUST2H
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 D:The long-lost weapon of Kzurin, Dwarven champion of ancient Belegost, 
 D:with runes of strength in its handle, and flames and sparks that roar and 
@@ -1633,9 +2695,15 @@ N:114:'Maegnas-in-sereg'
 I:21:12:4
 W:20:30:150:30000
 P:0:2d6:8:22:0
-F:STR | HIDE_TYPE | BRAND_POIS | 
-F:SLAY_ANIMAL | SLAY_TROLL | SLAY_ORC | RES_NEXUS | SEE_INVIS | 
+F:BRAND_POIS
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:You feel strong and firm of foot as you whip the chain-suspended spiked orb 
 D:around - and bathe it in the blood of your foes.
 
@@ -1645,7 +2713,11 @@ N:115:'Naurgil'
 I:21:12:0
 W:20:100:150:35000
 P:0:2d6:5:7:2
-F:BRAND_FIRE | IM_FIRE | ACTIVATE | SHOW_MODS | LITE1
+F:ACTIVATE
+F:BRAND_FIRE
+F:IM_FIRE
+F:LITE1
+F:SHOW_MODS
 a:FIRESTAR
 D:A famed battle-lord of old, with a ruddy head, coloured as embers are that 
 D:can yet rise up in wrath.
@@ -1657,8 +2729,12 @@ N:116:'Taratol'
 I:21:5:0
 W:20:15:200:50000
 P:0:3d4:12:12:0
-F:KILL_DRAGON | BRAND_ELEC | IM_ELEC | ACTIVATE | SHOW_MODS | 
+F:ACTIVATE
+F:BRAND_ELEC
 F:COULD2H
+F:IM_ELEC
+F:KILL_DRAGON
+F:SHOW_MODS
 f:COULD2H
 a:SPEED
 D:A great ridged mace that calls around you a nimbus of living lightning; 
@@ -1671,11 +2747,26 @@ N:117:of Gamil Zirak
 I:21:8:4
 W:40:75:120:250000
 P:0:9d3:19:21:5
-F:WIS | TUNNEL | HIDE_TYPE | RES_FEAR | 
-F:KILL_DRAGON | SLAY_EVIL | BRAND_ELEC | SLAY_UNDEAD | SLAY_DEMON | 
-F:FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_NEXUS | 
-F:SEE_INVIS | SHOW_MODS | 
+F:BRAND_ELEC
 F:COULD2H
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:TUNNEL
+F:WIS
 f:COULD2H
 D:Gamil Zirak was a great craftsman, the master of Telchar of Nogrod. 
 D:This weapon was rescued from Thingol's treasury, and it is rumoured 
@@ -1688,9 +2779,13 @@ N:118:'Nar-i-vagil'
 I:21:3:3
 W:20:18:150:70000
 P:0:1d9:10:20:0
-F:INT | HIDE_TYPE | 
-F:SLAY_ANIMAL | BRAND_FIRE | RES_FIRE | SHOW_MODS | 
+F:BRAND_FIRE
 F:COULD2H
+F:HIDE_TYPE
+F:INT
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:Named for a fiery star and set with gems of great worth binding mystic 
 D:virtues of protection and thought.
@@ -1702,8 +2797,17 @@ N:119:'Eriril'
 I:21:3:4
 W:20:18:150:20000
 P:0:1d9:3:5:0
-F:INT | WIS | HIDE_TYPE | ESP_EVIL | SPELL_CONTAIN | WIELD_CAST
-F:SLAY_EVIL | RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INT
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
 a:ID_PLAIN
 D:The radiant golden staff of an Istari of legend, this wizard's companion 
 D:grants keen sight and the knowledge of many hidden things.
@@ -1715,9 +2819,24 @@ N:120:of Olorin
 I:21:3:4
 W:30:105:150:140000
 P:0:2d9:10:13:0
-F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | SPELL_CONTAIN | WIELD_CAST
-F:HOLD_LIFE | RES_FIRE | RES_NETHER | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_FIRE
+F:BRAND_FIRE
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INT
+F:RANDOM_POWER
+F:RES_FIRE
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
 a:DETECT_XTRA
 D:A staff tall and sturdy, with rough-hewn runes that invoke the element of 
 D:Earth, and which strikes down all creatures who live in the shadow of 
@@ -1729,11 +2848,25 @@ N:121:'Nguruthos'
 I:21:20:6
 W:80:38:400:444444
 P:0:7d8:18:18:0
-F:STR | TUNNEL | HIDE_TYPE | NO_TELE | DRAIN_MANA | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_EVIL | KILL_UNDEAD | BRAND_FIRE | 
-F:IM_FIRE | RES_DARK | RES_CHAOS | RES_DISEN | AGGRAVATE |
-F:SHOW_MODS | BRAND_POIS | VAMPIRIC | 
+F:AGGRAVATE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IM_FIRE
+F:KILL_UNDEAD
 F:MUST2H
+F:NO_TELE
+F:RES_CHAOS
+F:RES_DARK
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:STR
+F:TUNNEL
+F:VAMPIRIC
 f:MUST2H
 D:A weapon so massive it seems beyond the strength of mortals, yet you feel 
 D:the might of giants within you as you heft it.  As you grip the handle 
@@ -1747,10 +2880,21 @@ N:122:'Turmil'
 I:21:10:4
 W:20:15:120:30000
 P:0:2d5:10:6:8
-F:WIS | INFRA | HIDE_TYPE | 
-F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | REGEN | 
-F:ACTIVATE | SHOW_MODS | ESP_ORC | ESP_TROLL | ESP_GIANT | 
+F:ACTIVATE
+F:BRAND_COLD
 F:COULD2H
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INFRA
+F:RANDOM_RESIST
+F:REGEN
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ORC
+F:WIS
 f:COULD2H
 a:TURMIL
 D:Wielded by the High Priest of Meneltarma, this great mace gleams coldly as 
@@ -1764,10 +2908,26 @@ N:123:of Gothmog
 I:21:2:-2
 W:20:15:120:100000
 P:0:3d6:15:16:0
-F:INT | DEX | INFRA | HIDE_TYPE | DRAIN_HP | HEAVY_CURSE | 
-F:CURSED | AGGRAVATE | BRAND_FIRE | SLAY_ANIMAL | SLAY_DEMON | 
-F:RES_FIRE | ESP_SPIDER | VORPAL | RES_LITE | LITE1 | REGEN | 
-F:ESP_DEMON | WOUNDING | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CURSED
+F:DEX
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_SPIDER
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:REGEN
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:VORPAL
+F:WOUNDING
 D:With this unbearably bright whip of flame, the Balrog Gothmog has become 
 D:known for never having lost in combat.
 
@@ -1778,8 +2938,12 @@ N:124:'Belthronding'
 I:19:13:3
 W:40:20:40:35000
 P:0:0d0:20:22:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_DISEN | XTRA_SHOTS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
+F:RES_DISEN
+F:SHOW_MODS
+F:STEALTH
+F:XTRA_SHOTS
 D:The great bow of Beleg, made of black yew and strung with elven hair that 
 D:faintly shines a pale clear gold.
 
@@ -1790,8 +2954,13 @@ N:125:of Bard
 I:19:13:2
 W:30:20:40:20000
 P:0:0d0:17:19:0
-F:DEX | HIDE_TYPE | ESP_DRAGON | LUCK
-F:FREE_ACT | XTRA_MIGHT | SHOW_MODS
+F:DEX
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:SHOW_MODS
+F:XTRA_MIGHT
 D:The great yew bow of grim-faced Bard, who shot the mightiest arrow that 
 D:songs record.
 
@@ -1802,8 +2971,12 @@ N:126:'Cubragol'
 I:19:23:10
 W:50:25:110:50000
 P:0:0d0:10:14:0
-F:SPEED | HIDE_TYPE | 
-F:RES_FIRE | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:HIDE_TYPE
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:SHOW_MODS
+F:SPEED
 a:CUBRAGOL
 D:A crossbow that grants fiery speed to he who finds it, and from which 
 D:shoot bolts that blaze with flame unquenchable.
@@ -1815,11 +2988,29 @@ N:127:of Manwe
 I:6:1:12
 W:127:220:20:9000000
 P:0:1d4:-19:-19:0
-F:INT | CHR | WIS | MANA | SPELL | ACTIVATE | LUCK | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SPECIAL_GENE | 
-F:SEE_INVIS | ESP_EVIL | ESP_DEMON | NEVER_BLOW | INFRA | 
-F:PRECOGNITION | IM_FIRE | ULTIMATE | SPELL_CONTAIN | WIELD_CAST | 
+F:ACTIVATE
+F:CHR
 F:COULD2H
+F:ESP_DEMON
+F:ESP_EVIL
+F:IM_FIRE
+F:INFRA
+F:INT
+F:LUCK
+F:MANA
+F:NEVER_BLOW
+F:PRECOGNITION
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPELL
+F:SPELL_CONTAIN
+F:ULTIMATE
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 a:GANDALF
 D:A simple, wooden wizard's staff.  Unremarkable in all aspects... 
@@ -1833,8 +3024,12 @@ N:128:of Beor
 I:15:4:4
 W:20:10:20:40000
 P:0:4d5:8:12:0
-F:DEX | SPEED | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:DEX
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SPEED
 D:Beor's boomerang makes its wielder as agile as the winds, 
 D:and as hard to harm.
 
@@ -1845,8 +3040,20 @@ N:129:'Glimdrir'
 I:15:4:3
 W:40:20:20:60000
 P:0:5d5:15:16:0
-F:DEX | SPEED | FREE_ACT | BRAND_POIS | SLAY_EVIL | SLAY_UNDEAD | REGEN
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SOUND | NO_TELE | CURSED
+F:BRAND_POIS
+F:CURSED
+F:DEX
+F:FREE_ACT
+F:NO_TELE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
 D:A powerful boomerang that makes one agile and fast, with a thirst for 
 D:evil and undead creatures, but demands its wielder not teleport, for fear 
 D:of desertion.
@@ -1858,9 +3065,19 @@ N:130:of Incanus
 I:36:2:3
 W:30:20:20:60000
 P:2:0d0:0:0:20
-F:INT | WIS | SEARCH | HIDE_TYPE | SPELL_CONTAIN | WIELD_CAST
-F:SUST_INT | SUST_WIS | FREE_ACT | SEE_INVIS | 
-F:RES_ACID | RES_ELEC | IM_FIRE | RES_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 Z:weigh magic
 D:Gandalf's long, flowing robe.  It provides insight and allows the 
 D:wearer to see things not seen by all.
@@ -1872,8 +3089,13 @@ N:131:of the Thain
 I:19:2:4
 W:40:20:40:35000
 P:0:0d0:15:15:0
-F:HIDE_TYPE | DEX | CON
-F:RES_NETHER | XTRA_SHOTS | XTRA_MIGHT | SHOW_MODS
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_NETHER
+F:SHOW_MODS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was crafted by Faramir I, Thain of the Shire, just in case 
 D:the nasties of his father's stories ever dare to enter the Shire again.
 
@@ -1883,7 +3105,12 @@ N:132:of Gimli
 I:34:3:3
 W:40:3:65:80000
 P:3:0d0:9:10:40
-F:INT | CON | RES_FEAR | HIDE_TYPE | IM_FIRE | RES_SHARDS
+F:CON
+F:HIDE_TYPE
+F:IM_FIRE
+F:INT
+F:RES_FEAR
+F:RES_SHARDS
 Z:find secret passages
 D:A gift from the King of Rohan to Gimli the Dwarf, this shield 
 D:combines the cunning and stamina of Gimli Elf-friend, Gimli the 
@@ -1895,8 +3122,15 @@ N:133:of Gimli
 I:24:3:2
 W:35:60:35:65000
 P:0:1d6:5:15:0
-F:STR | BLOWS | LEVELS | SLAY_ORC | FREE_ACT | VORPAL | 
-F:ESP_UNDEAD | ESP_NONLIVING | COULD2H
+F:BLOWS
+F:COULD2H
+F:ESP_NONLIVING
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:SLAY_ORC
+F:STR
+F:VORPAL
 f:COULD2H
 D:"Gimli sensed the Dead behind following, but he continued on 
 D:after Aragorn." The trusty axe of Gimli son of Gloin, one of 
@@ -1908,9 +3142,16 @@ N:134:'Lasher'
 I:21:2:3
 W:20:5:30:50000
 P:0:1d6:12:15:0
-F:DEX | BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLAY_ORC | BRAND_POIS | VORPAL | 
-F:RES_POIS | FREE_ACT | ESP_ORC
+F:BLOWS
+F:BRAND_POIS
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_POIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:VORPAL
 D:A powerful whip that is deadly against orcs.  It poisons your foes 
 D:and is said to go "snicker snack".
 
@@ -1920,7 +3161,14 @@ N:135:of Thorin
 I:14:59:2
 W:50:10:30:40000
 P:0:1d1:0:0:0
-F:ACTIVATE | CHR | INFRA | INSTA_ART | LUCK | STEALTH | SUST_CHR | TUNNEL
+F:ACTIVATE
+F:CHR
+F:INFRA
+F:INSTA_ART
+F:LUCK
+F:STEALTH
+F:SUST_CHR
+F:TUNNEL
 a:CHARM_OTHERS
 Z:remove fear
 D:This magical instrument once belonged to Thorin Oakenshield, 
@@ -1935,7 +3183,15 @@ N:136:of Thorin
 I:32:8:3
 W:40:5:20:55000
 P:10:2d4:0:0:0
-F:ACTIVATE | DEX | HIDE_TYPE | HOLD_LIFE | REGEN | RES_FEAR | SUST_CON | SUST_DEX | SUST_STR
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_FEAR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 a:TERROR
 D:Mighty was Thorin Oakenshield as he emerged from the Gate of the 
 D:Lonely Mountain on the day of the Battle of the Five Armies, clad 
@@ -1949,8 +3205,18 @@ N:137:of Maglor
 I:14:59:3
 W:60:10:20:100000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ESP_UNIQUE
+F:CHR
+F:ESP_UNIQUE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIS
 D:This harp that once belonged to Maglor makes those who use it seem 
 D:more forceful and convincing.  It is also said that those who have 
 D:used it found themselves walking faster, as if to an unheard beat.
@@ -1962,8 +3228,17 @@ N:138:of the Sky
 I:14:58:2
 W:40:10:15:80000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIS
 D:The drum is decorated with the images of the stars, the clouds, the 
 D:Sun guided by Arien and the Moon with Tilion.  It imparts to the 
 D:wearer an echo of the beauty of the sky, and protects him from the 
@@ -1977,8 +3252,16 @@ N:139:of Daeron
 I:14:59:1
 W:20:10:10:50000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STEALTH
+F:WIS
 D:A pretty harp that makes those who play it beautiful, wise and 
 D:fast.
 
@@ -1989,8 +3272,16 @@ N:140:of Erebor
 I:20:6:5
 W:50:15:200:55000
 P:0:3d4:5:0:0
-F:STR | TUNNEL | SUST_STR | HIDE_TYPE | LITE1 | ACTIVATE | CLIMB
-F:RES_CHAOS | RES_LITE | RES_DARK
+F:ACTIVATE
+F:CLIMB
+F:HIDE_TYPE
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:STR
+F:SUST_STR
+F:TUNNEL
 a:EREBOR
 D:A pick that provides a magical light by which to see while tunnelling.
 
@@ -2001,7 +3292,11 @@ N:141:of the Druedain
 I:14:58:4
 W:19:10:15:10000
 P:0:3d4:0:0:0
-F:ACTIVATE | STEALTH | SEARCH | INFRA | RES_POIS | RES_DARK
+F:ACTIVATE
+F:INFRA
+F:RES_DARK
+F:RES_POIS
+F:STEALTH
 a:DRUEDAIN
 D:The fabled Drum of the Druedain that will protect those who play it 
 D:from darkness and poison attacks.  It also aids in the seeing of 
@@ -2014,7 +3309,10 @@ N:142:of Rohan
 I:14:60:2
 W:14:10:15:80000
 P:0:3d4:0:0:0
-F:ACTIVATE | CHR | WIS | ESP_DRAGON
+F:ACTIVATE
+F:CHR
+F:ESP_DRAGON
+F:WIS
 a:ROHAN
 D:A horn carved from the bones of the Dragon of Ered-Mithrin, this 
 D:heirloom of the House of Eorl bestows to its user the gifts of 
@@ -2027,7 +3325,12 @@ N:143:of Helm
 I:14:60:2
 W:16:10:15:15000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | IM_COLD | RES_NETHER | RES_FEAR
+F:ACTIVATE
+F:CON
+F:IM_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:STR
 a:HELM
 D:Heedless of cold, fearless of darkness -- besiegers fled at the wind 
 D:of the solitary coming of King Helm Hammerhand, proclaimed by a single 
@@ -2040,7 +3343,12 @@ N:144:of Boromir
 I:14:60:3
 W:18:10:15:18000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | RES_FEAR | RES_FIRE | AGGRAVATE
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:RES_FEAR
+F:RES_FIRE
+F:STR
 a:BOROMIR
 D:The great horn made of the horns of kine of Araw. It is inlaid with silver 
 D:and gold signs; when blown, it can be heard for miles over. The horn gives 
@@ -2054,7 +3362,13 @@ N:145:of Gothmog
 I:22:28:-4
 W:30:8:250:30000
 P:0:3d8:14:19:0
-F:BRAND_FIRE | IM_FIRE | CHR | ACTIVATE | SHOW_MODS | CURSED | TY_CURSE
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CURSED
+F:IM_FIRE
+F:SHOW_MODS
+F:TY_CURSE
 a:AXE_GOTHMOG
 D:The black axe of Gothmog, which struck Fingon at Nirnaeth.  Mighty 
 D:spells of evil make it unsafe in any hands but those of its original wielder.
@@ -2066,7 +3380,8 @@ N:146:of Gondor
 I:17:2:0
 W:20:5:3:25000
 P:0:10d8:10:20:0
-F:SLAY_EVIL | SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
 D:An arrow that was created to rid the world of demons.
 
 # The Long Sword of Tulkas
@@ -2076,13 +3391,40 @@ N:147:of Tulkas
 I:23:17:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:LIFE | CON | CHR | LUCK
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:BRAND_FIRE | BRAND_COLD | BRAND_ELEC | VORPAL | IM_COLD |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_DEMON |
-F:FREE_ACT | RES_FIRE | RES_DARK | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS | BLESSED |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:A warm light bathes this translucent blade.  The power of the fates are 
 D:at the command of its wielder as the weapon passes Supreme Judgment on 
@@ -2095,8 +3437,11 @@ N:148:of Great Luck
 I:36:2:60
 W:50:120:20:60000
 P:2:0d0:0:0:0
-F:LUCK | HIDE_TYPE |
-F:FREE_ACT | DRAIN_HP | DRAIN_MANA
+F:DRAIN_HP
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
 D:A powerful wizard once created this robe to grant him incredible luck.... 
 D:It seems he forgot to wear it.
 
@@ -2107,8 +3452,12 @@ N:149:of Farmer Maggot
 I:19:2:2
 W:10:10:5:20000
 P:0:0d0:20:0:0
-F:INFRA | SEARCH | HIDE_TYPE | 
-F:XTRA_SHOTS | SHOW_MODS | ACTIVATE | SPECIAL_GENE
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:XTRA_SHOTS
 a:MAGGOT
 D:This ordinary seeming leather sling has been raised to legendary 
 D:status amongst generations of hobbit children.  Farmer Maggot's 
@@ -2125,10 +3474,25 @@ N:150:of Angmar
 I:23:17:-10
 W:20:40:130:30000
 P:0:4d5:-22:-25:0
-F:SPEED | STR | WIS | CHR | ESP_UNDEAD
-F:BRAND_FIRE | SEE_INVIS | SLOW_DIGEST | FREE_ACT |
-F:VAMPIRIC | NO_TELE | AGGRAVATE | WRAITH | INVIS |
-F:CURSED | HEAVY_CURSE | DG_CURSE | SHOW_MODS | CLONE
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:CURSED
+F:DG_CURSE
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:INVIS
+F:NO_TELE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VAMPIRIC
+F:WIS
+F:WRAITH
 D:Dark flames wreath the naked steel of the Witch-King of Angmar.  
 D:A mighty curse to all those who wield it apart from its master, 
 D:the torture of the wraithworld awaits those who dare.
@@ -2140,9 +3504,19 @@ N:151:of Feanor
 I:18:2:0
 W:127:220:130:100000
 P:0:5d5:5:6:0
-F:BRAND_COLD | BRAND_FIRE | BRAND_ELEC | BRAND_ACID | BRAND_POIS |
-F:SLAY_DRAGON | SLAY_GIANT | SLAY_TROLL | KILL_UNDEAD | SLAY_ORC |
-F:SLAY_DEMON | SLAY_EVIL | SPECIAL_GENE
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_UNDEAD
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 D:Made during the war against Morgoth by Feanor, this powerful 
 D:bolt is the bane of Morgoth's power, and has especial strength 
 D:against those foes who are already dead.
@@ -2154,7 +3528,38 @@ N:152:of Orome
 I:19:24:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT | IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION | REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN | SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH | SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:A crossbow handcrafted by Aule for the Huntsman of the Valar during 
 D:the first pursuit of Melkor Bauglir.
 
@@ -2164,8 +3569,16 @@ N:153:of the Sandworm
 I:36:4:5
 W:30:3:80:65000
 P:30:0d0:0:0:0
-F:RES_POIS | RES_ELEC | RES_FIRE | RES_ACID | SPECIAL_GENE
-F:TUNNEL | STR | STEALTH | INFRA | ESP_ANIMAL
+F:ESP_ANIMAL
+F:INFRA
+F:RES_ACID
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SPECIAL_GENE
+F:STEALTH
+F:STR
+F:TUNNEL
 D:This powerful piece of armour was made using the remains of 
 D:the Sandworm Queen.
 
@@ -2175,8 +3588,14 @@ N:154:'Lhugdagnir'
 I:22:28:2
 W:70:20:260:33000
 P:0:3d8:20:20:0
-F:BLOWS | KILL_DRAGON | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_POIS | SHOW_MODS
+F:BLOWS
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
 D:Forged by the Dwarves to defend their home of Khazad-dum from dragons, 
 D:this axe has been lost to time... until now.
 
@@ -2186,7 +3605,11 @@ N:155:'Cam-tal-crist'
 I:24:8:4
 W:15:3:140:12000
 P:0:2d5:12:15:0
-F:DEX | VORPAL | HIDE_TYPE | SHOW_MODS | WOUNDING
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The Petty-dwarves of Bathak forged this blade, and it shares their thirst 
 D:for blood.
 
@@ -2197,8 +3620,12 @@ N:156:'Orchast'
 I:24:11:4
 W:15:2:170:12000
 P:0:2d7:20:14:0
-F:DEX | SEARCH | SLAY_ORC | ACTIVATE | HIDE_TYPE | SHOW_MODS | 
+F:ACTIVATE
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
 f:COULD2H
 a:ORCHAST
 D:Forged by the dwarves of Khazad-dum in a time of desperation, 
@@ -2211,8 +3638,16 @@ N:157:of the Night
 I:24:1:4
 W:45:20:45:34000
 P:0:2d6:34:22:0
-F:DEX | STEALTH | VAMPIRIC | KILL_UNDEAD | RES_DARK | HIDE_TYPE | 
-F:SHOW_MODS | SEE_INVIS | ACTIVATE | DRAIN_EXP
+F:ACTIVATE
+F:DEX
+F:DRAIN_EXP
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
+F:VAMPIRIC
 a:NIGHT
 D:Found on an unmarked grave after a violent storm, this hatchet 
 D:has a sinister aura of darkness and decay.
@@ -2223,8 +3658,16 @@ N:158:'Lavandagnir'
 I:24:30:3
 W:70:20:300:28400
 P:0:5d7:31:27:0
-F:STR | SLAY_ANIMAL | SUST_STR | RES_SHARDS | RES_NEXUS | FEATHER | 
-F:HIDE_TYPE | SHOW_MODS | ACTIVATE | DRAIN_HP
+F:ACTIVATE
+F:DRAIN_HP
+F:FEATHER
+F:HIDE_TYPE
+F:RES_NEXUS
+F:RES_SHARDS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:STR
+F:SUST_STR
 a:NATUREBANE
 D:Used by the orcs in their battle at Dagor Bragollach against the elves, this 
 D:axe has a bloodthirst for nature.
@@ -2235,8 +3678,14 @@ N:159:of Helcar
 I:24:8:3
 W:30:25:140:26550
 P:0:2d5:3:15:0
-F:INT | CHR | SUST_DEX | BRAND_COLD | IM_COLD | RES_NEXUS | HIDE_TYPE | 
+F:BRAND_COLD
+F:CHR
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:RES_NEXUS
 F:SHOW_MODS
+F:SUST_DEX
 D:Crafted of purest ice and held solid by powerful spells, this icy axe 
 D:delivers a chill of death to its victims.
 
@@ -2247,56 +3696,30 @@ N:160:of Knowledge
 I:32:5:-6
 W:20:5:75:100000
 P:6:1d3:0:0:20
-F:LITE1 | HIDE_TYPE | SPECIAL_GENE | LUCK | 
-F:AUTO_ID | ACTIVATE
+F:ACTIVATE
+F:AUTO_ID
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:SPECIAL_GENE
 a:KNOWLEDGE
 D:This helm, designed by Petty-Dwarves ages ago to act as the brain of a 
 D:long lost project, is made of finest glass.  Its light banishes all secrets, 
 D:and makes audible whispers from the deceased.
 
-
-### Trapping Kits ###
-
-# The Catapult Trap Set of the Edain 
-
-N:161:of the Edain
-I:46:3:3
-W:20:10:40:20000
-P:0:0d0:25:15:30
-F:STEALTH | AUTOMATIC_99 | XTRA_MIGHT | HIDE_TYPE
-D:A trap that can almost never be detected.  Its missiles may be mere pebbles, 
-D:but fired at an incredibly high velocity to penetrate even the toughest 
-D:hide or armour.
-
-# The Device Trap Set of the Noegyth Nibin
-
-N:162:of the Noegyth Nibin
-I:46:6:3
-W:20:20:40:20000
-P:0:0d0:0:0:25
-F:STEALTH | XTRA_SHOTS | TELEPORT_TO | HIDE_TYPE | AUTOMATIC_99
-D:A magical trap, armed with a wand.  Unaccountably, its victims keep 
-D:on coming back for more...
-
-# The Bolt Trap Set of the Naugrim
-
-N:163:of the Naugrim
-I:46:2:2
-W:20:20:200:20000
-P:0:0d0:17:27:37
-F:STEALTH | XTRA_SHOTS | XTRA_MIGHT | HIDE_TYPE | ONLY_DEMON
-D:A snare set not for animals, or people, but for demons alone, and 
-D:enchanted so that whenever the demon sets foot or claw into the 
-D:(hidden) pentagram, its hide is immediately pierced by many magical 
-D:crossbow bolts.
-
 # The Broken Sword 'Narsil'
 
 N:164:'Narsil'
 I:23:2:2
 W:20:5:30:15000
 P:0:3d2:6:10:0
-F:BLESSED | DEX | HIDE_TYPE | RES_FIRE | SLAY_ORC | SLAY_TROLL | STR
+F:BLESSED
+F:DEX
+F:HIDE_TYPE
+F:RES_FIRE
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:These are the shards of the mighty blade of Isildur, which deprived 
 D:the dark lord Sauron of The One Ring of Power. Legend has it that 
 D:the sword that was broken shall be reforged. You can barely make out 
@@ -2311,7 +3734,15 @@ N:165:of Peregrin Took
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:3:5:11
-F:ACTIVATE | ESP_TROLL | HIDE_TYPE | LITE1 | REGEN | RES_FEAR | SHOW_MODS | STR | SUST_STR
+F:ACTIVATE
+F:ESP_TROLL
+F:HIDE_TYPE
+F:LITE1
+F:REGEN
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
+F:SUST_STR
 a:GORLIM
 D:This sturdy mail shirt was a gift from the nobility of Gondor to the halfling 
 D:Peregrin Took.  It enables a warrior to fight more capably and cling to life when 
@@ -2324,11 +3755,22 @@ N:166:'Loknare'
 I:38:20:0
 W:95:12:500:400000
 P:50:2d4:-8:0:35
-F:FEATHER | FLY | ESP_DRAGON |
-F:RES_NEXUS | RES_CHAOS | AGGRAVATE | REGEN | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
 F:ACTIVATE
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:RES_NEXUS
+F:RES_SHARDS
+F:RES_SOUND
 a:MEDIATOR
 D:A mighty suit of dragon armour, set with the scales of dragons of both 
 D:Law and Chaos, and with power over both. Loknare means Dragonblaze.
@@ -2339,7 +3781,10 @@ N:167:of Himring
 I:36:6:0
 W:50:20:100:35000
 P:6:0d0:0:0:15
-F:RES_CHAOS | RES_NETHER | RES_POIS | ACTIVATE
+F:ACTIVATE
+F:RES_CHAOS
+F:RES_NETHER
+F:RES_POIS
 a:PROT_EVIL
 D:Contained within this studded cuirass of pliable leather is the memory of 
 D:unvanquished Himring, defiant fortress surrounded by the legions of Morgoth.
@@ -2351,8 +3796,13 @@ N:168:'Hithlomir'
 I:36:4:4
 W:20:3:80:45000
 P:4:0d0:0:0:20
-F:STEALTH | HIDE_TYPE | SEARCH | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
 D:Familiar with the secret ways hidden in darkness, this leather cuirass is 
 D:truly more than it appears.
 
@@ -2364,10 +3814,19 @@ N:169:of Gil-galad
 I:34:10:5
 W:70:4:80:65000
 P:10:1d3:0:0:20
-F:ACTIVATE | 
-F:LITE1 | WIS | CHR | SEARCH | LUCK
-F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE | 
-F:SUST_WIS | SUST_DEX | SUST_CHR
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:SUST_CHR
+F:SUST_DEX
+F:SUST_WIS
+F:WIS
 a:GILGALAD
 D:The legendary shield of Gil-Galad, who fought his way to the gates of 
 D:the Dark Tower, and with whom came light even to Gorgoroth.
@@ -2379,9 +3838,15 @@ N:170:of Celebrimbor
 I:32:3:3
 W:55:12:20:45000
 P:3:1d1:0:0:18
-F:INT | DEX | CHR | SPELL | SEARCH | 
-F:RES_FIRE | RES_ACID | RES_DISEN | RES_SHARDS | 
 F:ACTIVATE
+F:CHR
+F:DEX
+F:INT
+F:RES_ACID
+F:RES_DISEN
+F:RES_FIRE
+F:RES_SHARDS
+F:SPELL
 a:CELEBRIMBOR
 D:This once belonged to Celebrimbor, maker of the Rings of Power.  One who 
 D:knows both fire and acid, from the business of forging and engraving, will 
@@ -2396,9 +3861,17 @@ N:171:of Umbar
 I:19:24:2
 W:60:20:200:35000
 P:0:4d1:18:18:0
-F:STR | CON | XTRA_MIGHT | AGGRAVATE | 
-F:RES_LITE | RES_DARK | RES_BLIND | RES_ELEC | 
-F:HIDE_TYPE | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:STR
+F:XTRA_MIGHT
 a:UMBAR
 D:A great brazen arbalest with arms of gleaming steel, shooting quarrels with 
 D:speed and power for those brave enough to risk betrayal.
@@ -2411,8 +3884,13 @@ N:172:of Amrod
 I:19:12:2
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:STR | CON | XTRA_MIGHT | 
-F:RES_FIRE | RES_ELEC | RES_COLD | REGEN
+F:CON
+F:REGEN
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+F:XTRA_MIGHT
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2426,8 +3904,16 @@ N:173:of Amras
 I:19:12:1
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:INT | WIS | DEX | XTRA_SHOTS | XTRA_MIGHT | SPEED | 
-F:RES_FIRE | RES_ELEC | RES_COLD | SLOW_DIGEST
+F:DEX
+F:INT
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SLOW_DIGEST
+F:SPEED
+F:WIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2441,10 +3927,20 @@ N:174:of Nain
 I:20:7:6
 W:60:5:250:30000
 P:0:3d8:12:18:0
-F:TUNNEL | INFRA | SEARCH | STR | ESP_ORC | CLIMB | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | RES_ACID | RES_DARK | RES_DISEN | 
 F:ACTIVATE
+F:BRAND_ACID
+F:CLIMB
+F:ESP_ORC
+F:INFRA
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 a:STONE_MUD
 D:Wielded by Nain of the Iron Hills at the Battle of Azanulbizar, this great 
 D:mattock brought victory to the Dwarves over Azog's Orcs - though Nain 
@@ -2457,10 +3953,20 @@ N:175:of Fundin Bluecloak
 I:21:6:4
 W:25:100:130:60000
 P:0:5d4:13:17:10
-F:STR | WIS | SPEED | LITE1 | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_UNDEAD | ACTIVATE | 
-F:RES_FIRE | RES_ELEC | RES_NETHER | RES_DISEN | HOLD_LIFE | 
+F:ACTIVATE
 F:COULD2H
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 f:COULD2H
 a:FUNDIN
 D:The weapon of one of the great dwarven priests, with powers 
@@ -2474,9 +3980,16 @@ N:176:of the Haradrim
 I:34:4:2
 W:35:12:120:25000
 P:4:1d2:0:0:15
-F:ACTIVATE | 
-F:STR | CON | SUST_STR | SUST_CON | HIDE_TYPE | 
-F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_FEAR
+F:RES_POIS
+F:STR
+F:SUST_CON
+F:SUST_STR
 a:HARADRIM
 D:A great shield from the far lands of the South, whose wielder 
 D:will go charging into battle heedless of danger, with the 
@@ -2489,11 +4002,22 @@ N:177:'Dolcrist'
 I:21:15:5
 W:30:15:500:60000
 P:0:5d4:11:23:20
-F:STR | TUNNEL | INFRA | HIDE_TYPE | 
-F:CURSED | AGGRAVATE | NO_MAGIC | ACTIVATE | 
-F:RES_NEXUS | RES_BLIND | RES_SOUND | 
-F:KILL_DRAGON | SLAY_ANIMAL | BRAND_POIS | BRAND_ELEC | 
+F:ACTIVATE
+F:AGGRAVATE
+F:BRAND_ELEC
+F:BRAND_POIS
 F:COULD2H
+F:CURSED
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
+F:NO_MAGIC
+F:RES_BLIND
+F:RES_NEXUS
+F:RES_SOUND
+F:SLAY_ANIMAL
+F:STR
+F:TUNNEL
 f:COULD2H
 a:SKULLCLEAVER
 D:This mighty bludgeon brings destruction to all around it, and is the 
@@ -2505,8 +4029,17 @@ N:178:of Eol
 I:31:2:3
 W:55:35:25:40000
 P:3:1d1:0:0:15
-F:INT | MANA | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | 
-F:ACTIVATE | LUCK | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:FEATHER
+F:FREE_ACT
+F:INT
+F:LUCK
+F:MANA
+F:RES_DARK
+F:RES_ELEC
+F:RES_POIS
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:EOL
 D:The iron-shod gauntlets of the Dark Elven smith Eol, tingling with magics 
 D:that he could channel in battle.
@@ -2518,7 +4051,10 @@ N:179:of Nevrast
 I:30:3:3
 W:20:8:40:35000
 P:3:1d1:0:0:13
-F:STEALTH | CON | SPEED | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
+F:SPEED
+F:STEALTH
 D:Footgear made of bear leather and set with opals, which grant the wearer 
 D:silent, hasted movement.
 
@@ -2529,7 +4065,10 @@ N:180:of Gimli
 I:30:6:4
 W:40:8:60:22500
 P:4:1d1:5:5:10
-F:INFRA | SEARCH | TUNNEL | CLIMB | HIDE_TYPE
+F:CLIMB
+F:HIDE_TYPE
+F:INFRA
+F:TUNNEL
 Z:magic map
 D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless 
 D:ally to those journeying through halls of stone under mountains.
@@ -2542,9 +4081,19 @@ N:181:of Gothmog
 I:115:55:-20
 W:10:0:150:500
 P:0:7d6:13:13:0
-F:SHOW_MODS | SLAY_DEMON | SLAY_EVIL | BRAND_FIRE | BRAND_POIS
-F:LUCK | CHAOTIC | LITE1 | WOUNDING | RES_MORGUL | WIELD_CAST
-F:HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:HEAVY_CURSE
+F:LITE1
+F:LUCK
+F:RES_MORGUL
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:WIELD_CAST
+F:WOUNDING
 
 
 # The Demonshield of Gothmog
@@ -2553,9 +4102,18 @@ N:182:of Gothmog
 I:115:56:4
 W:15:0:70:500
 P:13:1d1:0:0:13
-F:DEX | INVIS | SUST_STR | SUST_CON | SUST_DEX
-F:FEATHER | SH_FIRE | FREE_ACT | HOLD_LIFE
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:INVIS
+F:SH_FIRE
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIELD_CAST
 
 
 # The Demonhorn of Gothmog
@@ -2564,9 +4122,15 @@ N:183:of Gothmog
 I:115:57:-5
 W:20:0:30:500
 P:2:1d1:0:0:13
-F:LITE2 | REGEN | ESP_DEMON
-F:CHR | SLOW_DIGEST | SEE_INVIS
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:CHR
+F:ESP_DEMON
+F:HEAVY_CURSE
+F:LITE2
+F:REGEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:WIELD_CAST
 
 # The Elven cloak of Peregrin Took
 # From T-Plus by Ingeborg S. Norden
@@ -2575,7 +4139,13 @@ N:184:of Peregrin Took
 I:35:2:3
 W:10:10:10:12500
 P:4:0d0:0:0:16
-F:ACTIVATE | CHR | DEX | HIDE_TYPE | INVIS | LUCK | SEARCH | STEALTH
+F:ACTIVATE
+F:CHR
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:STEALTH
 a:CURE_HUNGER
 D:This simple-looking cloak, dyed in hues that blend into the woodlands, was a gift 
 D:from the elves of Lothlorien to the halfling Peregrin Took.  Its wearer has an 
@@ -2589,9 +4159,20 @@ N:185:of Tom Bombadil
 I:14:59:4
 W:80:60:20:150000
 P:0:3d4:0:0:0
-F:ACTIVATE | BLESSED | CHR | ESP_UNDEAD | FREE_ACT | 
-F:HIDE_TYPE | HOLD_LIFE | LIFE | LUCK | RES_FEAR | 
-F:RES_SOUND | SEARCH | SEE_INVIS | STEALTH | SUST_CHR
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LIFE
+F:LUCK
+F:RES_FEAR
+F:RES_SOUND
+F:SEE_INVIS
+F:STEALTH
+F:SUST_CHR
 a:PROT_EVIL
 D:This small, serviceable wooden harp once belonged to Tom Bombadil-- 
 D:a mysterious figure whose song prevented the Wight-King from 
@@ -2605,11 +4186,29 @@ N:186:of Radagast
 I:21:3:2
 W:100:120:150:180000
 P:0:2d9:10:13:0
-F:ACTIVATE | BLESSED | CHR | ESP_ANIMAL | ESP_EVIL | 
-F:HIDE_TYPE | INFRA | INT | MANA | RES_COLD | RES_ELEC | 
-F:RES_FIRE | RES_MORGUL | SEARCH | SEE_INVIS | SHOW_MODS | 
-F:SLAY_ANIMAL | SLAY_EVIL | SPELL | SPELL_CONTAIN | 
-F:STEALTH | WATER_BREATH | WIELD_CAST | WIS
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:MANA
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_MORGUL
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SPELL
+F:SPELL_CONTAIN
+F:STEALTH
+F:WATER_BREATH
+F:WIELD_CAST
+F:WIS
 a:RADAGAST
 Z:grow trees
 D:Rumoured to be a gift from Yavanna to Radagast the Brown, this 
@@ -2626,9 +4225,19 @@ N:187:'Valaroma'
 I:14:60:4
 W:80:60:15:90000
 P:0:3d4:0:0:0
-F:ACTIVATE | BLESSED | CON | ESP_ANIMAL | ESP_EVIL | 
-F:FREE_ACT | HIDE_TYPE | LUCK | RES_CONF | RES_FEAR | 
-F:RES_SOUND | SEARCH | SEE_INVIS | STEALTH
+F:ACTIVATE
+F:BLESSED
+F:CON
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
+F:SEE_INVIS
+F:STEALTH
 a:VALAROMA
 D:This heavenly instrument, wrought from gleaming silver, most 
 D:often appears in the hands of the Valarin huntsman Orome; yet 
@@ -2643,9 +4252,19 @@ N:188:'Menelcol'
 I:35:1:5
 W:70:70:10:27500
 P:1:0d0:0:0:25
-F:ACTIVATE | CHR | FLY | HIDE_TYPE | IM_ELEC | INFRA | 
-F:LITE1 | MAGIC_BREATH | RES_COLD | RES_DARK | RES_LITE | 
-F:SEARCH | SEE_INVIS | SUST_CHR
+F:ACTIVATE
+F:CHR
+F:FLY
+F:HIDE_TYPE
+F:IM_ELEC
+F:INFRA
+F:LITE1
+F:MAGIC_BREATH
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SUST_CHR
 a:GILGALAD
 D:This deep-blue velvet cloak, embroidered with silvery stars, sheds a 
 D:celestial light that reveals hidden things and bestows unearthly 
@@ -2659,9 +4278,18 @@ N:189:of Ghan-buri-Ghan
 I:36:1:2
 W:25:10:20:30000
 P:2:0d0:0:0:32
-F:CON | HIDE_TYPE | LIFE | RES_COLD | RES_FIRE | 
-F:RES_POIS | RES_SOUND | STR | SUST_CON | 
-F:SUST_STR | SUST_WIS | WIS
+F:CON
+F:HIDE_TYPE
+F:LIFE
+F:RES_COLD
+F:RES_FIRE
+F:RES_POIS
+F:RES_SOUND
+F:STR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 Z:poison dart
 D:The wrappings of a leader among the wild Men of Druadan 
 D:forest. It contains a multitude of tiny pockets filled 
@@ -2674,7 +4302,12 @@ N:190:of Ghan-buri-Ghan
 I:35:1:5
 W:30:15:10:25000
 P:1:0d0:5:5:13
-F:DEX | HIDE_TYPE | INVIS | SPEED | STEALTH | SUST_DEX
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 Z:berserk
 D:This dark-coloured cloak once belonged to the leader of the 
 D:Druedain. As you put it on, you feel safer from attempts to 
@@ -2687,8 +4320,16 @@ N:191:of Gondor
 I:39:108:-3
 W:60:30:50:50000
 P:0:0d0:0:0:0
-F:ACTIVATE | ESP_UNDEAD | HIDE_TYPE | INSTA_ART | INVIS | 
-F:LITE1 | RES_CHAOS | RES_DARK | RES_NETHER | STEALTH
+F:ACTIVATE
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:INSTA_ART
+F:INVIS
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_NETHER
+F:STEALTH
 a:SUMMON_UNDEAD
 D:A large banner of pure black, strangely gleaming with a dark light 
 D:that is faint and at the same time so bright it attracts attention. 
@@ -2700,8 +4341,15 @@ N:192:of Saruman
 I:6:1:4
 W:60:80:12:60000
 P:0:1d4:5:5:0
-F:ACTIVATE | HIDE_TYPE | INT | MANA | SHOW_MODS | SPEED | 
-F:SPELL | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:MANA
+F:SHOW_MODS
+F:SPEED
+F:SPELL
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:BA_COLD_1
 Z:weigh magic
 D:A white quarterstaff that faintly gleams a pale white, it once belonged 
@@ -2716,8 +4364,18 @@ N:193:of Curunir
 I:36:2:10
 W:60:80:20:2000000
 P:2:0d0:-40:-40:36
-F:ACTIVATE | HIDE_TYPE | IM_COLD | IM_ELEC | SPEED | SPELL_CONTAIN |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | WIELD_CAST
+F:ACTIVATE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_ELEC
+F:SPEED
+F:SPELL_CONTAIN
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:WIELD_CAST
 a:BA_ELEC_2
 D:The white robe of the Istari wizard Curunir, known on Middle-earth as 
 D:Saruman the White and Saruman of Many Colours. Imbued with cold and 
@@ -2731,7 +4389,11 @@ N:194:of Brand
 I:19:23:10
 W:30:10:110:40000
 P:0:0d0:5:7:0
-F:ACTIVATE | HIDE_TYPE | RES_COLD | SHOW_MODS | STEALTH
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_COLD
+F:SHOW_MODS
+F:STEALTH
 a:RUNE_EXPLO
 D:The bow of Brand, last King of Dale. It was given to him 
 D:as a gift by the King under the Mountain of Erebor, and 
@@ -2744,7 +4406,10 @@ N:195:'Nimphelos'
 I:39:109:1
 W:20:10:10:40000
 P:0:1d1:0:0:0
-F:HIDE_TYPE | INFRA | INSTA_ART | LITE3 | SEARCH
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:LITE3
 Z:dazzle
 D:It was a gift from the Falas-Elves to the Naugrim who built Menegroth, 
 D:the abode of Thingol and Melian. It shines like starlight on the waves 
@@ -2757,10 +4422,26 @@ N:196:of Flames
 I:39:110:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:ACTIVATE | AUTO_CURSE | CURSED | DRAIN_EXP | DRAIN_MANA |
-F:ESP_EVIL | HEAVY_CURSE | HIDE_TYPE | INSTA_ART | LITE2 |
-F:LITE3 | RES_CHAOS | RES_DARK | RES_FIRE | RES_LITE |
-F:RES_NETHER | RES_NEXUS | RES_SHARDS | SEE_INVIS | STR
+F:ACTIVATE
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE2
+F:LITE3
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_SHARDS
+F:SEE_INVIS
+F:STR
 a:INVULN
 Z:banish evil
 D:A Silmaril of Feanor. It shines with the unquenchable light of the 
@@ -2778,9 +4459,24 @@ N:197:of the Seas
 I:39:111:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:ACTIVATE | AUTO_CURSE | CURSED | DRAIN_EXP | DRAIN_HP | ESP_EVIL |
-F:HEAVY_CURSE | HIDE_TYPE | INSTA_ART | INT | LITE2 | LITE3 |
-F:RES_CHAOS | RES_DARK | RES_LITE | RES_NETHER | RES_NEXUS | SEE_INVIS
+F:ACTIVATE
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INSTA_ART
+F:INT
+F:LITE2
+F:LITE3
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:SEE_INVIS
 a:RECALL
 Z:banish evil
 D:A Silmaril of Feanor. It shines with the unquenchable light of the 
@@ -2797,8 +4493,19 @@ N:198:of Numenor
 I:12:2:-3
 W:50:40:24:80000
 P:0:0d0:0:0:0
-F:ACTIVATE | AUTO_CURSE | CHR | CON | CURSED | HEAVY_CURSE |
-F:INSTA_ART | LUCK | SPEED | SPELL_CONTAIN | STR | WIELD_CAST | WRAITH
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:HEAVY_CURSE
+F:INSTA_ART
+F:LUCK
+F:SPEED
+F:SPELL_CONTAIN
+F:STR
+F:WIELD_CAST
+F:WRAITH
 a:DISP_GOOD
 D:The chief mark of royalty in Westernesse, it is said to have perished 
 D:in the fall of Numenor. It once belonged to Ar-Pharazon the Golden and 
@@ -2810,8 +4517,15 @@ N:199:of Annuminas
 I:12:3:4
 W:60:50:24:80000
 P:0:0d0:0:0:0
-F:ACTIVATE | BLESSED | CHR | FREE_ACT | INSTA_ART | LUCK |
-F:RES_CONF | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:FREE_ACT
+F:INSTA_ART
+F:LUCK
+F:RES_CONF
+F:SPELL_CONTAIN
+F:WIELD_CAST
 a:RUNE_PROT
 D:The chief mark of royalty in Arnor, possibly the oldest remaining work 
 D:of Men. It came from Numenor, but it belonged to the Lords of Andunie 
@@ -2824,9 +4538,20 @@ N:200:of Taniquetil
 I:39:4:2
 W:75:60:200:100000
 P:0:1d1:0:0:0
-F:ACTIVATE | BLESSED | ESP_ALL | HIDE_TYPE | INFRA | INT |
-F:LITE1 | LITE2 | LITE3 | RES_BLIND | RES_LITE | SEARCH |
-F:SEE_INVIS | WATER_BREATH | WIS
+F:ACTIVATE
+F:BLESSED
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:LITE2
+F:LITE3
+F:RES_BLIND
+F:RES_LITE
+F:SEE_INVIS
+F:WATER_BREATH
+F:WIS
 a:PALANTIR
 Z:detect curses
 D:This holy lamp once belonged to a seeress who warned Ar-Pharazon of 
@@ -2842,7 +4567,8 @@ N:201:
 I:9:1:0
 W:200:1:10:0
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 # The Palantir of Orthanc
@@ -2851,9 +4577,18 @@ N:202:of Orthanc
 I:39:104:2
 W:75:60:200:100000
 P:0:10d10:0:0:0
-F:WIS | INT | SEARCH | INFRA | HIDE_TYPE | ACTIVATE | ESP_ALL | 
-F:SEE_INVIS | RES_BLIND | AGGRAVATE | DRAIN_MANA | LITE2
+F:ACTIVATE
+F:AGGRAVATE
+F:DRAIN_MANA
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:INT
+F:LITE2
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
 a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
@@ -2868,10 +4603,19 @@ N:203:'Fuin'
 I:45:55:15
 W:110:0:2:3000000
 P:0:1d1:0:0:0
-F:SPEED | SEE_INVIS | LUCK | MAGIC_BREATH
-F:CURSED | HEAVY_CURSE | REGEN
-F:WRAITH | IM_NETHER | DRAIN_EXP | HOLD_LIFE | SPECIAL_GENE |
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:IM_NETHER
 F:INSTA_ART
+F:LUCK
+F:MAGIC_BREATH
+F:REGEN
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:WRAITH
 Z:teleport
 D:Imbued with the screams of the victims of undead everywhere, this 
 D:ring is more a hole in reality than anything else.  Strange forces ripple over 
@@ -2886,7 +4630,23 @@ N:204:'Coimir'
 I:40:18:2
 W:80:120:3:120000
 P:0:0d0:0:0:0
-F:FREE_ACT | HIDE_TYPE | HOLD_LIFE | INSTA_ART | LIFE | LITE1 | LUCK | REGEN | RES_NETHER | SLOW_DIGEST | SPECIAL_GENE | SPELL_CONTAIN | SUST_CON | SUST_DEX | SUST_STR | WATER_BREATH | WIELD_CAST
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LIFE
+F:LITE1
+F:LUCK
+F:REGEN
+F:RES_NETHER
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPELL_CONTAIN
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WATER_BREATH
+F:WIELD_CAST
 Z:restore life
 D:Called 'Life-jewel' by the Vanyar of old, this flawless sapphire 
 D:pendant bears potent runes that preserve body and soul.
@@ -2896,10 +4656,26 @@ D:pendant bears potent runes that preserve body and soul.
 N:205:of Durin
 I:45:57:2
 W:70:70:2:65000
-F:CON | CHR | STR | SUST_CHR | SUST_CON | SUST_STR | HIDE_TYPE | 
-F:ESP_EVIL | AGGRAVATE | HEAVY_CURSE | HOLD_LIFE | DRAIN_EXP | 
-F:RES_DARK | RES_CHAOS | RES_NETHER | RES_COLD | RES_ACID | 
-F:INSTA_ART | SPECIAL_GENE | CURSED
+F:AGGRAVATE
+F:CHR
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SPECIAL_GENE
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
 Z:Midas touch
 D:The greatest of the Seven Rings of the Dwarf-lords, and the last to be 
 D:lost.  Alone among the Seven, it was not taken by Sauron when he made 
@@ -2914,9 +4690,18 @@ N:206:'Elessar'
 I:40:19:4
 W:60:60:3:40000
 P:0:0d0:7:7:10
-F:STR | WIS | CHR | SPEED | LITE3 | INSTA_ART | 
-F:RES_FEAR | RES_FIRE | RES_POIS | RES_DISEN | HIDE_TYPE | 
 F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SPEED
+F:STR
+F:WIS
 a:ELESSAR
 D:This green gem glows with inner light.  Aragorn son of Arathorn wore 
 D:it at the Battle of the Pelennor Fields, and he was himself given the 
@@ -2928,9 +4713,18 @@ D:name of 'Elessar' by the people of Gondor because of this.
 N:207:'Evenstar'
 I:40:20:3
 W:50:50:3:35000
-F:HOLD_LIFE | SUST_CON | SUST_WIS | SUST_INT | LITE1 | CON | 
-F:RES_DARK | RES_COLD | RES_NETHER | REGEN | INSTA_ART | 
 F:ACTIVATE
+F:CON
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SUST_CON
+F:SUST_INT
+F:SUST_WIS
 a:REST_ALL
 D:A pure white jewel, the last gift of Queen Arwen Undomiel to Frodo 
 D:Baggins, intended to be worn around his neck on the chain that had 
@@ -2942,9 +4736,20 @@ N:208:of Minas Ithil
 I:39:107:-3
 W:75:60:200:0
 P:0:10d10:0:0:-30
-F:LIFE | CON | INT | WIS | ESP_ALL | LITE3 | LITE1
-F:CURSED | HEAVY_CURSE | TY_CURSE | DRAIN_EXP | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
+F:ACTIVATE
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_ALL
+F:HEAVY_CURSE
+F:INT
+F:LIFE
+F:LITE1
+F:LITE3
+F:RES_BLIND
+F:SEE_INVIS
+F:TY_CURSE
+F:WIS
 a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
@@ -2960,7 +4765,8 @@ N:209:of Thror
 I:8:33:0
 W:70:100:30:1
 P:0:0d0:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 D:A map made by Thror, the King under the Mountain. It shows the Lonely 
 D:Mountain of Erebor, the Running River, and the lands about devastated by 
 D:Smaug. It also contains mention of a secret entrance to the Mountain. 
@@ -2972,7 +4778,8 @@ N:210:of Thorin
 I:11:13:0
 W:70:100:5:1
 P:0:0d0:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 D:A small silver key, given to Thorin Oakenshield by Gandalf the Grey, 
 D:who got it from Thrain, Thorin's father, in Dol Guldur. It opens a 
 D:magical gate to a special cavern in the Lonely Mountain - you will 
@@ -2984,7 +4791,11 @@ N:211:of Thror
 I:11:14:0
 W:70:100:50:100000
 P:0:0d0:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD | HIDE_TYPE | INSTA_ART | SPECIAL_GENE
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:HIDE_TYPE
+F:INSTA_ART
+F:SPECIAL_GENE
 a:ALCHEMY
 D:It was made for Thror, King under the Mountain. It is a huge golden bowl 
 D:with two handles, hammered and carved, with birds and flowers whose eyes 
@@ -2996,7 +4807,10 @@ N:212:of Gondor
 I:11:15:0
 W:40:70:2:70000
 P:0:0d0:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD | HIDE_TYPE | INSTA_ART
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:HIDE_TYPE
+F:INSTA_ART
 a:BOROMIR
 D:The summons of Gondor, an arrow sent as a symbol of desperate need from 
 D:Gondor to its northern allies, the Rohirrim. The tradition dates back to 
@@ -3012,10 +4826,20 @@ N:213:of Forochel
 I:6:1:3
 W:65:70:60:60000
 P:0:3d4:-12:-8:0
-F:INT | WIS | MANA | SPELL | INFRA | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | RES_BLIND | IM_COLD | SENS_FIRE | 
-F:SPECIAL_GENE | WIELD_CAST | 
 F:COULD2H
+F:IM_COLD
+F:INFRA
+F:INT
+F:MANA
+F:RES_BLIND
+F:SEE_INVIS
+F:SENS_FIRE
+F:SPECIAL_GENE
+F:SPELL
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 D:A shaft of pure, invincible crystal cut from the heart of one 
 D:of the great glaciers ringing the Ice-Bay of Forochel. 
@@ -3028,8 +4852,15 @@ N:214:of Mellyrn
 I:35:2:4
 W:40:40:5:65000
 P:4:0d0:0:0:20
-F:HIDE_TYPE | INVIS | DEX |  SPEED | STEALTH | LUCK | 
-F:SUST_DEX | RES_LITE | RES_DARK
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:Bearing the same lyrical name as the great trees of Lothlorien 
 D:and containing in its close-woven folds the speed and skill of 
 D:the Galadrim, this grey cloak is ideal for those who travel in 
@@ -3042,8 +4873,17 @@ N:215:of Ephel Duath
 I:23:31:-3
 W:60:60:50:30000
 P:0:2d6:-20:-18:0
-F:STR | WIS | CHR | BRAND_POIS | VAMPIRIC | VORPAL | 
-F:INVIS | AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | 
+F:AGGRAVATE
+F:BRAND_POIS
+F:CHR
+F:CURSED
+F:HEAVY_CURSE
+F:INVIS
+F:SHOW_MODS
+F:STR
+F:VAMPIRIC
+F:VORPAL
+F:WIS
 D:This filthy orc-blade is famed for vile deeds of torture and blood, 
 D:and its wielder will never cease to fear treachery.
 
@@ -3054,10 +4894,21 @@ N:216:'Garachoth'
 I:24:30:2
 W:70:50:400:0
 P:0:7d5:18:18:-20
-F:STR | CON | SPEED | LEVELS | BLACK_BREATH | 
-F:KILL_DEMON | SLAY_ANIMAL | BRAND_FIRE | VORPAL | 
-F:RES_FEAR | RES_FIRE | RES_CHAOS | RES_NETHER | 
-F:HIDE_TYPE | SHOW_MODS
+F:BLACK_BREATH
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LEVELS
+F:RES_CHAOS
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NETHER
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SPEED
+F:STR
+F:VORPAL
 D:A ghastly axe with the soul of a demon lord trapped inside, this horrifying 
 D:creation reverberates with the screams of the damned.  As you gaze into its 
 D:glassy, translucent blade, it seems that endless sulphrous wastelands 
@@ -3070,9 +4921,19 @@ N:217:'Skycleaver'
 I:31:5:1
 W:40:45:40:100000
 P:5:1d1:16:7:16
-F:STR | CON | DEX | CHR | LUCK | FLY | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:HIDE_TYPE | SHOW_MODS
+F:CHR
+F:CON
+F:DEX
+F:FLY
+F:HIDE_TYPE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:STR
 D:The handgear of a legendary dragonslaying hero.  The wearer of these 
 D:wyrmskin gauntlets will be versed in all aerial ways, and will fear no 
 D:dragon that walks or flies.
@@ -3085,9 +4946,16 @@ N:218:of the Machine
 I:30:6:3
 W:30:100:170:19000
 P:6:1d1:0:0:24
-F:INT | SPEED | TUNNEL | AGGRAVATE | 
-F:RES_CHAOS | RES_SHARDS | RES_CONF | 
-F:ESP_NONLIVING | HIDE_TYPE | SPECIAL_GENE
+F:AGGRAVATE
+F:ESP_NONLIVING
+F:HIDE_TYPE
+F:INT
+F:RES_CHAOS
+F:RES_CONF
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
+F:TUNNEL
 D:A massive pair of adamantine boots studded with gold, the final and 
 D:greatest product of the petty-dwarven magical forge.  Despite 
 D:the great powers they contain, they are heavy and awkward enough to 
@@ -3102,7 +4970,17 @@ N:219:of Belegaer
 I:36:2:5
 W:100:200:20:1500000
 P:2:0d0:0:0:20
-F:FREE_ACT | HIDE_TYPE | IM_ACID | IM_COLD | IM_ELEC | LITE1 | LUCK | RES_BLIND | RES_DARK | SEARCH | STEALTH | WATER_BREATH
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:LITE1
+F:LUCK
+F:RES_BLIND
+F:RES_DARK
+F:STEALTH
+F:WATER_BREATH
 D:This pearl-trimmed blue robe was created by a Maia loremaster in 
 D:Ulmo's service.  No ocean storm can harm its wearer or anything 
 D:he carries; the pressure and darkness of deep water cannot hinder 
@@ -3114,7 +4992,13 @@ N:220:of Girion
 I:40:4:5
 W:20:5:2:15000
 P:0:1d1:0:0:10
-F:ACTIVATE | CHR | INSTA_ART | RES_NEXUS | RES_POIS | SEE_INVIS | SUST_CHR
+F:ACTIVATE
+F:CHR
+F:INSTA_ART
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SUST_CHR
 a:GROW_MOLD
 D:A necklace of emeralds, green as the grass. It once belonged to Girion, 
 D:King of Dale, and was given to the Dwarves of the Lonely Mountain as 
@@ -3127,7 +5011,11 @@ N:221:'Dailir'
 I:18:3:5
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:CRIT | HIDE_TYPE | SHOW_MODS | VORPAL | WOUNDING
+F:CRIT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The beloved dart of Beleg Cuthalion. It never failed to be found 
 D:unharmed, until it broke when Beleg fell upon it while he was 
 D:carrying Turin Turambar away from an Orc-camp, the night Beleg 
@@ -3141,7 +5029,12 @@ N:222:of Faramir
 I:40:29:5
 W:10:2:2:10000
 P:0:0d0:18:0:8
-F:HIDE_TYPE | INSTA_ART | RES_CONF | SHOW_MODS | STEALTH | SUST_DEX
+F:HIDE_TYPE
+F:INSTA_ART
+F:RES_CONF
+F:SHOW_MODS
+F:STEALTH
+F:SUST_DEX
 D:A slim neckpiece of True-silver, with quiet spells of Ithilien to aid and 
 D:protect the wearer.
 
@@ -3152,7 +5045,12 @@ N:223:of Earendil
 I:34:8:0
 W:95:80:100:90000
 P:20:1d1:0:0:80
-F:ACTIVATE | RES_BLIND | RES_DARK | RES_ELEC | RES_FIRE | RES_NETHER
+F:ACTIVATE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
 a:BLADETURNER
 D:A shining shield, once borne by the great mariner Earendil, "scored with 
 D:runes to keep all wounds and harm from him".
@@ -3163,8 +5061,14 @@ N:224:of Legolas
 I:19:13:3
 W:40:20:40:30000
 P:0:0d0:17:19:0
-F:XTRA_MIGHT | XTRA_SHOTS | FREE_ACT | HIDE_TYPE | ESP_ORC |
-F:STEALTH | INFRA | DEX
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:STEALTH
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:The great bow of Legolas, one of the Nine Walkers of old. 
 D:Handcrafted specially for Thranduil's son in Lothlorien, 
 D:this bow gives clarity of sight and agility to the wielder. 
@@ -3175,8 +5079,14 @@ N:225:of Erkenbrand
 I:34:5:3
 W:40:9:120:200000
 P:0:0d0:0:0:30
-F:REFLECT | STR | CHR | SUST_DEX | HIDE_TYPE | ESP_ORC | 
-F:FREE_ACT | REGEN
+F:CHR
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:REFLECT
+F:REGEN
+F:STR
+F:SUST_DEX
 D:Tall and strong stood Erkenbrand, Lord of the Westfold, as he rode 
 D:to combat the forces of Isengard. The valour of Helm Hammerhand lived 
 D:again in him. This shield is painted red according to Rohan custom 
@@ -3207,12 +5117,39 @@ N:241:of the Eruchin
 I:21:10:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL | 
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON | 
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:A weapon forged by Aule himself and blessed by Eru Iluvatar, 
 D:calling upon the strength of all his children (hence the name, 
@@ -3225,12 +5162,39 @@ N:242:of Ulmo
 I:22:5:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL |
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON |
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightiest of all the 
 D:powers of good save Manwe himself, Ulmo laughs in scorn at the dread powers 
@@ -3242,12 +5206,39 @@ N:243:of Aule
 I:24:11:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL |
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON |
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:Aule's mighty weapon, granted to you to aid the defeat of Melkor. 
 
@@ -3257,12 +5248,39 @@ N:244:of Vaire
 I:23:7:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE | CHR |
-F:CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK | NO_MAGIC |
-F:PRECOGNITION | REGEN | RES_DARK | RES_FIRE | SEE_INVIS | SHOW_MODS |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_TROLL | SLAY_UNDEAD | SLOW_DIGEST |
-F:SPECIAL_GENE | SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR |
-F:SUST_WIS | ULTIMATE | VORPAL
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
 a:ERU
 D:A shining rapier used by Vaire to cut the strings of time when 
 D:dire need arises. Its power with that of the Flame Imperishable 
@@ -3274,12 +5292,38 @@ N:245:of Irmo
 I:19:13:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR |
-F:SUST_WIS | ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:A gift from Orome to Irmo, a mighty bow that sings the songs of the 
 D:garden of Lorien. It will guide your hand and steady your grip in 
 D:your encounter with Melkor. 
@@ -3290,12 +5334,38 @@ N:246:of Nessa
 I:19:2:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS |
-F:ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was made for the most lithe of the Valier to provide 
 D:her with amusement as she used it to shoot magical pebbles of 
 D:cheer and charm while dancing in the lush green fields of Valinor. 
@@ -3307,12 +5377,38 @@ N:247:of Varda
 I:15:4:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS |
-F:ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:Made from living starlight, this boomerang will dispel the darkest 
 D:of darkness. It is a gift from Varda Elentari, to aid you in your 
 D:task. 
@@ -3323,11 +5419,33 @@ N:248:of Mandos
 I:40:27:0
 W:100:16:60:500000
 P:0:2d4:0:0:85
-F:ACTIVATE | ESP_DRAGON | FEATHER | FLY | HOLD_LIFE | IGNORE_ACID |
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | REGEN | RES_ACID |
-F:RES_BLIND | RES_CHAOS | RES_COLD | RES_CONF | RES_DARK | RES_DISEN |
-F:RES_ELEC | RES_FIRE | RES_LITE | RES_NETHER | RES_NEXUS | RES_POIS |
-F:RES_SHARDS | RES_SOUND | SPECIAL_GENE | ULTIMATE
+F:ACTIVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
 a:BLADETURNER
 D:This amulet contains the power of Mandos, the Doomsman of the 
 D:Valar. It will grant you protection against the foul dark magic 
diff --git a/lib/mods/theme/edit/ab_info.txt b/lib/mods/theme/edit/ab_info.txt
index 976c6d03..579368f4 100644
--- a/lib/mods/theme/edit/ab_info.txt
+++ b/lib/mods/theme/edit/ab_info.txt
@@ -20,8 +20,6 @@
 # S:level(linear mode):stats
 # a:needed ability
 
-# E:excluding ability:excluding ability
-
 # Do not forget to update misc.txt with an entry like the following :
 # Maximum number of traits in ab_info.txt
 # M:b:50
@@ -86,13 +84,6 @@ A:102:Far reaching attack
 k:15:Combat
 k:15:Polearm-mastery
 
-N:9:Trapping
-D:Ability to set monster traps
-D:Prereq: Disarming@15
-I:10
-A:14:Set trap
-k:15:Disarming
-
 N:10:Undead Form
 D:Ability to turn into a weak undead being when you "die".
 D:You must then kill enough monsters to absorb enough life energy
diff --git a/lib/mods/theme/edit/ba_info.txt b/lib/mods/theme/edit/ba_info.txt
index b0270989..c8c7f9c5 100644
--- a/lib/mods/theme/edit/ba_info.txt
+++ b/lib/mods/theme/edit/ba_info.txt
@@ -85,10 +85,6 @@ N:17:Look at busts of Kings
 C:0:0:0
 I:5:0:l
 
-N:18:Research monster
-C:1600:1500:1400
-I:20:0:r
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
@@ -257,4 +253,4 @@ I:18:2:f
 # Ask Bard for directions to Erebor
 N:66:Ask about Erebor
 C:0:0:0
-I:66:0:a
\ No newline at end of file
+I:66:0:a
diff --git a/lib/mods/theme/edit/between.map b/lib/mods/theme/edit/between.map
index 4fed5c95..375d1ef2 100644
--- a/lib/mods/theme/edit/between.map
+++ b/lib/mods/theme/edit/between.map
@@ -23,16 +23,16 @@ F:G:89:5:955
 F:L:89:5:956
 
 # Floor with grass with a brown thunderlord
-F:B:89:5:957:0:0:0:0:0:0:2
+F:B:89:5:957:0:0:0:0:0:2
 
 # Floor with grass with a bronze thunderlord
-F:z:89:5:958:0:0:0:0:0:0:2
+F:z:89:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a bronze thunderlord
-F:Z:88:5:958:0:0:0:0:0:0:2
+F:Z:88:5:958:0:0:0:0:0:2
 
 # Floor with grass with a gold thunderlord
-F:D:88:5:959:0:0:0:0:0:0:2
+F:D:88:5:959:0:0:0:0:0:2
 
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:X..T.TT..T...T...T...T.....T....T......T...T.,,.....T......T....T...T.T..T..TT...T..T.TT.T.TT.TX
diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt
index f5d836f6..0f8680af 100644
--- a/lib/mods/theme/edit/d_info.txt
+++ b/lib/mods/theme/edit/d_info.txt
@@ -12,7 +12,7 @@
 
 # N:<index>:<name>
 # D:<3 letter short name>:<long name>
-# W:<min depth>:<max depth>:<min player level>:<next dungeon>:<min alloc>:<max alloc chance>
+# W:<min depth>:<max depth>:<min player level>:<min alloc>:<max alloc chance>
 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>
 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>
 # O:<%treasure>:<%combat>:<%magic>:<%tools>
@@ -33,59 +33,73 @@
 
 N:0:Wilderness
 D:Wil:a way to the Wilderness
-W:0:0:0:0:14:500
+W:0:0:0:14:500
 L:89:80:199:20:1:0
 A:96:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | FLAT | NO_RECALL
+F:FLAT
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 ### The principal dungeons, they were created by spliting the vanilla dungeon ###
 
 N:1:Mirkwood
 D:Mkw:a way to the Mirkwood Forest.
-W:11:33:5:0:14:160
+W:11:33:5:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:PRINCIPAL | NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:PRINCIPAL
 R:100:0
 
 N:2:Barad-Dur
 D:BDr:a door to the tower of Barad-Dur.
-W:34:66:15:0:14:160
+W:34:66:15:14:160
 L:88:67:93:33:1:0
 L:0:100:0
 A:97:50:56:50:56:0:57:97
 A:0:100:0
 O:20:20:20:20
-F:PRINCIPAL | LAVA_RIVER | CAVERN | NO_STREAMERS
-F:FILL_METHOD_2 | NO_RECALL
+F:CAVERN
+F:FILL_METHOD_2
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
+F:PRINCIPAL
 R:100:0
 
 N:3:Angband
 D:Ang:an entrance to the Pits of Angband.
-W:67:100:30:0:14:160
+W:67:100:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | CAVERN | NO_EASY_MOVE | NO_RECALL
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
 F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 N:4:Barrow-Downs
 D:BDw:a way to the Barrow-Downs.
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 # Theme adds *fog* (dense mist) on the Barrow-Downs :)
 #L:88:94:210:2:199:4
 L:88:78:89:18:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:PRINCIPAL | FLAT
 F:FILL_METHOD_3
+F:FLAT
+F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
@@ -96,13 +110,17 @@ R:75:0
 # Levels 85-99
 N:5:Orodruin
 D:MDm:a way to the top of the Mount Doom.
-W:85:99:18:0:14:160
+W:85:99:18:14:160
 L:86:90:205:10:1:0
 A:177:100:0:0:0:0:85:87
 O:10:10:30:30
 E:2d10:10:FIRE
-F:CAVE | LAVA_RIVER | NO_RECALL | NO_STREAMERS
-F:FILL_METHOD_0 | NO_EASY_MOVE
+F:CAVE
+F:FILL_METHOD_0
+F:LAVA_RIVER
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_STREAMERS
 R:100:1
 M:IM_FIRE
 
@@ -111,47 +129,65 @@ M:IM_FIRE
 # guarded by Tik'srvzllat, who has the Ring 'Fuin'
 N:6:Nether Realm
 D:Nth:a magical portal to the Nether Realm.
-W:666:696:40:0:14:160
+W:666:696:40:14:160
 L:102:80:86:15:85:5
 A:85:80:87:20:87:0:57:85
 A:50:50:0
 O:25:25:25:25
 E:10d10:3:NETHER
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_SHAFT
-F:ADJUST_LEVEL_2 | NO_RECALL | NO_STREAMERS
-F:LAVA_RIVER | FINAL_GUARDIAN_1032 | FINAL_ARTIFACT_203
-F:FILL_METHOD_2 | NO_RECALL_OUT
+F:ADJUST_LEVEL_2
+F:EMPTY
+F:FILL_METHOD_2
+F:FINAL_ARTIFACT_203
+F:FINAL_GUARDIAN_1032
+F:FORGET
+F:LAVA_RIVER
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:5:0
 R:95:3
-M:RES_NETH | R_CHAR_G | R_CHAR_W | R_CHAR_U
+M:RES_NETH
+M:R_CHAR_G
+M:R_CHAR_U
+M:R_CHAR_W
 
 # The Lost Land of Numenor
 # levels 35-50
 # guarded by Ar-Pharazon the Golden, who has the stone "Coimir".
 N:7:Submerged Ruins
 D:Num:a submerged way to the lost land of Numenor.
-W:35:50:25:0:14:160
+W:35:50:25:14:160
 L:84:95:187:5:1:0
 A:187:80:84:10:56:10:57:187
 A:60:0:40
 O:30:30:10:10
 E:1d1:1:ACID
+F:FILL_METHOD_3
+F:FINAL_ARTIFACT_204
+F:FINAL_GUARDIAN_980
 F:NO_STREAMERS
-F:FINAL_GUARDIAN_980 | FINAL_ARTIFACT_204
-F:FILL_METHOD_3 | WATER_BREATH
+F:WATER_BREATH
 R:20:0
 R:80:3
-M:AQUATIC | CAN_SWIM | CAN_FLY
+M:AQUATIC
+M:CAN_FLY
+M:CAN_SWIM
 
 # Used for astral mode
 N:8:Halls of Waiting
 D:HWa:*A BUG*YOU should see this message!*
-W:1:98:1:0:14:160
+W:1:98:1:14:160
 L:1:100:1:0:1:0
 O:20:20:20:20
 A:56:100:56:0:56:0:57:58
-F:RANDOM_TOWNS | NO_RECALL | NO_SHAFT
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_SHAFT
+F:RANDOM_TOWNS
 R:100:2
 M:UNIQUE
 
@@ -161,37 +197,51 @@ M:UNIQUE
 # Updated for Theme to lead out into Gorgoroth a la Moria
 N:9:Cirith Ungol
 D:CUg:an entrance to Cirith Ungol.
-W:25:50:10:0:14:160
+W:25:50:10:14:160
 L:87:5:88:65:16:30
 A:97:90:16:10:56:0:16:58
 O:30:30:30:10
 E:4d4:20:POISON
-F:FINAL_GUARDIAN_481
-F:RANDOM_TOWNS | CIRCULAR_ROOMS
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_481
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_65_56__67_53
 R:2:0
 R:49:3
-M:SPIDER | R_CHAR_a | R_CHAR_I | 
+M:R_CHAR_I
+M:R_CHAR_a
+M:SPIDER
 R:49:3
-M:ORC | R_CHAR_w | R_CHAR_m | R_CHAR_j
+M:ORC
+M:R_CHAR_j
+M:R_CHAR_m
+M:R_CHAR_w
 
 # The Heart of the Earth
 # levels 25-36
 # guarded by Golgarach, the Living Rock
 N:10:Heart of the Earth
 D:HoE:a passage leading into the very heart of the world.
-W:25:36:10:0:14:160
+W:25:36:10:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:40:10:10:20
 G:life
-F:EVOLVE | FINAL_GUARDIAN_1035 | NO_RECALL | NO_SHAFT
+F:EVOLVE
+F:FINAL_GUARDIAN_1035
+F:NO_RECALL
+F:NO_SHAFT
 R:40:3
-M:R_CHAR_# | R_CHAR_X | R_CHAR_g | R_CHAR_E | 
+M:R_CHAR_#
+M:R_CHAR_E
+M:R_CHAR_X
+M:R_CHAR_g
 R:30:3
-M:PASS_WALL | KILL_WALL | HURT_ROCK
+M:HURT_ROCK
+M:KILL_WALL
+M:PASS_WALL
 R:30:0
 
 # The Void
@@ -199,30 +249,43 @@ R:30:0
 # Where Melkor lurks for the final battle!
 N:11:The Void
 D:Vod:a jumpgate to the Void
-W:128:150:40:0:20:160
+W:128:150:40:20:160
 L:183:97:102:3:0:0
 A:183:90:102:10:0:0:102:102
 A:40:60:0
 O:25:25:25:25
 E:20d6:100:DARK
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_RECALL_OUT | NO_RECALL |
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:EMPTY
 F:FILL_METHOD_2
-F:FINAL_GUARDIAN_1044 |
+F:FINAL_GUARDIAN_1044
+F:FORGET
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:1:0
 R:99:3
-M:UNDEAD | DEMON | DRAGON | NONLIVING | SPIRIT
+M:DEMON
+M:DRAGON
+M:NONLIVING
+M:SPIRIT
+M:UNDEAD
 
 # TEST dungeon
 N:12:Test
 D:Tst:a way to test dungeon gen
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:177:100:0:0:0:0:85:87
 A:100:0:0
 O:20:20:20:20
-F:FILL_METHOD_3 | SMALL
+F:FILL_METHOD_3
+F:SMALL
 R:100:0
 G:dungeon2
 
@@ -232,50 +295,70 @@ G:dungeon2
 # Feagwath is there, guarding Doomcaller
 N:16:Paths of the Dead
 D:PoD:the entrance to the Paths of the Dead.
-W:40:70:18:0:24:100
+W:40:70:18:24:100
 L:88:85:84:15:1:0
 A:56:75:87:25:56:0:57:58
 O:30:30:30:2
 E:1d1:20:RAISE
-F:FINAL_GUARDIAN_804 | FINAL_ARTIFACT_91
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_91
+F:FINAL_GUARDIAN_804
 R:5:0
 R:10:3
 M:R_CHAR_p
 R:85:3
-M:UNDEAD | NONLIVING
+M:NONLIVING
+M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
 # Guarded by The Glass Golem guarding The Helm of Knowledge
 N:17:Illusory Castle
 D:Ill:an entrance to the Illusory Castle.
-W:35:52:10:0:24:100
+W:35:52:10:24:100
 L:1:98:188:2:1:0
 A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
-F:RANDOM_TOWNS | NO_STREAMERS
-F:FINAL_GUARDIAN_1033 | FINAL_ARTIFACT_160
 F:FILL_METHOD_1
+F:FINAL_ARTIFACT_160
+F:FINAL_GUARDIAN_1033
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:0
 R:70:3
-M:STUPID | WEIRD_MIND | SHAPECHANGER | ATTR_MULTI | CHAR_MULTI | RAND_25 |
-M:RAND_50 | EMPTY_MIND | INVISIBLE | PASS_WALL | KILL_WALL
-S:BR_CONF | BR_CHAO | BA_CHAO | CONF | FORGET | TRAPS | MULTIPLY
+M:ATTR_MULTI
+M:CHAR_MULTI
+M:EMPTY_MIND
+M:INVISIBLE
+M:KILL_WALL
+M:PASS_WALL
+M:RAND_25
+M:RAND_50
+M:SHAPECHANGER
+M:STUPID
+M:WEIRD_MIND
+S:BA_CHAO
+S:BR_CHAO
+S:BR_CONF
+S:CONF
+S:FORGET
+S:MULTIPLY
 
 # The Maze
 # Levels 25-37
 # Guarded by The Minotaur of the Labyrinth with the Steel Helm of Hammerhand
 N:18:Maze
 D:Maz:a small tunnel leading to a maze of twisty little passages, all alike.
-W:25:37:15:0:20:160
+W:25:37:15:20:160
 L:1:100:1:0:1:0
 A:56:98:48:2:56:0:57:58
 O:2:40:10:40
 G:maze
-F:SMALLEST | FORGET
-F:FINAL_GUARDIAN_1029 | FINAL_ARTIFACT_38
+F:FINAL_ARTIFACT_38
+F:FINAL_GUARDIAN_1029
+F:FORGET
+F:SMALLEST
 R:80:0
 R:20:3
 M:R_CHAR_p
@@ -285,76 +368,98 @@ M:R_CHAR_p
 # There is Azog with the Wand of Thrain at the bottom
 N:19:Orc Cave
 D:Orc:a dark tunnel leading to an Orc Cave.
-W:10:22:8:0:35:200
+W:10:22:8:35:200
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:5:50:10:25
-F:RANDOM_TOWNS | 
-F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE |
+F:CAVE
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_373
+F:FINAL_OBJECT_810
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_49_21__51_19
 R:30:3
 M:TROLL
 R:20:0
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Erebor
 # levels 60-72
 # There is Glaurung
 N:20:Erebor
 D:Ere:a tunnel leading into depths of the Lonely Mountain.
-W:60:72:30:0:20:140
+W:60:72:30:20:140
 L:88:100:1:0:1:0
 A:97:90:87:10:56:0:57:97
 O:40:40:40:40
-F:BIG | LAVA_RIVER | CAVERN | NO_RECALL | NO_STREAMERS
-F:CAVE | DOUBLE | FINAL_GUARDIAN_715 | 
+F:BIG
+F:CAVE
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_715
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
 R:10:0
 R:60:1
-M:DRAGON | R_CHAR_D
+M:DRAGON
+M:R_CHAR_D
 R:30:1
-M:DRAGON | R_CHAR_d
+M:DRAGON
+M:R_CHAR_d
 
 # The Old Forest
 # levels 13-25
 # Old Man Willow protects it
 N:21:The Old Forest
 D:OFr:a path into the Old Forest.
-W:13:25:5:0:15:100
+W:13:25:5:15:100
 L:88:76:84:16:199:8
 L:68:16:16
 A:96:100:56:0:56:0:202:96
 O:20:5:15:30
-F:WATER_RIVERS | NO_DOORS | NO_DESTROY | FLAT | NO_STREAMERS
-F:RANDOM_TOWNS | FINAL_GUARDIAN_206
 F:FILL_METHOD_3
+F:FINAL_GUARDIAN_206
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:WATER_RIVERS
 R:30:0
 R:40:3
-M:ANIMAL 
+M:ANIMAL
 R:30:3
-M:UNDEAD | R_CHAR_h | R_CHAR_l
+M:R_CHAR_h
+M:R_CHAR_l
+M:UNDEAD
 
 # The Mines of Moria
 # levels 30-50
 # There is Durin's Bane
 N:22:Moria
 D:MoM:a stone door leading to the Mines of Moria.
-W:30:50:20:0:40:40
+W:30:50:20:40:40
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:30:50:10:5
-F:FINAL_GUARDIAN_872 | WATER_RIVER | NO_STREAMERS
+F:FILL_METHOD_0
+F:FINAL_GUARDIAN_872
 F:FORCE_DOWN
+F:NO_STREAMERS
 F:RANDOM_TOWNS
+F:WATER_RIVER
 F:WILD_45_30__44_37
-F:FILL_METHOD_0
 R:40:3
 M:ORC
 R:30:3
-M:TROLL | GIANT
+M:GIANT
+M:TROLL
 R:20:3
 M:DEMON
 R:10:0
@@ -364,20 +469,25 @@ R:10:0
 # The Necromancer (weak Sauron) at the bottom, with the Ring of Durin
 N:23:Dol Guldur
 D:TDG:a gate leading to the tower of Dol Guldur.
-W:57:70:34:0:24:160
+W:57:70:34:24:160
 L:1:80:174:20:1:0
 A:56:100:56:0:56:0:57:58
 O:20:1:70:9
-F:SMALL | FINAL_GUARDIAN_819 | FINAL_ARTIFACT_205
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_205
+F:FINAL_GUARDIAN_819
+F:SMALL
 R:30:3
-M:R_CHAR_p | R_CHAR_P
+M:R_CHAR_P
+M:R_CHAR_p
 R:10:3
-M:ORC | TROLL
+M:ORC
+M:TROLL
 R:20:3
 M:UNDEAD
 R:30:3
-M:DEMON | DRAGON
+M:DEMON
+M:DRAGON
 R:10:0
 
 # Dungeons from Variaz
@@ -387,13 +497,14 @@ R:10:0
 # The Watcher in the Water is at the bottom
 N:24:The Small Water Cave
 D:SWC:the entrance to a small water cave.
-W:32:34:20:0:14:160
+W:32:34:20:14:160
 L:84:100:84:0:84:0
 A:97:100:56:0:56:0:57:58
 O:10:10:30:30
 E:1d1:20:ACID
-F:FINAL_GUARDIAN_517 | NO_RECALL
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_517
+F:NO_RECALL
 R:10:0
 R:10:3
 M:AQUATIC
@@ -409,13 +520,16 @@ M:IM_COLD
 # Levels 45-70
 N:25:The Sacred Land Of Mountains
 D:LoM:the way to the Sacred Land of Mountains.
-W:45:70:20:0:14:160
+W:45:70:20:14:160
 L:89:100:89:0:89:0
 A:97:100:56:0:56:0:97:97
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS
-F:FINAL_GUARDIAN_789 | FINAL_ARTIFACT_228
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_193
+F:FINAL_GUARDIAN_789
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:60:3
 M:CAN_FLY
 R:40:0
@@ -425,14 +539,19 @@ R:40:0
 # Guarded by Ulfang the Black, Morgoth's first Easterling follower.
 N:26:The Land Of Rhun
 D:LoR:a way to the Land of Rhun.
-W:26:40:15:0:14:160
+W:26:40:15:14:160
 L:89:100:1:0:1:0
 A:89:50:96:25:84:25:57:58
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS | FINAL_GUARDIAN_990
 F:FILL_METHOD_1
+F:FINAL_GUARDIAN_990
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:3
-M:R_CHAR_p | R_CHAR_h | R_CHAR_l 
+M:R_CHAR_h
+M:R_CHAR_l
+M:R_CHAR_p
 R:30:3
 M:ANIMAL
 R:40:0
@@ -442,13 +561,15 @@ R:40:0
 # guarded by the Sandworm Queen (and her children), who will drop her armour
 N:27:The Withered Heath
 D:SwL:the Withered Heath, from whence came the Great Worms.
-W:22:30:12:0:5:200
+W:22:30:12:5:200
 L:91:85:94:10:93:5
 A:98:100:96:0:84:0:94:94
 O:15:5:60:20
-F:NO_DOORS | SAND_VEIN |
-F:FINAL_GUARDIAN_1030 | FINAL_ARTIFACT_153
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_153
+F:FINAL_GUARDIAN_1030
+F:NO_DOORS
+F:SAND_VEIN
 R:100:1
 M:R_CHAR_w
 R:10:3
@@ -457,12 +578,15 @@ S:MULTIPLY
 # Used by the death fate
 N:28:Death fate
 D:Dth:a fated death.
-W:1:1:1:0:30:255
+W:1:1:1:30:255
 L:1:100:1:0:1:0
 A:1:100:1:0:1:0:1:1
 O:1:1:1:1
-F:EMPTY | SMALLEST | NO_RECALL | NO_STREAMERS
+F:EMPTY
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_STREAMERS
+F:SMALLEST
 R:100:0
 
 # The Grinding Ice
@@ -470,16 +594,19 @@ R:100:0
 # Guarded by Elenwe the Lost
 N:29:The Helcaraxe
 D:Ice:the entrance to the Grinding Ice of the Helcaraxe.
-W:20:40:10:0:14:160
+W:20:40:10:14:160
 L:90:0:88:70:84:30
 L:90:0:10
 A:95:0:56:100:56:0:57:58
 A:100:0:0
 O:20:20:20:20
 E:1d4:15:COLD
-F:DOUBLE | WATER_RIVER | CAVERN | NO_STREAMERS
-F:FINAL_GUARDIAN_1034 | 
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_1034
+F:NO_STREAMERS
+F:WATER_RIVER
 R:100:1
 M:IM_COLD
 
@@ -489,11 +616,12 @@ M:IM_COLD
 # See god.lua for details
 N:30:a Lost Temple
 D:LTm:the entrance to a lost temple.
-W:1:50:1:0:14:160
+W:1:50:1:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:FILL_METHOD_4 | NO_RECALL
+F:FILL_METHOD_4
+F:NO_RECALL
 R:100:0
 
 ### New dungeons added for Theme module ###
@@ -504,7 +632,7 @@ R:100:0
 # Guarded by The Hunter
 N:31:Forodwaith
 D:NWa:a path leading through the wastelands of the North
-W:75:80:40:0:14:160
+W:75:80:40:14:160
 # ice, ash, and dirt
 L:90:20:93:40:88:40
 #Ugly - using floor tiles for walls, only rooms have real walls
@@ -512,58 +640,84 @@ A:90:20:93:40:88:40:88:211
 O:20:20:20:20
 # it is always dark here in the northern wastelands
 E:2d4:1:DARK
-F:NO_DOORS | CAVERN | COLD | NO_DESTROY | EMPTY | FLAT | 
-F:NO_RECALL | LIFE_LEVEL | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_389 | 
+F:CAVERN
+F:COLD
+F:EMPTY
 F:FILL_METHOD_4
+F:FINAL_GUARDIAN_389
+F:FLAT
+F:LIFE_LEVEL
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_RECALL
+F:NO_SHAFT
+F:NO_STREAMERS
 R:100:3
-M:COLD_BLOOD | HURT_LITE | IM_COLD
+M:COLD_BLOOD
+M:HURT_LITE
+M:IM_COLD
 
 # Emyn Luin
 # levels 60-70
 # Guarded by Naugladur, who has Nauglamir
 N:32:Emyn Luin
 D:ELu:a path into the depths of the Blue Mountains
-W:60:70:30:0:14:160
+W:60:70:30:14:160
 # grass, flowers, and dirt
 L:89:45:81:5:88:50
 # blue mountains, granite, hailstones
 A:215:100:215:0:215:0:56:211
 # lots of treasure, not much magic
 O:50:20:10:30
-F:CAVE | CAVERN | CIRCULAR_ROOMS | RANDOM_TOWNS | 
-F:NO_STREAMERS | NO_RECALL | NO_DESTROY 
+F:CAVE
+F:CAVERN
+F:CIRCULAR_ROOMS
+F:NO_DESTROY
+F:NO_RECALL
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 # no_recall because it should not be so easy to get Nauglamir. :P
-F:FINAL_GUARDIAN_457 | FINAL_ARTIFACT_6 
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_6
+F:FINAL_GUARDIAN_457
 R:100:0
-M:R_CHAR_k | R_CHAR_o
+M:R_CHAR_k
+M:R_CHAR_o
 
 #Dol Amroth - Castle of Prince Imrahil
 #levels 25-35
 #Guarded by Prince Imrahil (yes, he's evil in this game)
 N:33:Dol Amroth
 D:DAm:a way to the top of the castle of Dol Amroth
-W:25:35:15:0:14:160
+W:25:35:15:14:160
 # Vanilla-style
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:SMALLEST | NO_DESTROY | TOWER | RANDOM_TOWNS | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_STAIR | 
-F:NO_EASY_MOVE | FILL_METHOD_2 
-F:FINAL_GUARDIAN_402 | 
+F:ADJUST_LEVEL_1
+F:FILL_METHOD_2
+F:FINAL_GUARDIAN_402
+F:NO_DESTROY
+F:NO_EASY_MOVE
+F:NO_SHAFT
+F:NO_STAIR
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:SMALLEST
+F:TOWER
 R:80:3
-M:R_CHAR_p | R_CHAR_P 
+M:R_CHAR_P
+M:R_CHAR_p
 R:20:3
-M:SMART | TAKE_ITEM
+M:SMART
+M:TAKE_ITEM
 
 #Angmar
 #levels 80-90
 #Guarded by Fuinur, who has Eowyn's sword
 N:34:Angmar
 D:WRA:a dark path through the Witch Realm of Angmar
-W:80:90:49:0:14:160
+W:80:90:49:14:160
 # Tainted, dark, evil
 L:93:70:174:20:226:10
 # Dark mountain chains only
@@ -571,20 +725,30 @@ A:214:100:214:0:214:0:214:214
 O:20:20:20:20
 # In addition to swamp water poison, we have disenchantment
 E:1d1:1:DISENCHANT
-F:ADJUST_LEVEL_1_2 | NO_DOORS | NO_STREAMERS | 
-F:HOT | FLAT | NO_SHAFT | NO_NEW_MONSTER | CIRCULAR_ROOMS | 
-F:FINAL_GUARDIAN_242 | FINAL_ARTIFACT_110
+F:ADJUST_LEVEL_1_2
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_ARTIFACT_110
+F:FINAL_GUARDIAN_242
+F:FLAT
+F:HOT
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
 R:50:0
 R:50:3
-M:RES_DISE | UNDEAD | DEMON | NONLIVING 
+M:DEMON
+M:NONLIVING
+M:RES_DISE
+M:UNDEAD
 
 #Near Harad
 #levels 20-25
 #Guarded by Herumor, who has the heavy crossbow of Umbar
 N:35:Near Harad
 D:NHa:a desert path into Near Harad
-W:20:25:15:0:14:160
+W:20:25:15:14:160
 #It's a desert, so sand and only sand
 L:91:100:91:0:91:0
 #Ugly - using floor tiles for walls, only rooms have real walls
@@ -592,49 +756,72 @@ A:91:100:91:0:91:0:98:91
 O:20:20:20:20
 #Living is slow in the desert, heh :)
 E:1d1:1:INERTIA
-F:NO_DOORS | CAVE | CAVERN | HOT | NO_DESTROY | EMPTY | FLAT
-F:RANDOM_TOWNS | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_395 | FINAL_ARTIFACT_171
-F:FILL_METHOD_4 
+F:CAVE
+F:CAVERN
+F:EMPTY
+F:FILL_METHOD_4
+F:FINAL_ARTIFACT_171
+F:FINAL_GUARDIAN_395
+F:FLAT
+F:HOT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_SHAFT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 #It's a desert (sort of wilderness) so WILD_TOO monsters, plus the 'p's for the Haradrim
 R:30:0
 R:70:3
-M:WILD_TOO | R_CHAR_p
+M:R_CHAR_p
+M:WILD_TOO
 
 #Isengard - Orc Cave on steroids.
 #levels 35-40 
 #It ends in a special level with the Palantir of Orthanc and Sharkey
 N:36:Isengard
 D:Isg:a passage to the caves beneath Isengard
-W:35:40:20:0:14:160
+W:35:40:20:14:160
 # Like the Orc caves
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:20:20:20:20
-F:CAVE | ADJUST_LEVEL_2 | NO_STREAMERS | 
+F:ADJUST_LEVEL_2
+F:CAVE
 F:FILL_METHOD_0
+F:NO_STREAMERS
 R:20:0
 R:30:3
-M:TROLL | R_CHAR_T | 
+M:R_CHAR_T
+M:TROLL
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Tol Eressea - of course you never actually set foot on Tol Eressea ;)
 # levels 40-45
 # Guarded by Marda and the Robe of Belegaer
 N:37:Tol Eressea
 D:TEr:a way to the Lonely Isle
-W:40:45:40:0:14:160
+W:40:45:40:14:160
 # shallow water, lilies
 L:84:60:222:40:222:0
 # Going to have to add walls here to avoid being overly nasty
 A:211:100:211:0:211:0:211:211
 # As little loot as possible, this is open water, after all
 O:1:1:1:1
-F:SMALLEST | NO_DOORS | NO_DESTROY | EMPTY | FLAT | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_NEW_MONSTER | 
-F:FINAL_GUARDIAN_791 | FINAL_ARTIFACT_219 | 
+F:ADJUST_LEVEL_1
+F:EMPTY
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_219
+F:FINAL_GUARDIAN_791
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
+F:SMALLEST
 R:1:0
 R:99:1
 M:R_CHAR_B
@@ -644,26 +831,29 @@ M:R_CHAR_B
 #Guarded by no one (yet!)
 N:38:Utumno
 D:Utu:an entrance to the depths of Utumno
-W:101:127:30:0:14:160
+W:101:127:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:CAVERN | NO_EASY_MOVE | NO_RECALL 
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 
-F:FILL_METHOD_0 
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
+F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
 R:100:0
 
 # Bilbo's trail in the Barrow-downs
 # just one special level that later becomes a different one, sans princess.
 N:39:Bilbo's trail
 D:Btr:a trail left by a fleeing hobbit
-W:10:10:1:0:14:160
+W:10:10:1:14:160
 L:88:94:210:2:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:FLAT
 F:FILL_METHOD_3
+F:FLAT
 R:25:1
 M:UNDEAD
 R:75:0
@@ -672,12 +862,14 @@ R:75:0
 # just one special level that later becomes a different one, sans princess.
 N:40:Thorin's trail
 D:Ttr:a trail left by a purposeful dwarf
-W:33:33:15:0:14:160
+W:33:33:15:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
 R:100:0
 
 # N:<index>:<name>
diff --git a/lib/mods/theme/edit/e_info.txt b/lib/mods/theme/edit/e_info.txt
index 70d0e917..03671cf8 100644
--- a/lib/mods/theme/edit/e_info.txt
+++ b/lib/mods/theme/edit/e_info.txt
@@ -93,19 +93,11 @@ T:6:0:99
 W:10:1:8:50000
 C:-40:-40:0:3
 R:100
-F:MANA | SPELL
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
-N:4:of Spell
-T:6:0:99
-X:A:24:60
-W:0:2:8:40000
-C:0:0:0:0
-R:100
-F:ACTIVATE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
 ### Body Armor ###
 
 N:5:of Resist Acid
@@ -114,8 +106,10 @@ T:37:0:99
 X:A:30:16
 W:0:4:20:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:6:of Resist Lightning
 T:36:0:99
@@ -123,8 +117,10 @@ T:37:0:99
 X:A:30:10
 W:0:4:20:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:7:of Resist Fire
 T:36:0:15
@@ -133,8 +129,10 @@ T:37:0:99
 X:A:30:14
 W:0:4:20:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:8:of Resist Cold
 T:36:0:15
@@ -143,8 +141,10 @@ T:37:0:99
 X:A:30:12
 W:0:4:20:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:9:of Resistance
 T:36:0:99
@@ -153,9 +153,18 @@ X:A:30:20
 W:0:2:20:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 R:25
 F:R_HIGH
 
@@ -166,11 +175,18 @@ X:B:30:25
 W:0:2:20:15000
 C:0:0:10:3
 R:100
-F:STEALTH | ESP_ORC
-f:STEALTH
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ORC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
+f:STEALTH
 R:25
 F:RES_POIS
 
@@ -181,10 +197,22 @@ X:A:30:30
 W:0:1:10:30000
 C:0:0:10:0
 R:100
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_LIFE | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 R:2
 F:R_IMMUNITY
 
@@ -197,7 +225,12 @@ X:A:30:0
 W:0:1:10:0
 C:0:0:0:-6
 R:100
-F:CON | STR | R_STAT | CURSED | HEAVY_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:CON
+F:CURSED
+F:HEAVY_CURSE
+F:R_STAT
+F:STR
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 # Mithirl & Galvorn mails & PDSM
@@ -240,8 +273,10 @@ T:34:7:99
 X:A:32:16
 W:0:6:22:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:17:of Resist Lightning
 T:34:0:5
@@ -250,8 +285,10 @@ T:115:56:56
 X:A:32:10
 W:0:6:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:18:of Resist Fire
 T:34:0:5
@@ -260,8 +297,10 @@ T:115:56:56
 X:A:32:14
 W:0:6:22:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:19:of Resist Cold
 T:115:56:56
@@ -270,8 +309,10 @@ T:34:7:99
 X:A:32:12
 W:0:6:22:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:20:of Resistance
 T:115:56:56
@@ -281,9 +322,18 @@ X:A:32:20
 W:0:2:22:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 
 N:21:of Reflection
 T:115:56:56
@@ -293,9 +343,12 @@ X:A:32:20
 W:0:2:22:15000
 C:0:0:5:0
 R:100
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:REFLECT
 f:REFLECT
-F:IGNORE_ELEC | IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE
 
 # Metal shields only
 N:22:of Electricity
@@ -305,7 +358,9 @@ T:34:10:10
 X:A:32:10
 W:0:2:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC | SH_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 f:SH_ELEC
 
 ### Crowns and Helms ###
@@ -318,7 +373,10 @@ X:A:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:DEX | SUST_DEX | ACTIVATE | ESP_ORC
+F:ACTIVATE
+F:DEX
+F:ESP_ORC
+F:SUST_DEX
 a:NOLDOR
 
 N:24:of Intelligence
@@ -329,7 +387,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | SUST_INT
+F:INT
+F:SUST_INT
 f:INT
 
 N:25:of Wisdom
@@ -340,7 +399,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:WIS | SUST_WIS
+F:SUST_WIS
+F:WIS
 f:WIS
 
 N:26:of Beauty
@@ -351,7 +411,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:CHR | SUST_CHR
+F:CHR
+F:SUST_CHR
 f:CHR
 
 # 40% chance of increase spell power
@@ -361,14 +422,23 @@ W:0:1:8:7500
 C:0:0:0:3
 T:33:0:99
 R:100
-F:INT | SUST_INT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:ABILITY | R_HIGH
+F:ABILITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SUST_INT
 R:40
 F:SPELL
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 N:28:of Gondor
 X:A:33:19
@@ -377,8 +447,14 @@ C:0:0:0:3
 T:32:0:99
 T:33:0:99
 R:100
-F:STR | DEX | CON | SUST_STR | SUST_DEX | SUST_CON | FREE_ACT
+F:CON
+F:DEX
+F:FREE_ACT
 F:R_HIGH
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 
 N:29:of Arnor
 X:A:33:17
@@ -387,8 +463,11 @@ C:0:0:0:3
 T:32:0:99
 T:33:0:99
 R:100
-F:WIS | CHR | SUST_WIS | SUST_CHR
+F:CHR
 F:R_HIGH
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 
 N:30:of Seeing
 X:A:33:8
@@ -399,8 +478,8 @@ T:32:8:99
 T:33:0:99
 T:115:57:57
 R:100
-F:SEARCH | RES_BLIND | SEE_INVIS
-f:SEARCH
+F:RES_BLIND
+F:SEE_INVIS
 R:20
 F:ESP_ALL
 
@@ -412,7 +491,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INFRA | HIDE_TYPE
+F:HIDE_TYPE
+F:INFRA
 f:INFRA
 
 N:32:of Light
@@ -422,7 +502,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:LITE1 | RES_LITE
+F:LITE1
+F:RES_LITE
 f:LITE1
 
 N:33:of Telepathy
@@ -464,7 +545,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | CURSED
+F:CURSED
+F:INT
 f:INT
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
@@ -496,7 +578,9 @@ C:0:0:0:-5
 W:0:1:7:0
 T:33:0:99
 R:100
-F:STR | DEX | CON
+F:CON
+F:DEX
+F:STR
 
 N:40:Dwarven
 T:32:0:6
@@ -505,7 +589,11 @@ X:B:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:INFRA | CON | RES_FIRE | ESP_TROLL | ESP_DRAGON
+F:CON
+F:ESP_DRAGON
+F:ESP_TROLL
+F:INFRA
+F:RES_FIRE
 
 
 ### Cloaks ###
@@ -516,7 +604,11 @@ W:0:4:19:1500
 C:0:0:10:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | RES_SHARDS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
 
 N:42:of Eriador
 X:A:31:10
@@ -536,10 +628,13 @@ W:0:1:28:4000
 C:0:0:20:3
 T:35:0:99
 R:100
-F:STEALTH | 
-f:STEALTH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:STEALTH
+f:STEALTH
 
 # Aura, Fire
 N:44:of Immolation
@@ -548,7 +643,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | SH_FIRE | RES_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FIRE
+F:SH_FIRE
 f:SH_FIRE
 
 N:45:of Enveloping
@@ -573,7 +671,8 @@ W:0:1:3:0
 C:-15:-15:0:0
 T:35:0:99
 R:100
-F:AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:SHOW_MODS
 
 # Aura, Electricity
 N:48:of Electricity
@@ -582,7 +681,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | SH_ELEC | RES_ELEC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 ### Gloves ###
 
@@ -608,7 +710,8 @@ W:0:2:10:1000
 C:0:0:0:5
 T:31:0:99
 R:100
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 
 N:52:of Power
@@ -617,9 +720,11 @@ X:A:34:22
 W:0:1:10:2500
 C:5:5:0:5
 R:100
-F:STR | SHOW_MODS | HIDE_TYPE
-f:STR
+F:HIDE_TYPE
 F:R_HIGH
+F:SHOW_MODS
+F:STR
+f:STR
 
 # 53 Gauntlets only
 N:53:of Peace
@@ -628,7 +733,8 @@ W:0:1:3:0
 C:-10:-10:0:0
 T:31:2:2
 R:100
-F:HEAVY_CURSE | CURSED
+F:CURSED
+F:HEAVY_CURSE
 
 # 54 Gloves only
 N:54:of Charming
@@ -697,7 +803,8 @@ W:0:1:27:200000
 C:0:0:0:10
 T:30:0:99
 R:100
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 R:10
 F:PVAL_M3
@@ -710,7 +817,9 @@ W:0:1:20:5000
 C:0:0:0:6
 T:30:6:6
 R:100
-F:CON | INFRA | RES_DARK
+F:CON
+F:INFRA
+F:RES_DARK
 R:33
 F:STR
 
@@ -737,7 +846,8 @@ W:0:1:3:0
 C:0:0:0:-10
 T:30:0:99
 R:100
-F:SPEED | AGGRAVATE
+F:AGGRAVATE
+F:SPEED
 
 
 ### Weapons ###
@@ -751,10 +861,16 @@ X:A:24:30
 W:0:2:44:20000
 C:6:6:4:3
 R:100
-F:WIS |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED | RES_FEAR | ESP_EVIL
-F:SUSTAIN | LIMIT_BLOWS
+F:BLESSED
+F:ESP_EVIL
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 R:10
 F:BLOWS
 R:1
@@ -771,12 +887,22 @@ X:A:24:25
 W:0:2:44:15000
 C:4:4:8:4
 R:100
-F:STEALTH |
-f:STEALTH |
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:SUSTAIN | R_HIGH
+F:FEATHER
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+f:STEALTH
 R:33
 F:RES_POIS
 
@@ -789,8 +915,10 @@ X:B:24:20
 W:0:1:44:5000
 C:0:0:0:3
 R:100
-F:WIS | ESP_GOOD
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:ESP_GOOD
+F:WIS
 f:BLESSED
 
 N:68:of Greater Life
@@ -804,7 +932,8 @@ W:0:1:50:30000
 C:5:5:0:3
 r:N:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 N:69:of Westernesse
@@ -817,9 +946,17 @@ X:A:24:20
 W:0:2:44:20000
 C:5:5:0:2
 R:100
-F:STR | DEX | CON |
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
-F:FREE_ACT | SEE_INVIS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:CON
+F:DEX
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:FREE_ACT
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 R:33
 F:RES_FEAR
 R:50
@@ -851,7 +988,8 @@ X:A:24:15
 W:0:2:44:2500
 C:0:0:0:0
 R:100
-F:SLAY_WEAP | WOUNDING
+F:SLAY_WEAP
+F:WOUNDING
 
 N:72:of Spinning
 T:125:0:99
@@ -864,7 +1002,10 @@ X:A:24:18
 W:0:1:44:9000
 C:8:8:0:2
 R:100
-F:DEX | STR | VORPAL | ACTIVATE
+F:ACTIVATE
+F:DEX
+F:STR
+F:VORPAL
 a:SPIN
 
 # The "Elemental" brands (4) (6)
@@ -880,7 +1021,9 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:5000
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
+F:BRAND_ACID
+F:IGNORE_ACID
+F:RES_ACID
 f:BRAND_ACID
 
 N:74:Shocking
@@ -894,7 +1037,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4500
 R:100
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
+F:BRAND_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
 f:BRAND_ELEC
 
 N:75:Fiery
@@ -908,8 +1053,11 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:3500
 R:100
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE1
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+f:BRAND_FIRE
 
 N:76:Frozen
 T:125:0:99
@@ -922,8 +1070,10 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:3000
 R:100
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:BRAND_COLD
 
 N:77:Venomous
 T:125:0:99
@@ -936,8 +1086,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4000
 R:100
-F:BRAND_POIS | RES_POIS
-f:BRAND_POIS | 
+F:BRAND_POIS
+F:RES_POIS
+f:BRAND_POIS
 
 N:78:Chaotic
 T:125:0:99
@@ -950,9 +1101,13 @@ T:115:55:55
 X:B:24:28
 W:0:1:44:10000
 R:100
-F:CHAOTIC | RES_CHAOS | IGNORE_ELEC | IGNORE_ACID | IGNORE_FIRE
-f:CHAOTIC
+F:CHAOTIC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
 F:R_ANY
+f:CHAOTIC
 
 N:79:Sharp
 T:125:0:99
@@ -973,7 +1128,10 @@ X:A:24:20
 W:0:1:44:4000
 C:10:10:0:6
 R:100
-F:IMPACT | STR | TUNNEL | HIDE_TYPE
+F:HIDE_TYPE
+F:IMPACT
+F:STR
+F:TUNNEL
 f:IMPACT
 
 # The "Slay" brands (8)
@@ -1098,8 +1256,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:INT | SLAY_ANIMAL | SLOW_DIGEST | STEALTH | ESP_ANIMAL
-f:SLAY_ANIMAL | STEALTH
+F:ESP_ANIMAL
+F:INT
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
+F:STEALTH
+f:SLAY_ANIMAL
+f:STEALTH
 
 N:90:of *Slay Evil*
 T:125:0:99
@@ -1112,8 +1275,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:WIS | SLAY_EVIL | BLESSED | ESP_EVIL | RES_FEAR | ABILITY
-f:SLAY_EVIL | 
+F:ABILITY
+F:BLESSED
+F:ESP_EVIL
+F:RES_FEAR
+F:SLAY_EVIL
+F:WIS
+f:SLAY_EVIL
 
 N:91:of *Slay Undead*
 T:125:0:99
@@ -1127,8 +1295,12 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:WIS | KILL_UNDEAD | SEE_INVIS | ESP_UNDEAD | RES_NETHER
-f:KILL_UNDEAD | 
+F:ESP_UNDEAD
+F:KILL_UNDEAD
+F:RES_NETHER
+F:SEE_INVIS
+F:WIS
+f:KILL_UNDEAD
 
 N:92:of *Slay Demon*
 T:125:0:99
@@ -1142,8 +1314,12 @@ X:A:24:16
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:INT | KILL_DEMON | ESP_DEMON | RES_FIRE | RES_CHAOS
-f:KILL_DEMON | 
+F:ESP_DEMON
+F:INT
+F:KILL_DEMON
+F:RES_CHAOS
+F:RES_FIRE
+f:KILL_DEMON
 
 N:93:of *Slay Orc*
 T:15:0:99
@@ -1156,8 +1332,11 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:DEX | SLAY_ORC | ESP_ORC | SUST_DEX | 
-f:SLAY_ORC | 
+F:DEX
+F:ESP_ORC
+F:SLAY_ORC
+F:SUST_DEX
+f:SLAY_ORC
 
 N:94:of *Slay Troll*
 T:15:0:99
@@ -1170,8 +1349,12 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_TROLL | ESP_TROLL | REGEN | SUST_STR
-f:SLAY_TROLL | 
+F:ESP_TROLL
+F:REGEN
+F:SLAY_TROLL
+F:STR
+F:SUST_STR
+f:SLAY_TROLL
 
 N:95:of *Slay Giant*
 T:15:0:99
@@ -1184,8 +1367,12 @@ X:A:24:16
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_GIANT | ESP_GIANT | RES_SHARDS | SUST_STR
-f:SLAY_GIANT | 
+F:ESP_GIANT
+F:RES_SHARDS
+F:SLAY_GIANT
+F:STR
+F:SUST_STR
+f:SLAY_GIANT
 
 N:96:of *Slay Dragon*
 T:15:0:99
@@ -1198,9 +1385,13 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:CON | KILL_DRAGON | ESP_DRAGON | RES_FEAR | 
+F:CON
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
+F:R_ELEM
+F:R_LOW
 f:KILL_DRAGON
-F:R_LOW | R_ELEM
 R:20
 F:RES_POIS
 
@@ -1212,8 +1403,11 @@ X:B:24:25
 W:0:2:44:10000
 C:0:0:0:-2
 R:100
-F:LIFE | VAMPIRIC | HOLD_LIFE
-f:LIFE | VAMPIRIC
+F:HOLD_LIFE
+F:LIFE
+F:VAMPIRIC
+f:LIFE
+f:VAMPIRIC
 
 N:98:(*Defender*)
 T:21:0:99
@@ -1224,18 +1418,40 @@ X:A:24:35
 W:0:1:100:50000
 C:-15:-15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+F:WIS
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # 'of the Thunderlords' renamed to 'of Tulkas' and picked up some new flags:) --furiosity
 N:99:of Tulkas
@@ -1249,16 +1465,29 @@ W:10:6:90:45000
 C:4:4:0:2
 a:TELEPORT
 R:100
-F:SLAY_EVIL | KILL_DRAGON | TELEPORT | FREE_ACT | SEARCH | BRAND_ELEC
-F:REGEN | SLOW_DIGEST | RES_MORGUL | ACTIVATE | ESP_DRAGON
+F:ACTIVATE
+F:BRAND_ELEC
+F:ESP_DRAGON
+F:FREE_ACT
+F:KILL_DRAGON
+F:REGEN
+F:RES_MORGUL
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:TELEPORT
 R:50
-F:RES_NEXUS | HOLD_LIFE
+F:HOLD_LIFE
+F:RES_NEXUS
 R:30
-F:R_HIGH | KILL_UNDEAD
+F:KILL_UNDEAD
+F:R_HIGH
 R:12
-F:ABILITY | KILL_DEMON
+F:ABILITY
+F:KILL_DEMON
 R:2
-F:R_P_ABILITY | PVAL_M3 | LIMIT_BLOWS
+F:LIMIT_BLOWS
+F:PVAL_M3
+F:R_P_ABILITY
 
 N:100:of Gondolin
 T:21:0:99
@@ -1269,10 +1498,21 @@ X:A:24:26
 W:0:1:44:25000
 C:7:7:0:3
 R:100
-F:STR | CON | ESP_EVIL | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_DRAGON | SLAY_DEMON |
-F:FREE_ACT | SEE_INVIS | LITE1 | RES_DARK | ABILITY | 
-F:IGNORE_ACID | IGNORE_FIRE
+F:ABILITY
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:LITE1
+F:RES_DARK
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:STR
 R:33
 F:R_HIGH
 R:33
@@ -1288,9 +1528,12 @@ X:A:24:4
 W:0:1:2:500
 C:0:0:0:5
 R:100
-F:TUNNEL |
-f:TUNNEL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:TUNNEL
+f:TUNNEL
 
 # More weapons
 
@@ -1304,8 +1547,11 @@ T:115:55:55
 X:B:24:30
 W:0:1:5:5000
 R:100
-F:SLAY_UNDEAD | SEE_INVIS | HOLD_LIFE | DRAIN_HP
 F:ACTIVATE
+F:DRAIN_HP
+F:HOLD_LIFE
+F:SEE_INVIS
+F:SLAY_UNDEAD
 a:SPECTRAL
 
 N:103:of Morgul
@@ -1319,9 +1565,15 @@ X:A:24:0
 W:0:1:1:0
 C:-20:-20:-10:-10
 R:100
+F:AGGRAVATE
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
 F:LUCK
-F:SEE_INVIS | AGGRAVATE | HEAVY_CURSE | CURSED | BLACK_BREATH | DRAIN_EXP | 
-F:AUTO_CURSE | WOUNDING
+F:SEE_INVIS
+F:WOUNDING
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 N:104:of Angmar
@@ -1335,7 +1587,10 @@ X:A:24:0
 W:0:1:2:0
 C:-100:-100:0:0
 R:100
-F:NEVER_BLOW | HEAVY_CURSE | CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NEVER_BLOW
 
 
 ### Missile Launchers ###
@@ -1360,8 +1615,10 @@ X:A:25:20
 W:0:4:21:10000
 C:5:10:0:1
 R:100
-F:XTRA_MIGHT | PVAL_M3 | R_ANY
-f:XTRA_MIGHT | 
+F:PVAL_M3
+F:R_ANY
+F:XTRA_MIGHT
+f:XTRA_MIGHT
 
 N:108:of Extra Shots
 T:19:0:99
@@ -1369,8 +1626,9 @@ X:A:25:20
 C:10:5:0:1
 W:0:4:21:10000
 R:100
-F:XTRA_SHOTS | PVAL_M2
-f:XTRA_SHOTS | 
+F:PVAL_M2
+F:XTRA_SHOTS
+f:XTRA_SHOTS
 
 # Bows only
 N:109:of Lothlorien
@@ -1379,8 +1637,14 @@ X:A:25:20
 W:50:2:21:30000
 C:10:10:0:2
 R:100
-F:DEX | XTRA_MIGHT | FREE_ACT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | 
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
 
 # Crossbows only
 N:110:of the Haradrim
@@ -1389,7 +1653,11 @@ X:A:25:30
 W:50:2:21:20000
 C:5:15:0:1
 R:100
-F:XTRA_MIGHT | XTRA_SHOTS | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Slings only
 N:111:of Buckland
@@ -1398,7 +1666,12 @@ W:40:2:21:20000
 C:8:8:0:2
 T:19:1:1
 R:100
-F:DEX | XTRA_SHOTS | XTRA_MIGHT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 
 ### Ammo ###
@@ -1449,8 +1722,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ACID | IGNORE_ACID
-f:BRAND_ACID | 
+F:BRAND_ACID
+F:IGNORE_ACID
+f:BRAND_ACID
 W:0:1:12:30
 
 # 117 All Elements at once - melee weapon
@@ -1462,16 +1736,26 @@ T:22:0:99
 T:23:0:99
 T:24:0:99
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-F:BRAND_POIS | RES_POIS | DRAIN_MANA
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 N:118:of Slay Demon
 T:16:0:99
@@ -1506,8 +1790,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ELEC | IGNORE_ELEC
-f:BRAND_ELEC | 
+F:BRAND_ELEC
+F:IGNORE_ELEC
+f:BRAND_ELEC
 W:0:1:12:30
 
 N:122:of Flame
@@ -1516,8 +1801,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_FIRE | IGNORE_FIRE
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+f:BRAND_FIRE
 W:0:2:12:25
 
 N:123:of Frost
@@ -1526,8 +1812,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+f:BRAND_COLD
 W:0:2:12:25
 
 N:124:of Wounding
@@ -1578,9 +1865,15 @@ X:A:25:20
 W:0:2:3:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
-F:RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M2
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:RES_ACID
+F:R_ANY
+F:SEE_INVIS
 R:25
 F:PVAL_M1
 
@@ -1591,9 +1884,19 @@ X:A:25:20
 W:0:1:3:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SUST_CHR |
-F:RES_FIRE | RES_COLD | RES_ELEC | RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M3
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M3
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
+F:SEE_INVIS
+F:SUST_CHR
 R:50
 F:PVAL_M1
 R:35
@@ -1607,8 +1910,13 @@ X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | ACTIVATE
-F:R_ANY | PVAL_M2
+F:ACTIVATE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:R_ANY
 R:50
 F:PVAL_M1
 R:25
@@ -1658,7 +1966,10 @@ X:A:51:10
 W:0:1:10:10000
 C:0:0:0:0
 R:100
-F:CAPACITY | CHARGING | CHEAPNESS | FAST_CAST |
+F:CAPACITY
+F:CHARGING
+F:CHEAPNESS
+F:FAST_CAST
 
 ### Lights ###
 
@@ -1709,10 +2020,10 @@ R:100
 F:LITE1
 F:LITE2
 F:LITE3
+F:RES_DARK
 f:LITE1
 f:LITE2
 f:LITE3
-F:RES_DARK
 
 N:141:of the Shadows
 X:A:0:6
@@ -1741,7 +2052,8 @@ T:39:0:99
 W:0:3:40:4000
 C:0:0:0:0
 R:100
-F:RES_BLIND | SEE_INVIS
+F:RES_BLIND
+F:SEE_INVIS
 
 N:144:of the Ethereal Eye
 X:A:0:7
@@ -1766,9 +2078,19 @@ X:B:30:18
 W:0:2:20:5000
 C:0:0:15:2
 R:100
-F:STR | CON | INFRA | FREE_ACT | HIDE_TYPE | 
-F:RES_FEAR | RES_DARK | SUST_STR | SUST_CON | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INFRA
+F:RES_DARK
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 
 # Magical: affects soft armour, gloves, cloaks
 
@@ -1782,11 +2104,19 @@ T:45:0:99
 W:5:1:10:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
-f:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:SPELL_CONTAIN
+f:WIELD_CAST
 
 # Ring and Amulet egos
 
@@ -1822,123 +2152,17 @@ T:65:31:99
 W:0:1:20:1000
 C:0:0:0:3
 R:100
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:50
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:10
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:1
-F:PVAL_M5 | PVAL_M3
-
-
-### Trapping Kits ###
-
-N:151:of Extra Might
-X:A:0:5
-T:46:1:3
-W:0:1:10:1000
-C:20:20:0:2
-R:100
-F:XTRA_MIGHT
-f:XTRA_MIGHT
-
-N:152:of Extra Shots
-X:A:0:10
-T:46:0:99
-W:0:1:10:2000
-C:20:20:0:3
-R:100
-F:XTRA_SHOTS
-f:XTRA_SHOTS
-
-N:153:Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:10:3000
-C:10:10:0:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_5
-f:AUTOMATIC_5
-
-N:154:Fully Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:15:5000
-C:10:10:0:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_99
-f:AUTOMATIC_99
-
-N:155:Well-hidden
-X:B:0:5
-T:46:0:99
-W:0:1:8:1000
-C:15:15:5:12
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:STEALTH | HIDE_TYPE
-f:STEALTH
-
-N:156:Complicated
-X:B:0:10
-T:46:0:99
-W:0:1:12:2000
-C:15:15:30:0
-R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE
-
-N:157:Obvious
-X:B:0:0
-T:46:0:99
-W:0:1:1:0
-C:-20:-20:-20:-20
-R:100
-F:STEALTH | CURSED | HIDE_TYPE
-f:STEALTH
-
-N:158:for Dragons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_DRAGON | HIDE_TYPE | XTRA_SHOTS |
-F:IGNORE_ACID | IGNORE_FIRE
-
-N:159:for Demons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_DEMON | HIDE_TYPE | XTRA_SHOTS
-F:IGNORE_ACID | IGNORE_FIRE
-
-N:160:for Animals
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_ANIMAL | HIDE_TYPE | XTRA_SHOTS
-
-N:161:for Undead
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_UNDEAD | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
-
-N:162:for Evil
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:STEALTH | ONLY_EVIL | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
+F:PVAL_M3
+F:PVAL_M5
 
 # Lite ego
 N:163:of the Magi
@@ -1948,15 +2172,19 @@ W:0:1:150:2000
 C:0:0:0:3
 Z:magic map
 R:100
-F:INT | WIS | CHR
+F:CHR
+F:INT
+F:WIS
 R:60
-F:INVIS | RES_BLIND
+F:INVIS
+F:RES_BLIND
 R:30
 F:R_HIGH
 R:30
 F:PVAL_M2
 R:50:
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 ### New ego-items added by JLE
 
@@ -1968,7 +2196,8 @@ C:0:0:-50:0
 T:36:0:99
 T:37:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Vulnerability (the only cursed shield) [not in Theme, it isn't!]
 N:165:of Vulnerability
@@ -1978,7 +2207,8 @@ C:0:0:-50:0
 T:115:56:56
 T:34:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Preservation -  
 N:166:of Preservation
@@ -1988,8 +2218,16 @@ C:-10:-10:20:0
 T:115:56:56
 T:34:0:99
 R:100
-F:RES_DISEN | SUST_STR | SUST_CON | SUST_DEX | HOLD_LIFE | R_HIGH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DISEN
+F:R_HIGH
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 R:33
 F:R_LOW
 R:33
@@ -2003,7 +2241,9 @@ T:32:0:6
 T:32:8:99
 T:33:0:99
 R:100
-F:RES_SOUND | RES_CONF | RES_FEAR
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
 
 # Crown of Night and Day
 N:168:of Night and Day
@@ -2011,7 +2251,12 @@ X:A:33:18
 W:35:1:15:4000
 T:33:0:99
 R:100
-F:RES_LITE | RES_DARK | LITE1 | SEE_INVIS  | RES_BLIND | IGNORE_ACID
+F:IGNORE_ACID
+F:LITE1
+F:RES_BLIND
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
 
 # Cloak of the Magi
 N:169:of the Magi
@@ -2020,9 +2265,16 @@ W:30:1:18:2000
 C:-5:-5:5:3
 T:35:0:99
 R:100
-F:INT | SPEED | SUST_INT | FREE_ACT | STEALTH | HIDE_TYPE | IGNORE_ACID
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:INT
+F:SPEED
+F:STEALTH
+F:SUST_INT
 R:30
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 # Cloak of Invisibility
 N:170:of Invisibility
@@ -2031,7 +2283,9 @@ W:40:1:18:3000
 C:0:0:10:5
 T:35:0:99
 R:100
-F:STEALTH | HIDE_TYPE | INVIS
+F:HIDE_TYPE
+F:INVIS
+F:STEALTH
 f:INVIS
 
 # Cloak of the Bat
@@ -2041,7 +2295,13 @@ W:50:1:35:3000
 C:-10:-10:10:3
 T:35:0:99
 R:100
-F:SPEED | FLY | RES_DARK | SEE_INVIS | INFRA | HIDE_TYPE | STEALTH
+F:FLY
+F:HIDE_TYPE
+F:INFRA
+F:RES_DARK
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
 
 # Leather Gloves of Thievery
 N:172:of Thievery
@@ -2050,7 +2310,12 @@ W:40:1:15:5000
 C:8:3:0:5
 T:31:1:1
 R:100
-F:DEX | SEARCH | SHOW_MODS | FEATHER | FREE_ACT | HIDE_TYPE | IGNORE_ACID
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:SHOW_MODS
 R:10
 F:SPEED
 
@@ -2061,8 +2326,14 @@ W:50:1:15:7000
 C:6:8:-20:2
 T:31:2:99
 R:100
-F:STR | CON | SHOW_MODS | AGGRAVATE | HIDE_TYPE | IGNORE_ACID | RES_FEAR | 
+F:AGGRAVATE
+F:CON
 F:DRAIN_HP
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
 R:25
 F:BLOWS
 
@@ -2072,7 +2343,8 @@ X:A:35:20
 W:0:3:27:5000
 T:30:0:99
 R:100
-F:RES_NEXUS | FEATHER
+F:FEATHER
+F:RES_NEXUS
 
 # Boots of Elvenkind (leather boots only)
 N:175:of Elvenkind
@@ -2081,7 +2353,12 @@ W:60:1:36:200000
 C:0:0:0:4
 T:30:2:3
 R:100
-F:STEALTH | HIDE_TYPE | FEATHER | IGNORE_ACID | IGNORE_FIRE | ABILITY
+F:ABILITY
+F:FEATHER
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:STEALTH
 R:50
 F:SPEED
 
@@ -2096,8 +2373,14 @@ T:24:8:99
 T:125:0:99
 C:10:10:-20:2
 R:100
-F:STR | BLOWS | AGGRAVATE | RES_FEAR | HIDE_TYPE | 
-F:IGNORE_ACID | IGNORE_FIRE | DRAIN_MANA
+F:AGGRAVATE
+F:BLOWS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FEAR
+F:STR
 
 # Staffs of wishing
 N:177:of Plenty
@@ -2146,7 +2429,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_COLD_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:182:Dragon
 T:14:7:7
@@ -2155,7 +2441,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_ELEC_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:183:Dragon
 T:14:7:7
@@ -2164,7 +2453,10 @@ W:0:1:2:2000
 C:0:0:0:0
 a:BA_FIRE_H
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 # Helm of water breathing
 N:184:of Water Breathing
@@ -2173,7 +2465,8 @@ C:0:0:0:2
 W:15:1:25:1000
 T:32:5:10
 R:100
-F:WATER_BREATH | IGNORE_ACID
+F:IGNORE_ACID
+F:WATER_BREATH
 f:WATER_BREATH
 
 # A second of life for non MUST2H weapons, much lower value tho
@@ -2188,7 +2481,8 @@ W:0:1:50:30000
 C:5:5:0:1
 r:F:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 # Cloak of Air
@@ -2216,7 +2510,10 @@ X:A:25:30
 W:60:5:30:30000
 C:10:15:20:2
 R:120
-F:XTRA_MIGHT | XTRA_SHOTS | REFLECT | IMMOVABLE
+F:IMMOVABLE
+F:REFLECT
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 ### New ego-items from T-Plus by Ingeborg S. Norden ###
 
@@ -2226,12 +2523,12 @@ N:189:Rogue's
 X:B:35:15
 W:15:10:25:2500
 C:-5:-5:0:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 T:30:2:3
 Z:panic hit
 R:100
-F:SEARCH
-f:SEARCH
 R:50
 F:STEALTH
 f:STEALTH
@@ -2239,7 +2536,7 @@ R:25
 F:LUCK
 f:LUCK
 R:10
-F:R_HIGH |
+F:R_HIGH
 
 ###	Egos for rings, amulets and crowns (partly inspired by Multiband)
 
@@ -2255,8 +2552,8 @@ T:45:0:38
 W:5:1:10:1250
 C:0:0:0:0
 R:100
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 
 # Dazzling (as above, with more light plus resistance/granted ability)
 
@@ -2270,14 +2567,15 @@ W:10:3:12:2500
 C:0:0:0:0
 Z:illuminate
 R:100
-F:LITE2 | RES_LITE |
-f:LITE2 |
+F:LITE2
+F:RES_LITE
+f:LITE2
 R:50
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 R:25
-F:LITE3 |
-f:LITE3 |
+F:LITE3
+f:LITE3
 
 # Radiant (Dazzling with some extras;
 # no cursed jewelry)
@@ -2292,20 +2590,23 @@ T:45:51:99
 W:15:5:15:3500
 C:0:0:0:0
 Z:illuminate
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:LITE3 | RES_LITE |
-f:LITE3 | 
+F:LITE3
+F:RES_LITE
+f:LITE3
 R:50
-F:LITE2 |
-f:LITE2 |
+F:LITE2
+f:LITE2
 R:25
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 R:20
-F:RES_BLIND |
+F:RES_BLIND
 R:2
-F:REFLECT |
+F:REFLECT
 
 # Blazing (Glowing plus fiery sheath, resistance, undamaged by 
 # fire; restrictions as per Glowing, but no Cold Resistance/Ice 
@@ -2321,16 +2622,20 @@ T:45:51:99
 W:15:5:15:3000
 C:0:0:0:0
 R:100
-F:LITE1 | RES_FIRE | SH_FIRE | 
-f:LITE1 | SH_FIRE | IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+F:SH_FIRE
+f:IGNORE_FIRE
+f:LITE1
+f:SH_FIRE
 R:25
-F:LITE2 |
-f:LITE2 |
+F:LITE2
+f:LITE2
 R:10
-F:LITE3 |
-f:LITE3 |
+F:LITE3
+f:LITE3
 R:2
-F:IM_FIRE |
+F:IM_FIRE
 
 # Lucky (amulets only--resists cursing, undamaged by elements, luck 
 # bonus added; no inherently cursed types or Nothing amulets)
@@ -2341,9 +2646,12 @@ T:40:2:15
 T:40:17:99
 W:15:5:15:2750
 C:0:0:0:5
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:BLESSED | LUCK |
+F:BLESSED
+F:LUCK
 
 # Unlucky (amulets only; no Prot/Evil, Doom, or Nothing amulets)
 N:195:Unlucky
@@ -2353,9 +2661,12 @@ T:40:17:99
 W:0:3:10:0
 C:-5:-5:-5:-5
 R:100
-F:CURSED | AUTO_CURSE | LUCK | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:LUCK
 R:20
-F:HEAVY_CURSE |
+F:HEAVY_CURSE
 
 # Armour of the Maiar (of the Chosen in T-Plus)
 
@@ -2366,15 +2677,30 @@ X:A:30:30
 W:10:3:45:15000
 C:0:0:15:0
 R:100
-F:BLESSED | ESP_EVIL | ESP_GIANT | ESP_TROLL |
-F:FREE_ACT | RES_FEAR |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:OLD_RESIST |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:BLESSED
+F:ESP_EVIL
+F:ESP_GIANT
+F:ESP_TROLL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 Z:berserk
 R:25
-F:R_HIGH | SUSTAIN |
+F:R_HIGH
+F:SUSTAIN
 
 ###	Weapons of the Maiar (of the Chosen in T-Plus)
 N:197:of the Maiar
@@ -2387,19 +2713,37 @@ X:A:24:35
 W:10:5:45:30000
 C:6:6:4:3
 R:100
-F:SLAY_GIANT | SLAY_TROLL | 
-F:SEE_INVIS | FREE_ACT | BLESSED | RES_FEAR | 
-F:ESP_GIANT | ESP_TROLL |
-F:LIMIT_BLOWS |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:BLESSED
+F:ESP_GIANT
+F:ESP_TROLL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_TROLL
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:33
-F:ESP_EVIL | SLAY_EVIL | R_ANY |
+F:ESP_EVIL
+F:R_ANY
+F:SLAY_EVIL
 R:10
 F:BLOWS
 R:1
 F:PVAL_M1
-r:F:CHAOTIC | DRAIN_HP | VAMPIRIC | CURSED | HEAVY_CURSE |
+r:F:CHAOTIC
+r:F:CURSED
+r:F:DRAIN_HP
+r:F:HEAVY_CURSE
+r:F:VAMPIRIC
 
 # Robe of Ithryn (of the Archmagi in T-Plus)
 N:198:of the Ithryn
@@ -2408,15 +2752,30 @@ X:A:30:30
 W:15:3:45:15000
 C:-5:-5:15:2
 R:100
-F:FREE_ACT | RES_BLIND | RES_CONF | R_HIGH | SUST_INT |
-F:SPELL_CONTAIN | WIELD_CAST |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SUST_INT |
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_CONF
+F:R_HIGH
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SUST_INT
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:33
-F:RES_DISEN | SPELL |
+F:RES_DISEN
+F:SPELL
 R:10
-F:MANA |
+F:MANA
 
 # Robe of Sanctity
 
@@ -2426,16 +2785,30 @@ X:A:30:30
 W:15:3:45:15000
 C:0:0:15:2
 R:100
-F:FREE_ACT | RES_BLIND | RES_CONF | R_HIGH | SUST_WIS |
-F:BLESSED | ACTIVATE |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SUST_WIS |
+F:ACTIVATE
+F:BLESSED
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_CONF
+F:R_HIGH
+F:SUST_WIS
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SUST_WIS
 a:PROT_EVIL
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:33
-F:ESP_EVIL |
+F:ESP_EVIL
 R:10
-F:SPELL |
+F:SPELL
 
 N:200:Ethereal
 T:35:0:99
@@ -2444,17 +2817,28 @@ X:B:25:25
 W:15:2:20:27500
 C:0:0:20:0
 R:100
-F:FREE_ACT | SEE_INVIS | HOLD_LIFE |
-F:ACTIVATE |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+F:ACTIVATE
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SEE_INVIS
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 a:SPECTRAL
 R:33
-F:RES_NETHER |
+F:RES_NETHER
 R:5
-F:MAGIC_BREATH |
-f:MAGIC_BREATH |
+F:MAGIC_BREATH
+f:MAGIC_BREATH
 
 ### More new ego-items from Annals of Ea by Feanor:
 
@@ -2465,8 +2849,13 @@ X:A:24:80
 W:40:25:100:25000
 C:0:0:0:5
 R:100
-F:ESP_EVIL | SPELL | MANA
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_EVIL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:MANA
+F:SPELL
 
 # Swords of the Noldor
 N:202:of the Noldor
@@ -2475,19 +2864,43 @@ X:A:24:35
 W:40:25:100:50000
 C:15:15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:BLESSED
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_EVIL
+F:STEALTH
+F:SUSTAIN
+F:WIS
+F:WOUNDING
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
-F:SLAY_EVIL | BLESSED | WOUNDING
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Spear of Vanyar
 N:203:of the Vanyar
@@ -2496,17 +2909,38 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:4
-F:STEALTH | HOLD_LIFE | SEE_INVIS | WIS | INT |
-F:REGEN | RES_FEAR | RES_DARK | RES_LITE | RES_BLIND |
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD |
-F:SLAY_DEMON | SLAY_UNDEAD | BLESSED |
-F:R_ANY | R_LOW | SUSTAIN
+F:BLESSED
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:REGEN
+F:RES_BLIND
+F:RES_DARK
+F:RES_FEAR
+F:RES_LITE
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_UNDEAD
+F:STEALTH
+F:SUSTAIN
+F:WIS
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Axe of the Nandor
 N:204:of the Nandor
@@ -2515,16 +2949,33 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:5
-F:STEALTH | SPEED | SEE_INVIS | RES_COLD | RES_ELEC |
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:SLAY_ORC | SLAY_ANIMAL | RES_POIS |
-F:R_ANY | R_LOW | SUSTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+F:RES_ELEC
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SPEED
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Arrow of Teleri
 N:205:of the Teleri
@@ -2532,7 +2983,9 @@ T:17:0:99
 X:A:23:10
 W:40:25:100:5000
 R:100
-F:R_ANY | WOUNDING | BLESSED
+F:BLESSED
+F:R_ANY
+F:WOUNDING
 
 # Hafted of Avari
 N:206:of the Avari
@@ -2541,15 +2994,28 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:5
-F:STEALTH | INVIS | SEE_INVIS | INFRA | RES_DARK |
-F:RES_BLIND | SLAY_UNDEAD |
-F:R_ANY | R_LOW | SUSTAIN
+F:INFRA
+F:INVIS
+F:RES_BLIND
+F:RES_DARK
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_UNDEAD
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 ### Ravenred's Weapons of Unmagic
 
@@ -2564,7 +3030,7 @@ W:0:2:44:8000
 C:-10:-10:0:0
 R:100
 F:ANTIMAGIC_50
-f:ANTIMAGIC_50 
+f:ANTIMAGIC_50
 
 ### Amulet and ring egos suggested by power
 
@@ -2575,10 +3041,18 @@ T:45:1:99
 X:B:0:10
 W:0:5:100:2000
 C:0:0:10:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:WIS | SEE_INVIS | HOLD_LIFE | BLESSED
-f:WIS | SEE_INVIS | HOLD_LIFE | BLESSED
+F:BLESSED
+F:HOLD_LIFE
+F:SEE_INVIS
+F:WIS
+f:BLESSED
+f:HOLD_LIFE
+f:SEE_INVIS
+f:WIS
 
 #Demonic - anything but Devotion and Protection from Evil
 N:209:Demonic
@@ -2591,8 +3065,10 @@ W:0:5:100:2000
 C:0:0:0:2
 r:F:BLESSED
 R:100
-F:ESP_DEMON | RES_FIRE
-f:ESP_DEMON | RES_FIRE
+F:ESP_DEMON
+F:RES_FIRE
+f:ESP_DEMON
+f:RES_FIRE
 
 # Jewellery of the Rohirrim - no speed rings
 N:210:Rohirric
@@ -2602,10 +3078,14 @@ T:45:32:99
 X:B:0:10
 W:0:5:100:20000
 C:0:0:0:3
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE | 
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:RES_FEAR | SPEED
-f:RES_FEAR | SPEED
+F:RES_FEAR
+F:SPEED
+f:RES_FEAR
+f:SPEED
 
 # Draconic - anything but Devotion and Protection from Evil
 N:211:Draconic
@@ -2631,16 +3111,27 @@ X:B:0:30
 W:25:5:50:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | R_ANY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
 R:20
-F:IM_FIRE | R_HIGH
+F:IM_FIRE
+F:R_HIGH
 R:15
-F:IM_COLD | R_HIGH
+F:IM_COLD
+F:R_HIGH
 R:10
-F:IM_ELEC | R_HIGH
+F:IM_ELEC
+F:R_HIGH
 R:5
-F:IM_ACID | R_HIGH
+F:IM_ACID
+F:R_HIGH
 R:1
 F:IM_NETHER
 
@@ -2655,10 +3146,19 @@ X:A:0:30
 W:0:5:30:0
 C:0:0:0:-10
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 R:50
-F:R_STAT | CURSED | HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:R_STAT
 
 #Horns of Ulmo (Ulumuri)
 
@@ -2668,8 +3168,12 @@ X:A:0:80
 W:0:5:80:5000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:PVAL_M5 | R_IMMUNITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M5
+F:R_IMMUNITY
 
 # Reverse Armour of the Maiar (of the Chosen in T-Plus)
 N:215:of the Fallen
@@ -2679,14 +3183,30 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-15:0
 R:25
-F:CURSED | AUTO_CURSE | ESP_GOOD | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
+F:AUTO_CURSE
+F:CURSED
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
 R:50
-F:CURSED | AUTO_CURSE | R_LOW | SUSTAIN | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:R_LOW
+F:SUSTAIN
 R:75
-F:CURSED | AUTO_CURSE | WRAITH | DRAIN_EXP | 
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:WRAITH
 R:100
-F:CURSED | AUTO_CURSE | DRAIN_MANA | DRAIN_HP | BLACK_BREATH
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
 
 ###Reverse Weapons of the Maiar (of the Chosen in T-Plus)
 N:216:of the Fallen
@@ -2699,16 +3219,36 @@ X:A:24:35
 W:0:5:45:0
 C:+6:+6:-5:-3
 R:100
-F:NEVER_BLOW | IM_NETHER | PERMA_CURSE
+F:IM_NETHER
+F:NEVER_BLOW
+F:PERMA_CURSE
 R:50
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | NO_MAGIC | CLONE
+F:AUTO_CURSE
+F:CLONE
+F:CURSED
+F:HEAVY_CURSE
+F:NO_MAGIC
 R:33
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | DRAIN_EXP | DRAIN_MANA
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:HEAVY_CURSE
 R:10
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | CHAOTIC | DRAIN_HP
+F:AUTO_CURSE
+F:CHAOTIC
+F:CURSED
+F:DRAIN_HP
+F:HEAVY_CURSE
 R:1
-F:R_STAT | CURSED | AUTO_CURSE | ESP_GOOD | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
+F:AUTO_CURSE
+F:CURSED
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_STAT
 
 # Robe of Fools (reverse of Ithryn/Archmagi in T-Plus)
 N:217:of the Fools
@@ -2717,11 +3257,22 @@ X:A:30:30
 W:0:3:45:0
 C:-5:-5:-15:-2
 R:100
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | LIFE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LIFE
 R:33
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | RES_DISEN | SPELL | NO_MAGIC | 
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NO_MAGIC
+F:RES_DISEN
+F:SPELL
 R:10
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | MANA | 
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:MANA
 
 # Robe of Vice (reverse of Sanctity in T-Plus)
 N:218:of Vice
@@ -2730,9 +3281,14 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-15:-2
 R:100
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | LIFE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LIFE
 R:33
-F:ESP_GOOD | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:ESP_GOOD
 
 # Soft and Hard Armour of Sensitivity, no paper armour
 N:219:of Sensitivity
@@ -2745,7 +3301,9 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-5:-2
 R:100
-F:CURSED | SENS_FIRE | R_STAT | 
+F:CURSED
+F:R_STAT
+F:SENS_FIRE
 
 # Elemental ammo
 N:220:Elemental
@@ -2756,16 +3314,20 @@ X:B:30:30
 W:0:1:50:1000
 C:5:5:0:0
 R:100
-F:BRAND_ACID | IGNORE_ACID
-F:BRAND_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | IGNORE_FIRE
-F:BRAND_COLD | IGNORE_COLD
-F:BRAND_POIS |  
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 # Cursed ammo
 
@@ -2777,7 +3339,8 @@ X:A:30:30
 W:0:1:50:0
 C:-10:-10:0:0
 R:100
-F:CURSED | IMMOVABLE
+F:CURSED
+F:IMMOVABLE
 
 # Bows of Numenor
 
@@ -2787,8 +3350,13 @@ X:A:50:50
 W:0:1:50:0
 C:10:10:0:3
 R:100
-F:DEX | XTRA_MIGHT | XTRA_SHOTS | 
-F:RES_FEAR | RES_POIS | RES_DARK | FREE_ACT
+F:DEX
+F:FREE_ACT
+F:RES_DARK
+F:RES_FEAR
+F:RES_POIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Lights of Valinor (no refillable lights)
 
@@ -2798,9 +3366,20 @@ X:A:60:60
 W:0:2:60:45000
 C:0:0:0:2
 R:100
-F:STR | INT | WIS | DEX | CON | CHR
+F:CHR
+F:CON
+F:DEX
 F:ESP_ALL
-f:STR | INT | WIS| DEX | CON | CHR | ESP_ALL
+F:INT
+F:STR
+F:WIS
+f:CHR
+f:CON
+f:DEX
+f:ESP_ALL
+f:INT
+f:STR
+f:WIS
 
 # Lucky weapons - named after smith of legend
 N:224:of Telchar
@@ -2811,7 +3390,9 @@ T:24:0:99
 X:A:70:70
 W:10:2:70:3000
 C:10:10:0:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
 F:LUCK
 f:LUCK
@@ -2826,8 +3407,16 @@ X:A:50:50
 W:0:2:50:0
 C:5:5:0:-2
 R:100
-F:LUCK | CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
-f:LUCK | CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LUCK
+f:AGGRAVATE
+f:AUTO_CURSE
+f:CURSED
+f:HEAVY_CURSE
+f:LUCK
 
 # Holy ammo - based on 'Of Holy Might' from Hengband
 N:226:Blessed
@@ -2838,8 +3427,13 @@ X:B:30:30
 W:0:5:60:600
 C:5:10:0:0
 R:100
-F:SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | BRAND_FIRE | BLESSED
-F:IGNORE_FIRE | IGNORE_ACID
+F:BLESSED
+F:BRAND_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
 
 # Holy Avenger weapons brought back, modified
 N:227:(Holy Avenger)
@@ -2851,9 +3445,13 @@ X:A:50:50
 W:0:2:60:20000
 C:5:5:0:3
 R:100
-F:WIS | SUSTAIN | 
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED
+F:BLESSED
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 
 # A Whip of the Balroeg, adapted from Oangband
 N:228:of the Balroeg
@@ -2862,8 +3460,12 @@ X:A:50:50
 W:0:3:50:12000
 C:-10:10:0:-3
 R:100
-F:STEALTH | BRAND_FIRE | RES_FIRE | LITE2 | 
-F:IGNORE_FIRE | ESP_GOOD | 
+F:BRAND_FIRE
+F:ESP_GOOD
+F:IGNORE_FIRE
+F:LITE2
+F:RES_FIRE
+F:STEALTH
 R:5
 F:IM_FIRE
 
@@ -2876,7 +3478,9 @@ X:A:25:10
 W:0:3:50:0
 C:0:0:0:-1
 r:F:BLESSED
-F:DRAIN_EXP | SEE_INVIS | CHR
+F:CHR
+F:DRAIN_EXP
+F:SEE_INVIS
 
 # Magical missile launchers
 # Tiny mana boost for magic-using archers or warrior-types
@@ -2900,13 +3504,23 @@ T:45:0:56
 T:45:59:99
 W:5:1:10:2000
 C:0:0:0:0
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
-f:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:SPELL_CONTAIN
+f:WIELD_CAST
 
 # Magestaves of Sorcery, added in Theme 1.0.1
 N:232:of Sorcery
@@ -2914,9 +3528,13 @@ X:A:24:60
 T:6:0:99
 W:30:1:8:100000
 C:-80:-80:0:3
-r:F:CURSED | HEAVY_CURSE | PERMA_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
+r:F:PERMA_CURSE
 R:100
-F:MANA | SPELL | LIFE
+F:LIFE
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
@@ -2929,7 +3547,9 @@ T:24:0:99
 X:A:70:70
 W:0:2:70:50000
 C:1:1:0:0
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
 F:LEVELS
 f:LEVELS
@@ -2941,8 +3561,15 @@ X:A:25:20
 W:50:2:21:50000
 C:10:10:0:2
 R:100
-F:CON | XTRA_MIGHT | XTRA_SHOTS | RES_POIS | STEALTH
-F:IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | SEE_INVIS
+F:CON
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Spear of Mirkwood, added in Theme 1.0.2
 N:235:of Mirkwood
@@ -2950,16 +3577,32 @@ T:22:2:2
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:3
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:STEALTH | HOLD_LIFE | SEE_INVIS | CON |
-F:RES_FEAR | RES_DARK | RES_LITE | RES_BLIND |
-F:IGNORE_ACID | IGNORE_FIRE |
-F:R_ANY | R_LOW | SUSTAIN
+F:CON
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_DARK
+F:RES_FEAR
+F:RES_LITE
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 
 # Dwarven jewelry - no speed rings; added in Theme 1.1.4
 N:236:Dwarven
@@ -2975,7 +3618,8 @@ Z:stone to mud
 R:50
 F:SUSTAIN
 R:25
-F:R_ANY | SUSTAIN
+F:R_ANY
+F:SUSTAIN
 R:5
 F:CON
 
diff --git a/lib/mods/theme/edit/evil.map b/lib/mods/theme/edit/evil.map
index a2f00914..aff2de9b 100644
--- a/lib/mods/theme/edit/evil.map
+++ b/lib/mods/theme/edit/evil.map
@@ -14,13 +14,13 @@ F:<:6:0
 F:.:88:0
 
 # Lesser Balrog
-F:b:88:0:996:0:0:0:0:0:0:2
+F:b:88:0:996:0:0:0:0:0:2
 
 # Greater Balrog
-F:B:88:0:807:0:0:0:0:0:0:2
+F:B:88:0:807:0:0:0:0:0:2
 
 # Pit Fiend
-F:P:88:0:812:0:0:0:0:0:0:2
+F:P:88:0:812:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/f_info.txt b/lib/mods/theme/edit/f_info.txt
index 2b42aa47..c4d2f149 100644
--- a/lib/mods/theme/edit/f_info.txt
+++ b/lib/mods/theme/edit/f_info.txt
@@ -25,39 +25,62 @@ F:FLOOR
 
 N:1:open floor
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # 0x02 -> fountain
 N:2:fountain
 G:_:w
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The liquid here seems magical.
 
 # 0x03 --> glyph of warding
 
 N:3:glyph of warding
 G:;:y
-F:FLOOR | NOTICE | SUPPORT_LIGHT | CAN_RUN | REMEMBER
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a mighty spell of protection here.
 
 # 0x04 --> open door
 
 N:4:open door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x05 --> broken door
 
 N:5:broken door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x06 --> up stairs (perm)
 
 N:6:up staircase
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is an up staircase here.
 D:1:You cannot tunnel a stair.
 
@@ -65,60 +88,102 @@ D:1:You cannot tunnel a stair.
 
 N:7:down staircase
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a down staircase here.
 D:1:You cannot tunnel a stair.
 
 N:8:quest entrance
 G:>:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest entrance.
 
 N:9:quest exit
 G:<:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest exit.
 
 N:10:quest down level
 G:>:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:11:quest up level
 G:<:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:12:town exit
 G:>:g
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:13:shaft down
 G:>:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft down here.
 D:1:You cannot tunnel a shaft.
 
 N:14:shaft up
 G:<:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft up here.
 D:1:You cannot tunnel a shaft.
 
 # 0x0F -> empty fountain
 N:15:fountain
 G:_:D
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The fountain seems empty.
 
 N:16:web
 G:+:y
-F:CAN_PASS | NOTICE | WEB | NOTICE | TUNNELABLE
+F:CAN_PASS
+F:NOTICE
+F:NOTICE
+F:TUNNELABLE
+F:WEB
 D:1:You tunnel through the web.
 D:2:a web blocking your way
 
 # Trap -- the flags are not used by the program
 N:17:trap
 G:^:w
-F:FLOOR | NOTICE | REMEMBER
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x12 --> 0x1F -- UNUSED
 
@@ -127,8 +192,14 @@ F:FLOOR | NOTICE | REMEMBER
 N:32:door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 1)
@@ -136,8 +207,14 @@ D:1:You bash the boor.
 N:33:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 2)
@@ -145,8 +222,14 @@ D:1:You bash the boor.
 N:34:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 3)
@@ -154,8 +237,14 @@ D:1:You bash the boor.
 N:35:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 4)
@@ -163,8 +252,14 @@ D:1:You bash the boor.
 N:36:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 5)
@@ -172,8 +267,14 @@ D:1:You bash the boor.
 N:37:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 6)
@@ -181,8 +282,14 @@ D:1:You bash the boor.
 N:38:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 7)
@@ -190,8 +297,14 @@ D:1:You bash the boor.
 N:39:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 0)
@@ -199,8 +312,13 @@ D:1:You bash the boor.
 N:40:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 1)
@@ -208,8 +326,13 @@ D:1:You bash the boor.
 N:41:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 2)
@@ -217,8 +340,13 @@ D:1:You bash the boor.
 N:42:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 3)
@@ -226,8 +354,13 @@ D:1:You bash the boor.
 N:43:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 4)
@@ -235,8 +368,13 @@ D:1:You bash the boor.
 N:44:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 5)
@@ -244,8 +382,13 @@ D:1:You bash the boor.
 N:45:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 6)
@@ -253,8 +396,13 @@ D:1:You bash the boor.
 N:46:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 7)
@@ -262,8 +410,13 @@ D:1:You bash the boor.
 N:47:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x30 --> secret door
@@ -271,36 +424,55 @@ D:1:You bash the boor.
 N:48:secret door
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | DOOR
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:DOOR
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel.
 
 # 0x31 --> rubble
 
 N:49:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You dig in the rubble.
 
 # 0x32 --> magma vein
 
 N:50:magma vein
 G:%:s
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x33 --> quartz vein
 
 N:51:quartz vein
 G:%:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x34 --> magma vein + treasure
@@ -308,9 +480,14 @@ D:1:You tunnel into the quartz vein.
 N:52:magma vein
 G:%:s
 M:50
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x35 --> quartz vein + treasure
@@ -318,36 +495,55 @@ D:1:You tunnel into the magma vein.
 N:53:quartz vein
 G:%:w
 M:51
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x36 --> magma vein + known treasure
 
 N:54:magma vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x37 --> quartz vein + known treasure
 
 N:55:quartz vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x38 --> granite wall -- basic
 
 N:56:granite wall
 G:#:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x39 --> granite wall -- inner
@@ -355,9 +551,13 @@ D:1:You tunnel into the granite wall.
 N:57:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3A --> granite wall -- outer
@@ -365,9 +565,13 @@ D:1:You tunnel into the granite wall.
 N:58:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3B --> granite wall -- solid
@@ -375,233 +579,347 @@ D:1:You tunnel into the granite wall.
 N:59:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3C --> permanent wall -- basic (perm)
 
 N:60:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3D --> permanent wall -- inner (perm)
 
 N:61:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3E --> permanent wall -- outer (perm)
 
 N:62:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3F --> permanent wall -- solid (perm)
 
 N:63:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:64:explosive rune
 G:*:R
-F:FLOOR | CAN_LEVITATE | CAN_FLY | NOTICE | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:NOTICE
+F:SUPPORT_LIGHT
 D:0:This rune seems unstable.
 
 N:65:Straight Road startpoint
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:66:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:67:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:68:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:69:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:70:section of the Straight Road
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:71:section of the Straight Road (discharged)
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:72:Straight Road exit
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:73:corrupted section of the Straight Road
 G:*:D
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 74 --> shop
 
 N:74:Building
 G:1:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 # 75 --> 78 Quests index
 
 N:75:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:76:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:77:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:78:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 #Elanor
 N:79:grass with Elanor flowers
 G:&:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Fumellar
 N:80:grass with Fumella flowers
 G:;:r
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Anemones
 N:81:grass with anemones
 G:;:v
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Niphredil
 N:82:grass with Niphredil flowers
 G:;:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Iris
 N:83:grass with irises
 G:;:b
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:84:stream of shallow water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # -1 = player level
 N:85:pool of deep lava
 G:.:R
 E:-1d2:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the deep lava.
 
 N:86:stream of shallow lava
 G:.:r
 E:-1d1:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the shallow lava.
 
 N:87:dark pit
 G:#:D
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:0:Ohhh, it is dark and deep.
 
 N:88:dirt
 G:.:U
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:89:patch of grass
 G:.:G
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:90:ice
 G:.:W
 E:1d1:50:ICE
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 N:91:sand
 G:.:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:92:dead tree
 G:#:D
-F:CAN_FLY | CAN_PASS
-F:WALL | NO_WALK | NO_VISION | NOTICE
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the dead tree.
 D:2:a tree blocking your way
 
 N:93:ash
 G:.:s
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:94:puddle of mud
 G:.:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:95:ice wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the ice wall... #BOh, chilly#w.
 D:2:an ice wall blocking your way
 
 N:96:tree
 G:#:G
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the tree.
 D:2:a tree blocking your way
 
 N:97:mountain chain
 G:^:U
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
@@ -609,9 +927,12 @@ D:2:a hard stone block blocking your way
 
 N:98:sandwall
 G:#:y
-F:WALL | NO_WALK | CAN_PASS | NO_VISION
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -620,9 +941,12 @@ D:2:a sandwall blocking your way
 N:99:sandwall
 G:%:y
 M:98
-F:WALL | NO_WALK | CAN_PASS | NO_VISION
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -630,16 +954,23 @@ D:2:a sandwall blocking your way
 
 N:100:sandwall with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily tunnel into the sandwall.
 D:2:a sandwall blocking your way
 
 N:101:high mountain chain
 G:^:W
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
@@ -648,71 +979,112 @@ G:.:v
 S:v:R:r:v:R:r:D
 E:1d1:40:NETHER
 F:ATTR_MULTI
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # A diggable glass wall.
 N:103:molten glass wall
 G:.:B
-F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the molten glass wall...
 D:2:a molten glass wall blocking your way
 
 N:159:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:160:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 ###### Here are the altars. ######
 
 N:161:Altar of Being
 G:0:W
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel at peace.
 
 N:162:Altar of Winds
 G:0:B
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to become a bird.
 
 N:163:Altar of Force
 G:0:R
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to fight evil.
 
 N:164:Altar of Darkness
 G:0:D
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:Images of pain and death fill your mind.
 
 N:165:Altar of Nature
 G:0:g
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel the desire to walk in a great forest.
 
 N:166:Altar of Stone
 G:0:s
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to forge items.
 
 N:167:Altar of Light
 G:0:y
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to light up dark places.
 
 N:168:Altar of Waters
 G:0:b
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to bathe in the ocean.
 
 N:169:Altar of Doom
 G:0:o
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to do justice.
 
 # XXX
@@ -727,20 +1099,30 @@ D:0:You grow a desire to do justice.
 # Used as a marker for random quests
 N:172:open floor
 G:.:w
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # Underground Tunnel
 N:173:Underground Tunnel
 G:#:s
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Tainted water
 N:174:stream of tainted water
 G:~:u
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 N:175:monster trap
 G:;:v
@@ -748,14 +1130,22 @@ F:FLOOR
 
 N:176:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:177:lava wall
 G:#:R
 S:R:R:r:r:U:u:R
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:The lava is far too hot to tunnel into it.
 D:2:a lava wall blocking your way
 
@@ -764,33 +1154,51 @@ G:%:v
 S:R:R:y:v:y:v:R
 E:150d2:1:HELL_FIRE
 F:ATTR_MULTI
-F:FLOOR | REMEMBER | NOTICE | PERMANENT
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:This fire is so powerful it could destroy even the most powerful artifacts.
 
 N:179:path to the next area
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the next area here.
 D:1:You cannot tunnel a path.
 
 N:180:path to the previous area
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the previous area here.
 D:1:You cannot tunnel a path.
 
 N:181:field
 G:::g
-F:FLOOR | PERMANENT | NOTICE | REMEMBER
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a field.
 
 N:182:Ekkaia, the Encircling Sea
 G:*:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:183:void
 G: :d
@@ -804,97 +1212,159 @@ N:187:pool of deep water
 G:~:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Glass wall -- can see but not pass
 N:188:glass wall
 G:.:B
-F:NO_WALK | WALL | PERMANENT | NOTICE
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This glass seems to be totaly impenetrable.
 D:2:a glass wall blocking your way
 
 # Illusion wall -- can't see but can pass
 N:189:illusion wall
 G:#:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Looks like this wall is not so real.
 
 # Grass roof
 N:190:Grass roof
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof top
 N:191:grass roof top
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof chimney
 N:192:grass roof chimney
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof
 N:193:brick roof
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof top
 N:194:brick roof top
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof chimney
 N:195:brick roof chimney
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # window
 N:196:window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # small window
 N:197:small window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # rain barrel
 N:198:rain barrel
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass with Kingsfoil flowers
 N:199:grass with Kingsfoil flowers
 G:;:G
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # cobblestone road
 N:200:cobblestone road
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # cobblestone with outlet
 N:201:cobblestone with outlet
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 N:202:small tree
 G:#:g
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Just to have a town entrance picture
 N:203:town
 G:*:w
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 # Underground Tunnel
 N:204:Underground Tunnel
 G:^:U
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Fire
@@ -904,108 +1374,166 @@ S:y:y:y:R:r:y:R
 E:-1d2:1:FIRE
 D:0:The blazing fire burns you!
 F:ATTR_MULTI
-F:FLOOR | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Permanent rubble -- town use
 N:206:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT | PERMANENT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:Looks like this pile of rubble is quite hard.
 
 # Rocky ground - rougher terrain.
 N:207:rocky ground
 G:.:s
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # cloud-like vapour. Floor for Eru's temple
 N:208:cloud-like vapour
 G:.:W
 S:W:B:B:W:w:W:B
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT 
-F:ATTR_MULTI | CAN_RUN | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # condensing water
 N:209:condensing water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Dense mist. Can pass through, but not see through
 N:210:dense mist
 G:#:w
 S:w:W:s:s:s:w:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT
-F:ATTR_MULTI | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You wander through the mist.
 D:1:You cannot tunnel through mist!
 
 # Hail-stone wall
 N:211:hail-stone wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the hail-stone wall.
 
 N:212:dead small tree
 G:#:D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Low hill
 N:213:low hill
 G:^:g
-F:FLOOR | DONT_NOTICE_RUNNING| CAN_RUN | SUPPORT_LIGHT | NO_VISION
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:SUPPORT_LIGHT
 D:0:You go over the hill.
 D:1:You cannot tunnel through that.
 
 #Angband and Mordor (Ered Lithui, Ephel Duath) mountains
 N:214:dark mountain chain
 G:^:D
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
 #Ered Luin - Blue Mountains
 N:215:blue mountain chain
 G:^:B
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
 #Ered Mithrin - Grey Mountains
 N:216:grey mountain chain
 G:^:s
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
 #Orodruin - Mount Doom
 N:217:part of Mount Doom
 G:^:R
-F:WALL | NO_WALK | NO_VISION | NOTICE | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a stream of searing lava barring your way
 
 #Snow-capped peak
 N:218:snow-capped peak
 G:^:w
-F:WALL | NO_WALK | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | PERMANENT
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The ice is too cold to tunnel into it.
 D:2:an unusually thick wall of ice barring your way
 
@@ -1013,45 +1541,66 @@ D:2:an unusually thick wall of ice barring your way
 #BUG - these do not burn.
 N:219:fir tree
 G:#:g
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the fir tree.
 D:2:a fir tree blocking your way
 
 #section of a flet (wooden platforms built high up in the trees of Lothlórien)
 N:220:section of a flet
 G:_:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 #light post
 N:221:light post
 G:|:w
-F:WALL | NO_WALK | CAN_FLY | CAN_PASS
-F:SUPPORT_LIGHT | REMEMBER
+F:CAN_FLY
+F:CAN_PASS
+F:NO_WALK
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel a light post.
 D:2:A light post blocking your way
 
 #Water lily
 N:222:water lily
 G:;:B
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Dead Marshes swamp water
 N:223:part of the Dead Marshes
 G:~:G
 E:10d10:6:CONFUSION
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 #Morannon
 N:224:Black Gate
 G:+:D
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION | NOTICE 
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a closed Black Gate blocking your way
 
@@ -1060,14 +1609,24 @@ N:225:river
 G:~:w
 S:w:w:w:B:w:w:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
-F:DONT_NOTICE_RUNNING | SUPPORT_GROWTH 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Swamp
 N:226:swamp pool
 G:~:g
 E:1d1:1:POISON
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 #Anduin river
 N:227:stream of the Anduin river
@@ -1075,14 +1634,23 @@ G:~:B
 E:1d1:1:WATER
 S:w:w:w:b:w:w:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | SUPPORT_GROWTH
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Road sign to Gondolin to avoid Maeglin quest silliness somewhat
 N:228:road sign that says 'Find Gondolin!'
 G:?:v
 S:v:R:B:G:w:v:R
 F:ATTR_MULTI
-F:WALL | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | 
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 
 ### New terrain features for town use ###
 
@@ -1090,8 +1658,15 @@ F:WALL | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER |
 N:229:beehive
 G:*:o
 E:1d1:1:POISON
-F:WALL | PERMANENT | CAN_FLY | REMEMBER | SUPPORT_LIGHT | 
-F:CAN_PASS | NO_WALK | NO_VISION | DONT_NOTICE_RUNNING | 
+F:CAN_FLY
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 D:0:Ouch! A bee stung you!
 D:1:You'll just get stung.
 D:2:a beehive blocking your way
@@ -1099,49 +1674,81 @@ D:2:a beehive blocking your way
 #Dirt road - same as dirt but more appropriate for towns
 N:230:dirt road
 G:.:U
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Wide gate
 N:231:wide gate
 G:-:D
-F:WALL | PERMANENT | CAN_FLY | SUPPORT_LIGHT | NOTICE | 
-F:CAN_PASS | NO_WALK | NO_VISION | DONT_NOTICE_RUNNING | 
+F:CAN_FLY
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a closed gate barring your way
 
 #Same gate, but opened
 N:232:open gate
 G:':D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | 
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 ### For wood houses, bridges, etc:
 
 #Wooden board - horizontal
 N:233:wooden board
 G:-:u
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Wooden board - vertical
 N:234:wooden board
 G:|:u
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Light wooden board - horizontal
 N:235:wooden board
 G:-:U
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Light wooden board - vertical
 N:236:wooden board
 G:|:U
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
@@ -1149,9 +1756,14 @@ D:2:a wooden board blocking your way
 #BUG - these do not burn.
 N:237:white tree
 G:#:w
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION | PERMANENT 
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a white tree blocking your way
 
@@ -1161,35 +1773,52 @@ G:|:B
 E:25d10:1:WATER
 S:w:w:w:b:w:w:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | 
-F:DONT_NOTICE_RUNNING | SUPPORT_GROWTH | 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Slippery rock ledge
 N:239:slippery rock ledge
 G:&:s
 E:5d10:1:COLD
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT | 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Stable
 N:240:stable
 G:#:u
-F:WALL | NO_WALK | NO_VISION | PERMANENT | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a stable wall blocking your way
 
 #Wooden plank
 N:241:wooden plank
 G:%:U
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | 
-F:SUPPORT_GROWTH  | 
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Fosse (dry moat)
 N:242:fosse pit
 G:&:g
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:1:You cannot tunnel through that.
 D:2:a dry moat blocking your way
 
@@ -1197,9 +1826,13 @@ D:2:a dry moat blocking your way
 N:243:Mallorn
 G:*:y
 S:y:W:W:y:w:W:y
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:It isn't a good idea to harm a Mallorn.
 D:2:a Mallorn blocking your way
 
@@ -1208,33 +1841,56 @@ D:2:a Mallorn blocking your way
 N:244:copper pillar
 G:#:u
 S:u:u:u:o:u:u:u
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | ATTR_MULTI
+F:ATTR_MULTI
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The copper is too tough to tunnel through.
 D:2:a copper pillar blocking your way
 
 N:245:ethereal wall
 G:.:w
-F:WALL | NO_WALK | PERMANENT | NOTICE | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You can't even see your obstruction!
 D:2:an unseen force blocking your way
 
 N:246:glacial wall
 G:#:B
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the glacial wall... #BOh, chilly!#w.
 D:2:a hard glacial wall blocking your way
 
 N:247:battlement
 G:#:w
-F:NO_WALK | CAN_PASS | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
 D:1:You tunnel into the battlement.
 D:2:a hard stone battlement blocking your way
 
 N:248:door of Orthanc
 G:':r
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
-F:SUPPORT_LIGHT | DONT_NOTICE_RUNNING
-D:0:The Key of Orthanc allows you to pass.
\ No newline at end of file
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
+D:0:The Key of Orthanc allows you to pass.
diff --git a/lib/mods/theme/edit/k_info.txt b/lib/mods/theme/edit/k_info.txt
index c8a78082..6cfe4dee 100644
--- a/lib/mods/theme/edit/k_info.txt
+++ b/lib/mods/theme/edit/k_info.txt
@@ -275,7 +275,8 @@ N:29:& Blue Stone~
 G:":B
 I:40:18:0
 W:60:0:3:90000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### Edged Weapons #####
 
@@ -294,7 +295,8 @@ I:23:21:0
 W:15:0:140:350
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a long, double-edged sword with a plain hilt that could
 D:be wielded in one or two hands. It's called a "bastard sword" because in
@@ -349,8 +351,11 @@ W:70:0:180:4000
 A:70/8
 P:0:6d5:0:0:0
 F:ATTR_MULTI
-F:RES_CHAOS | CHAOTIC | SHOW_MODS
-f:RES_CHAOS | CHAOTIC
+F:CHAOTIC
+F:RES_CHAOS
+F:SHOW_MODS
+f:CHAOTIC
+f:RES_CHAOS
 D:A mighty sword which seems to be completely blunt. However, it is a conduit
 D:into the realms of pure chaos and strikes its victims with the devastating
 D:might of chaos itself whenever it connects. It gives you resistance to chaos
@@ -363,7 +368,8 @@ I:23:25:0
 W:30:0:200:775
 A:30/1:40/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This blade is lot longer, wider and heavier than a long sword. You have to
 D:wield it with two hands. This means that wielding a shield makes fighting
@@ -397,7 +403,8 @@ I:23:28:0
 W:40:0:260:850
 A:40/1
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:These weapons have been built in all sizes. They are custom-made
 D:for warriors that want to set out and kill their archenemy. These
@@ -409,7 +416,8 @@ I:23:20:0
 W:20:0:120:400
 A:20/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The katana is a long blade with only a small disk for a guard.
 D:Its hilt is long enough for two hands, though it could be used
@@ -489,7 +497,8 @@ I:21:6:0
 W:20:0:150:200
 A:20/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon has a ball linked with a chain to a wooden handle.
 D:Preferred tactic is smashing the brains of your opponent.
@@ -511,7 +520,8 @@ I:21:13:0
 W:10:0:150:353
 A:10/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon was originally used to cut corn. More warlike versions
 D:sport a large blade stuck on a wooden handle. The hinge allows it to get
@@ -523,7 +533,8 @@ I:21:18:0
 W:45:0:280:590
 A:45/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This two-handed version of the flail gives the fighter a fearsome
 D:weapon that can do a fair amount of damage.  It typically has several
@@ -545,7 +556,8 @@ I:21:5:0
 W:5:0:120:130
 A:5/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon is a club ending in a sphere. The sphere is studded
 D:with metal shards, and thus can both crush and cut your adversary.
@@ -556,7 +568,8 @@ I:21:3:0
 W:10:0:150:200
 A:10/1
 P:0:1d9:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A long, wooden pole, usually the height of the wielder. Four of them can be
 D:made out of the trunk of one young tree, hence the name. The quarterstaff
@@ -570,7 +583,8 @@ I:21:8:0
 W:5:0:120:225
 A:5/1
 P:0:3d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large hammer, designed to crush skulls with mighty strikes.
 
@@ -580,7 +594,8 @@ I:21:15:0
 W:15:0:180:502
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large, mean mace filled with lead in order to wreak a maximum of havoc.
 
@@ -590,8 +605,11 @@ I:21:20:0
 W:80:0:400:4300
 A:80/5
 P:0:5d8:0:0:0
-F:SLAY_UNDEAD | SHOW_MODS | MUST2H
-f:MUST2H | SLAY_UNDEAD
+F:MUST2H
+F:SHOW_MODS
+F:SLAY_UNDEAD
+f:MUST2H
+f:SLAY_UNDEAD
 D:This mace is custom-made for priests that go out to destroy evil.
 D:It is deadly, especially for undead.
 
@@ -601,7 +619,8 @@ I:21:10:0
 W:10:0:120:376
 A:10/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A war hammer combined with a spearpoint, mounted on a long pole.
 
@@ -613,7 +632,8 @@ I:22:10:0
 W:15:0:180:408
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This polearm has a beak mounted opposite the blade.
 
@@ -623,7 +643,8 @@ I:22:13:0
 W:20:0:190:363
 A:20/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A polearm with a long, slightly curved knife-like blade. It has spurs on
 D:the dull side of the blade. It's primarily a slashing and chopping weapon. Glaives
@@ -637,7 +658,8 @@ I:22:15:0
 W:25:0:190:430
 A:25/1
 P:0:3d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The halberd has a broad, short axe blade on a 5-6 ft long haft, with a
 D:spearpoint at the top, often a back-spike and occasionally a butt-spike. Used to
@@ -653,7 +675,8 @@ I:22:4:0
 W:10:0:160:340
 A:10/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a polearm with a long square-sectioned spike on the end.
 
@@ -663,7 +686,8 @@ I:22:8:0
 W:15:0:160:358
 A:15/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A staff, 16-18 feet long, that has a small piercing head about 10 inches
 D:long. The pike is often used by infantry to fend off cavalry.  It is very
@@ -688,7 +712,8 @@ I:22:5:0
 W:5:0:70:120
 A:5/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The trident is based on the pitchfork.  In fact, when not used as a weapon,
 D:it is often employed as a pitchfork. It is famous for its uses in
@@ -701,7 +726,8 @@ I:22:20:0
 W:10:0:300:230
 A:10/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the original polearm. It is shaped like a spear but is bigger. It's
 D:meant to fend off enemies, not to be thrown.
@@ -712,7 +738,8 @@ I:24:25:0
 W:40:0:230:500
 A:40/1
 P:0:4d4:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A huge and heavy two-headed axe.
 
@@ -722,7 +749,8 @@ I:22:22:0
 W:15:0:170:334
 A:15/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:The Nordics' take on the halberd. The polearm of choice for many Nordics,
@@ -734,7 +762,8 @@ I:22:28:0
 W:45:0:250:750
 A:45/1
 P:0:3d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:Another Nordic version of the halberd. The polearm of choice for many Nordics,
@@ -746,7 +775,8 @@ I:24:11:0
 W:15:0:160:304
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A one-headed axe made for combat, with an elongated moon-shaped blade.
 
@@ -756,7 +786,8 @@ I:22:17:0
 W:45:0:250:800
 A:45/1
 P:0:5d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A simple farm implement, converted into a weapon by slightly straightening
 D:its blade and putting it in line with its pole, instead of the typical
@@ -768,8 +799,13 @@ I:22:30:0
 W:80:0:250:10000
 A:80/20
 P:0:8d4:0:0:0
-F:SHOW_MODS | MUST2H | WOUNDING | VORPAL
-f:MUST2H | VORPAL | WOUNDING
+F:MUST2H
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
+f:MUST2H
+f:VORPAL
+f:WOUNDING
 D:The simple design of the war scythe, but this one uses a finely crafted and
 D:incredibly sharp steel blade which causes terrible wounds when it hits.
 
@@ -962,8 +998,12 @@ I:35:2:0
 W:30:0:5:1500
 A:30/4
 P:4:0d0:0:0:4
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE | IGNORE_ELEC
-F:STEALTH | SEARCH | LUCK
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LUCK
+F:STEALTH
 f:STEALTH
 D:A wonderfully light cloak coloured in brown and green hues. Its colouring
 D:greatly helps the wearer to avoid undesired attention. Wearing it makes you
@@ -1215,7 +1255,10 @@ I:37:30:0
 W:75:0:420:20000
 A:75/4
 P:40:2d4:-4:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A suit of plate armour fashioned from a metal whose secret is only known to Eol,
 D:the dark Elvensmith. It is practically unbreakable.
 
@@ -1276,7 +1319,9 @@ I:35:6:1
 W:60:0:5:7500
 A:75/4
 P:6:0d0:0:0:4
-F:RES_DARK | RES_LITE | STEALTH
+F:RES_DARK
+F:RES_LITE
+F:STEALTH
 f:STEALTH
 D:A rare cloak imbued with magic to radiate a strange twilight, absorbing both
 D:extreme brightness and darkness.
@@ -1354,7 +1399,9 @@ G:=:d
 I:45:24:0
 W:30:0:2:500
 A:30/1
-F:STR | HIDE_TYPE | SUST_STR
+F:HIDE_TYPE
+F:STR
+F:SUST_STR
 f:STR
 D:This bauble magically improves your strength.
 
@@ -1363,7 +1410,9 @@ G:=:d
 I:45:26:0
 W:30:0:2:500
 A:30/1
-F:DEX | HIDE_TYPE | SUST_DEX
+F:DEX
+F:HIDE_TYPE
+F:SUST_DEX
 f:DEX
 D:This piece of jewellery magically improves your agility.
 
@@ -1372,7 +1421,9 @@ G:=:d
 I:45:27:0
 W:30:0:2:500
 A:30/1
-F:CON | HIDE_TYPE | SUST_CON
+F:CON
+F:HIDE_TYPE
+F:SUST_CON
 f:CON
 D:This ring magically grants you health, improving your constitution.
 
@@ -1381,7 +1432,9 @@ G:=:d
 I:45:25:0
 W:30:0:2:500
 A:30/1
-F:INT | HIDE_TYPE | SUST_INT
+F:HIDE_TYPE
+F:INT
+F:SUST_INT
 f:INT
 D:This magical piece of jewellery makes you smarter.
 
@@ -1390,19 +1443,11 @@ G:=:d
 I:45:31:0
 W:75:0:2:100000
 A:75/1
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 D:This wonderful ring grants you additional energy, allowing you to act faster.
 
-N:137:Searching
-G:=:d
-I:45:23:0
-W:5:0:2:250
-A:5/1
-F:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This ring magically improves your attention, so you can detect hidden things better.
-
 # New : It can be activated but at the cost of its destruction
 N:138:Teleportation
 G:=:d
@@ -1410,7 +1455,10 @@ I:45:4:0
 W:5:0:2:250
 A:5/1
 a:DEST_TELE
-F:CURSED | TELEPORT | EASY_KNOW | ACTIVATE
+F:ACTIVATE
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This ring will uncontrollably send you to different places at its whim.
 D:You can use its power once at your will, but it will destroy the ring.
@@ -1420,7 +1468,8 @@ G:=:d
 I:45:6:0
 W:5:0:2:250
 A:5/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This magical bauble grants you some sustenance, allowing you to subsist on less food.
 
@@ -1429,7 +1478,8 @@ G:=:d
 I:45:7:0
 W:5:0:2:200
 A:5/1
-F:FEATHER | EASY_KNOW
+F:EASY_KNOW
+F:FEATHER
 f:FEATHER
 D:When you put on this ring, you will be able to float just above the floor.
 D:It prevents you from drowning, and all your falls will be painless.
@@ -1439,7 +1489,8 @@ G:=:d
 I:45:20:0
 W:60:0:2:16000
 A:60/2
-F:RES_POIS | EASY_KNOW
+F:EASY_KNOW
+F:RES_POIS
 f:RES_POIS
 D:This magical ring grants protection from poison.
 D:It is rumoured that in deep dungeons monsters can kill you at once if you
@@ -1450,7 +1501,8 @@ G:=:d
 I:45:21:0
 W:20:0:2:1500
 A:20/1
-F:FREE_ACT | EASY_KNOW
+F:EASY_KNOW
+F:FREE_ACT
 f:FREE_ACT
 D:This magical bauble prevents you from being held.
 D:Some monsters will paralyse you and then kill you if you lack free action.
@@ -1460,7 +1512,9 @@ G:=:d
 I:45:2:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | STR | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This accursed ring will sap your strength, rendering you much weaker as long as you wear it.
 
@@ -1471,8 +1525,10 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_FIRE_4
-F:RES_FIRE | ACTIVATE
-f:RES_FIRE | IGNORE_FIRE
+F:ACTIVATE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 D:This fiery circlet grants you protection, makes fire less dangerous and even
 D:allows you to call forth a ball of flame.
 
@@ -1483,8 +1539,10 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_ACID_4
-F:RES_ACID | ACTIVATE
-f:RES_ACID | IGNORE_ACID
+F:ACTIVATE
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 D:This magical ring is imbued with spells of devouring acid, granting protection against such
 D:assaults and the ability to shoot acid at your foes.
 
@@ -1495,8 +1553,10 @@ W:50:0:2:3000
 A:50/1
 a:BA_COLD_4
 P:0:0d0:0:0:15
-F:RES_COLD | ACTIVATE
-f:RES_COLD | IGNORE_COLD
+F:ACTIVATE
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 D:This ring is imbued with supernatural cold, which makes you less vulnerable to such effects
 D:and occasionally allows you to throw balls of ice at your foes.
 
@@ -1505,7 +1565,12 @@ G:=:d
 I:45:0:-5
 W:50:0:2:0
 A:50/1
-F:CURSED | TELEPORT | WIS | CHR | HIDE_TYPE | AUTO_CURSE
+F:AUTO_CURSE
+F:CHR
+F:CURSED
+F:HIDE_TYPE
+F:TELEPORT
+F:WIS
 D:This accursed ring will turn you into a bumbling fool and, in addition, magically 
 D:transports you to places you never wanted to see. It can recurse itself if
 D:you leave it on too long.
@@ -1515,7 +1580,9 @@ G:=:d
 I:45:3:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | INT | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This wicked ring feeds off your intellect, magically making you stupid.
 
@@ -1533,7 +1600,9 @@ G:=:d
 I:45:28:0
 W:20:0:2:500
 A:20/1
-F:HIDE_TYPE | EASY_USE | ACTIVATE |
+F:ACTIVATE
+F:EASY_USE
+F:HIDE_TYPE
 a:WHIRLWIND
 D:This ring magically improves your control in combat, allowing you to hit more often.
 D:It can also sometimes be used to hit several nearby opponents with deadly accuracy.
@@ -1550,7 +1619,10 @@ G:=:d
 I:45:1:0
 W:5:0:2:0
 A:5/1
-F:CURSED | AGGRAVATE | EASY_KNOW | AUTO_CURSE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:EASY_KNOW
 f:AGGRAVATE
 D:This faithless ring will draw opponents' attention towards its hapless owner.
 D:If you have any pets, it will also make them turn against you.
@@ -1560,7 +1632,8 @@ G:=:d
 I:45:22:0
 W:30:0:2:340
 A:30/1
-F:SEE_INVIS | EASY_KNOW
+F:EASY_KNOW
+F:SEE_INVIS
 f:SEE_INVIS
 D:This magical piece of jewellery allows your eyes to perceive beings otherwise unseen.
 
@@ -1579,7 +1652,10 @@ G:":d
 I:40:6:0
 W:50:0:3:1000
 A:50/4
-F:INT | WIS | HIDE_TYPE | LITE1
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:WIS
 D:This talisman grants a sharper wit, greater insight and brightness to light dark places.
 
 N:164:Charisma
@@ -1587,36 +1663,31 @@ G:":d
 I:40:7:0
 W:30:0:3:500
 A:30/1
-F:CHR | HIDE_TYPE
+F:CHR
+F:HIDE_TYPE
 f:CHR
 D:This amulet grants beauty beyond mere looks.
 
-N:165:Searching
-G:":d
-I:40:5:0
-W:15:0:3:600
-A:15/1
-F:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
 N:166:Teleportation
 G:":d
 I:40:1:0
 W:10:0:3:250
 A:10/1
-F:CURSED | TELEPORT | EASY_KNOW
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This amulet nastily throws you all over the place.
 
-# Replacing Adornment with Protection from Evil from T-Plus by Ingeborg S. Norden
-
 N:169:Protection from Evil
 G:":d
 I:40:2:0
 W:25:0:3:10000
 A:25/1
-F:EASY_KNOW | ACTIVATE | BLESSED | ESP_EVIL
+F:ACTIVATE
+F:BLESSED
+F:EASY_KNOW
+F:ESP_EVIL
 a:PROT_EVIL
 D:This blessed amulet fends off evil beings and warns the wearer
 D:of their presence.
@@ -1640,9 +1711,17 @@ I:40:8:0
 W:70:0:3:30000
 A:70/8
 P:0:0d0:-4:-4:0
-F:INT | SUST_INT | SEARCH | SPELL_CONTAIN | WIELD_CAST
-F:FREE_ACT | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_BLIND
+F:RES_CONF
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
 D:This rare amulet is highly desirable for mages, as it makes its wearer smarter, more attentive
 D:and impervious to magics which would make their own magic-use impossible.
 
@@ -1651,8 +1730,16 @@ G:":d
 I:40:0:-5
 W:50:0:3:0
 A:50/1
-F:CURSED | STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE
-F:AUTO_CURSE | CURSE_NO_DROP
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:STR
+F:WIS
 D:This wicked amulet will drain all your abilities, turning you into a mere shadow of yourself. It
 D:is exceedingly hard to get rid of.
 
@@ -1713,7 +1800,10 @@ G:?:d
 I:70:50:0
 W:100:0:5:10000
 A:100/8
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A piece of paper inscribed with strange shifting runes. Upon reading them, they will release
 D:a blast of chaotic forces.
 
@@ -1827,14 +1917,6 @@ A:0/1
 D:This scroll shows nearby objects to you. It only makes you aware of items on the floor,
 D:however, not those carried by creatures.
 
-N:194:Trap Detection
-G:?:d
-I:70:28:0
-W:5:0:5:35
-A:5/1:10/1
-D:This scroll is very helpful, because it reveals the locations of nearby snares and traps which you
-D:might otherwise blunder into.
-
 ##### Extra ammunition #####
 
 N:195:& Sheaf Arrow~
@@ -1853,7 +1935,8 @@ I:16:2:0
 W:40:0:4:20
 A:40/2:65/1
 P:0:3d4:5:5:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:Sling bullets made from the slags of mithril smelting. They are unusually heavy, hitting
 D:with great force, and are almost imperishable.
 
@@ -1906,22 +1989,6 @@ W:5:0:5:0
 A:5/1
 D:This nasty scroll will make a loud noise when read, waking up foes in your vicinity.
 
-N:203:Trap Creation
-G:?:d
-I:70:7:0
-W:10:0:5:0
-A:10/1
-D:If you read this rather annoying scroll, snares and pitfalls will magically be planted all around
-D:you, ready to do nasty things to you once you walk onto them.
-
-N:204:Trap/Door Destruction
-G:?:d
-I:70:39:0
-W:10:0:5:50
-A:10/1
-D:A very specifically destructive spell is written on this scroll. It will smash all traps and all
-D:doors immediately next to you.
-
 N:205:Artifact Creation
 G:?:d
 I:70:52:0
@@ -2486,8 +2553,11 @@ I:71:60:100
 W:20:0:4:250
 A:20/1:45/1:80/1:100/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 F:FOUNTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This great potion infuses you with the power of the elements, so that you can better
 D:withstand their ravages.
 
@@ -2694,8 +2764,12 @@ W:127:0:4:0
 A:127/255
 P:0:1d1:0:0:0
 T:39:2
-F:NORM_ART | FULL_NAME | SPECIAL_GENE | EASY_USE
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:SPECIAL_GENE
 a:ETERNAL_FLAME
 D:An impossibly bright, flickering living flame. It can be used
 D:once to imbue an object with the power of Eru Iluvatar himself.
@@ -2706,7 +2780,9 @@ I:23:34:0
 W:0:0:7:10
 A:0/1:5/1:10/1:20/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | VAMPIRIC | SPECIAL_GENE
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:VAMPIRIC
 D:A temporary weapon that only a necromancer can use.
 
 # The Horn of the Thunderlords
@@ -2717,8 +2793,16 @@ W:50:10:10:12000
 P:0:1d4:0:0:0
 A:50/200
 T:55:8
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD | 
-F:NO_RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME | SPECIAL_GENE
+F:EASY_USE
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:NO_RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:This horn was given to you as a reward. Blow it if you are in dire need
 D:of leaving your current location fast.
 
@@ -2776,13 +2860,6 @@ W:30:0:50:100
 A:30/1
 P:0:1d2:0:0:0
 
-N:307:Disarm
-G:_:d
-I:55:8:-1:SPELL=Disarm
-W:2:0:50:100
-A:2/1
-P:0:1d2:0:0:0
-
 N:308:Teleportation
 G:_:d
 I:55:9:-1:SPELL=Teleportation
@@ -2894,7 +2971,8 @@ I:111:0:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The slick black cover of this tome seems to glow
 D:with an inner violet light. You feel more attuned
 D:to raw magic as you hold it.
@@ -2905,7 +2983,9 @@ I:111:1:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:The cover of this tome is bright red, with flickering
 D:flames dancing across it once in a while. As you hold
 D:it, you begin to gain a much closer knowledge of all
@@ -2917,7 +2997,9 @@ I:111:2:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ELEC
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ELEC
 D:The pages of this tome have a tendency to turn themselves,
 D:as though flipped by an errant wind. As you hold it,
 D:you start feeling wind at your fingertips.
@@ -2928,7 +3010,9 @@ I:111:3:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ACID
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
 D:The solid leather cover of this tome seems permanently
 D:stained with caked mud and grass. Heavy it is to lift,
 D:yet strangely comforting to hold - you feel stronger
@@ -2940,7 +3024,8 @@ I:111:4:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover and pages of this tome seem to be perpetually
 D:wet, though they are not wet to the touch. As you hold
 D:it, you begin to understand ocean storms better.
@@ -2951,7 +3036,8 @@ I:111:5:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book seems to flicker strangely. It's one of those books
 D:with an annoying tendency to disappear when you need it and
 D:reappear in the unlikeliest places. As you hold it, you start
@@ -2963,7 +3049,8 @@ I:111:6:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome is a bright shade of green, and it gives off
 D:a healthy, zesty scent that makes your thoughts clearer. As you
 D:hold it, your heart goes out to all living things upon Arda.
@@ -2974,7 +3061,8 @@ I:111:7:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A thick book with solid leather binding. It looks entirely 
 D:unremarkable, but as you hold it, you feel strangely able 
 D:to learn the inner workings of things and creatures.
@@ -3054,8 +3142,11 @@ I:39:0:0:4000
 W:1:0:30:2
 A:1/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | LITE1 | FUEL_LITE
-f:LITE1 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:LITE1
+f:FUEL_LITE
+f:LITE1
 D:A piece of wood with an oily rag wrapped around it. When lit, it will give off a little light and
 D:much smoke.
 
@@ -3065,8 +3156,12 @@ I:39:1:0:7500
 W:3:0:50:35
 A:3/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2 | FUEL_LITE
-f:LITE2 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:IGNORE_FIRE
+F:LITE2
+f:FUEL_LITE
+f:LITE2
 D:A brass container with a wick emerging from it, protected from draughts by a sheet of greased
 D:paper. It can be carried by a handle.
 
@@ -3096,7 +3191,10 @@ I:66:28:90
 W:95:0:15:150000
 A:100/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This powerful rod will release great blasts of destructive energy, but there's no knowing what
 D:this effect will concentrate on.
 
@@ -3106,35 +3204,22 @@ I:66:1:10
 W:15:0:15:1000
 A:15/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:When fuelled with enough ambient mana, this rod can detect nearby passages.
 
-N:352:Trap Location
-G:-:d
-I:66:29:8
-W:5:0:15:100
-A:5/1:10/1:20/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-D:Zapping this rod will release a minor detection magic, alerting you of nearby pits and snares.
-
-N:353:Probing
-G:-:d
-I:66:7:50
-W:40:0:15:4000
-A:40/4
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-D:A rod of knowledge which will tell you about nearby creatures' health.
-D:If they are sleeping, the intrusion will wake them.
-
 N:354:Recall
 G:-:d
 I:66:3:80
 W:30:0:15:4500
 A:30/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A rod which can transport you from the depths to your home and back.
 
 N:355:Illumination
@@ -3144,7 +3229,10 @@ W:20:0:15:1000
 A:20/1
 P:0:1d1:0:0:0
 F:EASY_KNOW
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod carries a minor spell of brightness, lighting your immediate surroundings whenever
 D:activated.
 
@@ -3154,7 +3242,10 @@ I:66:15:15
 W:10:0:15:500
 A:10/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod can shoot a lance of bright light, hurting creatures which lurk in the dark.
 
 N:357:Lightning Bolts
@@ -3163,7 +3254,10 @@ I:66:21:30
 W:20:0:15:2000
 A:20/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod shoots a small spark of lightning, zapping the creature it hits.
 
 N:358:Frost Bolts
@@ -3172,7 +3266,10 @@ I:66:23:35
 W:25:0:15:2500
 A:25/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A small but extremely cold shard of ice will fly from this rod to the enemy you zap it at.
 
 N:359:Fire Bolts
@@ -3181,7 +3278,10 @@ I:66:22:40
 W:30:0:15:3000
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod fires a magical flaming arrow at your foe, burning them.
 
 N:360:Polymorph
@@ -3190,7 +3290,10 @@ I:66:19:25
 W:35:0:15:1200
 A:35/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod of change will cause its target creature to mutate into someone else.
 D:Beware, it can make a weak enemy into a more powerful one.
 
@@ -3200,7 +3303,10 @@ I:66:17:25
 W:30:0:15:1500
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This obstructive rod will slow the creature its spell hits.
 
 N:362:Sleep Monster
@@ -3209,7 +3315,10 @@ I:66:16:25
 W:30:0:15:1500
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This sorcerous rod will cause its target to stop in its tracks.
 
 N:363:Drain Life
@@ -3218,7 +3327,10 @@ I:66:18:30
 W:75:0:15:3600
 A:75/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This necromantic magical rod will hurt a living creature struck by its spell.
 
 N:364:Teleport Other
@@ -3227,25 +3339,22 @@ I:66:13:60
 W:45:0:15:1400
 A:45/2
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod of movement will displace its target to another location.
 
-N:365:Disarming
-G:-:d
-I:66:14:50
-W:35:0:15:2100
-A:35/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-D:This rod will clear a path for you, triggering and thus rendering harmless all traps on the way.
-
 N:366:Lightning Balls
 G:-:d
 I:66:25:50
 W:55:0:15:4000
 A:55/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will hurl a large ball of lightning at its target, electrifying all it engulfs.
 
 N:367:Cold Balls
@@ -3254,7 +3363,10 @@ I:66:27:55
 W:60:0:15:4500
 A:60/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will call forth a minor storm of ice which freezes everything in the area of its blast.
 
 N:368:Fire Balls
@@ -3264,7 +3376,10 @@ W:75:0:15:5000
 A:75/1
 P:0:1d1:0:0:0
 D:This rod will cause a small storm of flame to rage in a small circular area of your choice.
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:369:Acid Balls
 G:-:d
@@ -3272,7 +3387,10 @@ I:66:24:60
 W:70:0:15:5500
 A:70/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This destructive rod will drown its target and its immediate surroundings in caustic acid.
 
 N:370:Acid Bolts
@@ -3281,7 +3399,10 @@ I:66:20:40
 W:40:0:15:3500
 A:40/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will shoot a small glob of powerful acid at its target.
 
 N:371:Enlightenment
@@ -3290,7 +3411,10 @@ I:66:5:40
 W:65:0:15:10000
 A:65/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod grants you knowledge of your surroundings.
 
 N:372:Perception
@@ -3299,7 +3423,10 @@ I:66:2:20
 W:50:0:15:13000
 A:50/8:100/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod makes you insightful, laying open the identity of your possessions.
 
 N:373:Curing
@@ -3308,7 +3435,10 @@ I:66:8:35
 W:65:0:15:15000
 A:65/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This is a rod with minor healing powers, alleviating many disabling conditions.
 
 N:374:Healing
@@ -3317,7 +3447,10 @@ I:66:9:120
 W:80:0:15:20000
 A:80/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod has major healing powers and can restore your health if you have been wounded.
 
 N:375:Detection
@@ -3326,7 +3459,10 @@ I:66:6:80
 W:30:0:15:5000
 A:30/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod grants knowledge about all things worthy of notice in your vicinity.
 
 N:376:Restoration
@@ -3335,7 +3471,10 @@ I:66:10:140
 W:80:0:15:25000
 A:80/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod lets you remember and gain back previously reduced abilities.
 
 N:377:Speed
@@ -3344,7 +3483,10 @@ I:66:11:100
 W:95:0:15:50000
 A:95/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This energising rod will allow you to act a lot faster for some time.
 
 # Ring of Spell
@@ -3354,7 +3496,8 @@ G:=:d
 I:45:58:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This ring is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell onto it.
@@ -3366,7 +3509,8 @@ G:":d
 I:40:27:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This amulet is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell onto it.
@@ -3469,9 +3613,14 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_ACID
-F:RES_ACID | FLY |
-f:RES_ACID |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+f:RES_ACID
 D:A pitch-black armour made from a black dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3482,9 +3631,14 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_ELEC
-F:RES_ELEC | FLY |
-f:RES_ELEC |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ELEC
+f:RES_ELEC
 D:A shimmering bright blue armour made from a blue dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3495,9 +3649,14 @@ W:50:0:200:40000
 A:50/8
 a:BR_COLD
 P:30:2d4:-2:0:10
-F:RES_COLD | FLY |
-f:RES_COLD |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+f:RES_COLD
 D:A gleaming white armour made from a white dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3508,9 +3667,14 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_FIRE
-F:RES_FIRE | FLY |
-f:RES_FIRE |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_FIRE
+f:RES_FIRE
 D:A glowing red armour made from a red dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3521,9 +3685,14 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_POIS
-F:RES_POIS | FLY |
-f:RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_POIS
+f:RES_POIS
 D:A dirty green, foul-smelling armour made from a green dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3534,10 +3703,23 @@ W:90:0:200:150000
 A:90/32
 P:30:2d4:-2:0:10
 a:BR_MANY
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | FLY |
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
+f:RES_POIS
 D:A powerful armour glowing red, blue, green, black, and white.
 D:made from a multihued dragon's hide, it contains some of the dead beast's powers.
 
@@ -3548,8 +3730,14 @@ W:70:0:200:70000
 A:70/16
 P:30:2d4:-2:0:10
 a:BR_LIGHT
-F:RES_LITE | RES_DARK | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DARK
+F:RES_LITE
 D:A strangely glowing armour made from a pseudo-dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3560,8 +3748,14 @@ W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
 a:BR_SHARD
-F:RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
+F:RES_SOUND
 D:A sharp-scaled armour that seems to roar, made from a law dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3572,8 +3766,13 @@ W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
 a:BR_CONF
-F:RES_CONF | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CONF
 D:A brownish armour glittering in a dazzling light, made from a bronze dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3584,8 +3783,13 @@ W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
 a:BR_SOUND
-F:RES_SOUND | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SOUND
 D:A suit of armour with rustling scales, made from a gold dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3596,10 +3800,16 @@ W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
 a:BR_CHAOS
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_CHAOS | RES_DISEN | FLY |
-f:RES_CHAOS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+f:RES_CHAOS
 D:A suit of armour made of dragon hide. It glows in colours you have never seen before. As you
 D:put it on, you feel like you could change the world and are no longer afraid of your equipment
 D:losing its magic.
@@ -3611,8 +3821,16 @@ W:95:0:200:100000
 A:95/32
 P:30:2d4:-2:0:10
 a:BR_BALANCE
-F:RES_CHAOS | RES_DISEN | RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of the hide of a dead dragon. When wearing it, you feel like you
 D:understand the principles of law and chaos, and no longer fear either.
 
@@ -3623,11 +3841,27 @@ W:100:0:250:350000
 A:100/64
 P:40:2d4:-3:0:15
 a:BR_POWER
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK |
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of a very thick richly coloured dragonhide. You think you'll never have
 D:to fear dragons if you put it on.
 
@@ -3639,7 +3873,10 @@ I:32:7:0
 W:45:0:50:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:An iron helmet, covered with a layer of dragonhide. It offers great protection and may grant
 D:protection against some dragon's attacks, based on the dragon the hide was taken from.
 
@@ -3649,7 +3886,10 @@ I:34:6:0
 W:70:0:100:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A large shield, with a dragonskin cover. Depending on which dragon the hide came from, it
 D:might grant protection against some sorts of dragon breath.
 
@@ -3714,15 +3954,6 @@ F:FOUNTAIN
 D:This wonderful potion will fully heal you no matter how badly you're hurt, allow drained
 D:abilities to recover and remove various other ailments.
 
-N:421:Self Knowledge
-G:!:d
-I:71:58:0
-W:40:0:4:2000
-A:40/1
-P:0:1d1:0:0:0
-F:FOUNTAIN
-D:A drink of insight that lets you know yourself better.
-
 N:422:*Enlightenment*
 G:!:d
 I:71:57:0
@@ -3741,8 +3972,9 @@ G:=:d
 I:45:38:0
 W:10:0:2:300
 A:10/2
-F:RES_FEAR | EASY_KNOW
-f:RES_FEAR |
+F:EASY_KNOW
+F:RES_FEAR
+f:RES_FEAR
 D:This ring grants courage, so that you can never become afraid.
 
 N:426:Light and Darkness Resistance
@@ -3750,8 +3982,11 @@ G:=:d
 I:45:39:0
 W:30:0:2:3000
 A:30/2
-F:RES_LITE | RES_DARK | EASY_KNOW
-f:RES_LITE | RES_DARK |
+F:EASY_KNOW
+F:RES_DARK
+F:RES_LITE
+f:RES_DARK
+f:RES_LITE
 D:This ring protects against fluctuations of the light.
 
 N:427:Nether Resistance
@@ -3759,8 +3994,10 @@ G:=:d
 I:45:40:0
 W:34:0:2:14500
 A:34/2
-F:RES_NETHER | HOLD_LIFE | EASY_KNOW
-f:RES_NETHER |
+F:EASY_KNOW
+F:HOLD_LIFE
+F:RES_NETHER
+f:RES_NETHER
 D:This blessed ring improves your life force, protecting you from the draining forces of nether
 D:and other attempts to suck your lifeblood.
 
@@ -3769,8 +4006,9 @@ G:=:d
 I:45:41:0
 W:24:0:2:3000
 A:24/2
-F:RES_NEXUS | EASY_KNOW
-f:RES_NEXUS |
+F:EASY_KNOW
+F:RES_NEXUS
+f:RES_NEXUS
 D:This ring of stability protects you from the warping forces of nexus.
 
 N:429:Sound Resistance
@@ -3778,8 +4016,9 @@ G:=:d
 I:45:42:0
 W:26:0:2:3000
 A:26/2
-F:RES_SOUND | EASY_KNOW
-f:RES_SOUND |
+F:EASY_KNOW
+F:RES_SOUND
+f:RES_SOUND
 D:This ring projects an aura of quiet around you, protecting you from loud noise.
 
 N:430:Confusion Resistance
@@ -3787,8 +4026,9 @@ G:=:d
 I:45:43:0
 W:22:0:2:3000
 A:22/2
-F:RES_CONF | EASY_KNOW
-f:RES_CONF |
+F:EASY_KNOW
+F:RES_CONF
+f:RES_CONF
 D:This ring stabilises your mind, protecting you from all kinds of befuddlement.
 
 N:431:Shard Resistance
@@ -3796,8 +4036,9 @@ G:=:d
 I:45:44:0
 W:25:0:2:3000
 A:25/2
-F:RES_SHARDS | EASY_KNOW
-f:RES_SHARDS |
+F:EASY_KNOW
+F:RES_SHARDS
+f:RES_SHARDS
 D:This piece of jewellery magically toughens your skin, protecting you from flying shrapnel.
 
 N:432:Disenchantment Resistance
@@ -3805,8 +4046,9 @@ G:=:d
 I:45:45:0
 W:90:0:2:15000
 A:90/10
-F:RES_DISEN | EASY_KNOW
-f:RES_DISEN |
+F:EASY_KNOW
+F:RES_DISEN
+f:RES_DISEN
 D:This rare ring of preservation protects your equipment from attempts to sap its magic, also
 D:causing you to suffer less pain from such attacks.
 
@@ -3815,8 +4057,10 @@ G:=:d
 I:45:46:0
 W:50:0:2:13000
 A:50/2
-F:RES_CHAOS | RES_CONF | EASY_KNOW
-f:RES_CHAOS |
+F:EASY_KNOW
+F:RES_CHAOS
+F:RES_CONF
+f:RES_CHAOS
 D:This ring protects you from the horribly warping forces of chaos.
 
 N:434:Blindness Resistance
@@ -3824,8 +4068,9 @@ G:=:d
 I:45:47:0
 W:60:0:2:7500
 A:60/2
-F:RES_BLIND | EASY_KNOW
-f:RES_BLIND |
+F:EASY_KNOW
+F:RES_BLIND
+f:RES_BLIND
 D:This ring magically preserves your eyesight, making you impervious to any attempt to blind
 D:you.
 
@@ -3834,8 +4079,14 @@ G:=:d
 I:45:48:0
 W:100:0:2:100000
 A:100/5
-F:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
-f:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
+F:FREE_ACT
+F:HOLD_LIFE
+F:RES_DISEN
+F:RES_POIS
+f:FREE_ACT
+f:HOLD_LIFE
+f:RES_DISEN
+f:RES_POIS
 D:This blessed ring will protect you from disenchantment, poison, attempts to drain your life
 D:force and holding magic.
 
@@ -3844,8 +4095,11 @@ G:=:d
 I:45:49:0
 W:50:0:2:100000
 A:50/2
-F:BLOWS | ACTIVATE | EASY_USE |
-f:BLOWS | ACTIVATE
+F:ACTIVATE
+F:BLOWS
+F:EASY_USE
+f:ACTIVATE
+f:BLOWS
 a:SPIN
 D:This powerful ring of fighters greatly enhances your fighting speed, allowing you to attack
 D:more often in a round of combat.
@@ -3919,7 +4173,10 @@ I:17:3:0
 W:55:0:2:35
 A:50/4:90/2
 P:0:3d4:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:An arrow to be shot with a bow, its iron head coated with hallowed silver,
 D:a material that sears the flesh of all evil creatures.
 
@@ -3929,7 +4186,10 @@ I:18:3:0
 W:50:0:2:40
 A:60/4:95/2
 P:0:3d5:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:This crossbow bolt has a silver tip, blessed by the Valar for fighting evil.
 
 N:468:Wisdom
@@ -3937,8 +4197,10 @@ G:":d
 I:40:28:0
 W:30:0:3:500
 A:30/1
-F:WIS | SUST_WIS |  HIDE_TYPE
-f:WIS |
+F:HIDE_TYPE
+F:SUST_WIS
+F:WIS
+f:WIS
 D:This magical amulet will magically make you wiser, and fend off
 D:attacks that would reduce your wisdom. Beware: if cursed, the
 D:amulet will do the opposite.
@@ -3948,8 +4210,9 @@ G:":d
 I:40:30:0
 W:30:0:3:600
 A:30/3
-F:REGEN | EASY_KNOW
-f:REGEN |
+F:EASY_KNOW
+F:REGEN
+f:REGEN
 D:Wearing this amulet will trigger your body's regenerational
 D:processes quicker and make them proceed faster.
 
@@ -3958,8 +4221,9 @@ G:":d
 I:40:26:0
 W:10:0:3:200
 A:10/1
-F:INFRA | HIDE_TYPE
-f:INFRA |
+F:HIDE_TYPE
+F:INFRA
+f:INFRA
 D:This amulet will increase your ability to sense warm-blooded
 D:creatures in your vicinity. Beware: if cursed, it will do
 D:just the opposite.
@@ -3969,8 +4233,16 @@ G:":d
 I:40:25:0
 W:70:0:3:30000
 A:70/8
-F:WIS | CHR | SUST_WIS | SUST_CHR | LITE1 | HIDE_TYPE |
-F:RES_DARK | RES_LITE | RES_FIRE | HOLD_LIFE |
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 D:This blessed amulet will protect your wisdom and charms from
 D:diminishing, often adding to them as well. It also grants
 D:some extra protective magics by the grace of the Valar.
@@ -3980,8 +4252,14 @@ G:":d
 I:40:24:0
 W:70:0:3:30000
 A:70/8
-F:STR | CON | SUST_STR | SUST_CON | FREE_ACT | HIDE_TYPE |
-F:RES_FEAR | RES_DISEN |
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DISEN
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The ultimate amulet for a warrior, it will grant protection
 D:in the face of some evil magics, protect your strength and health,
 D:also increasing them. Beware: if cursed, the amulet will
@@ -3992,8 +4270,14 @@ G:":d
 I:40:23:0
 W:70:0:3:30000
 A:70/8
-F:DEX | SUST_DEX | STEALTH | SPEED | INFRA | HIDE_TYPE |
-F:RES_NEXUS | RES_POIS
+F:DEX
+F:HIDE_TYPE
+F:INFRA
+F:RES_NEXUS
+F:RES_POIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:The ultimate amulet for a rogue or assassin, it protects the
 D:wearer against some evil magics, granting improvements in
 D:the abilities vital to these adventurers. Beware: if cursed,
@@ -4004,9 +4288,12 @@ G:":d
 I:40:22:0
 W:50:0:3:25000
 A:50/6
-F:ESP_ALL |
-f:ESP_ALL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ALL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:ESP_ALL
 D:This rare and powerful amulet lays bare the minds of monsters
 D:before the wearer.
 
@@ -4015,9 +4302,19 @@ G:":d
 I:40:21:0
 W:60:0:3:20000
 A:60/4
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:HOLD_LIFE | SLOW_DIGEST | EASY_KNOW |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SLOW_DIGEST
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:This blessed amulet will make the wearer impervious to evil magics
 D:that would sap innate abilities. It also slows down the digestive
 D:system, making food less necessary on long journeys.
@@ -4053,7 +4350,8 @@ N:479:& Ring~
 G:=:d
 I:45:57:0
 W:70:0:2:65000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### And here starts the gold/gems #####
 
@@ -4159,7 +4457,10 @@ G:\:D
 I:21:50:0
 W:15:0:200:1000
 P:0:3d9:0:0:0
-F:SHOW_MODS | INSTA_ART | MUST2H | SPECIAL_GENE
+F:INSTA_ART
+F:MUST2H
+F:SHOW_MODS
+F:SPECIAL_GENE
 f:MUST2H
 
 N:499:& Massive Iron Crown~
@@ -4167,7 +4468,8 @@ G:]:D
 I:33:50:0
 W:44:0:20:1000
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 ##### Objects 500 to 511 are "Special Artifacts" #####
@@ -4271,7 +4573,8 @@ N:508:& Ring~
 G:=:d
 I:45:34:0
 W:80:0:2:100000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # The Ring of Power 'Nenya' -- see artifact list
 
@@ -4314,9 +4617,13 @@ G:":d
 I:40:9:0
 W:60:0:3:30000
 A:60/4
-F:REFLECT | EASY_KNOW
-f:REFLECT |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REFLECT
+f:REFLECT
 D:This wondrous amulet will magically make the wearer
 D:reflect arrows and bolts launched by adversaries.
 
@@ -4327,9 +4634,12 @@ G:":d
 I:40:13:0
 W:40:0:3:30000
 A:40/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_MAGIC
 f:NO_MAGIC
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet wards off magic of any kind, good or bad.
 
 N:522:Anti-Teleportation
@@ -4337,9 +4647,12 @@ G:":d
 I:40:14:0
 W:30:0:3:15000
 A:30/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_TELE
 f:NO_TELE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet will prevent the space-time continuum from
 D:being disrupted around the wearer.
 
@@ -4350,9 +4663,18 @@ G:":d
 I:40:15:0
 W:50:0:3:25000
 A:50/4
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 D:This amulet will make the wearer resist the elements.
 
 ##### New arms #####
@@ -4363,7 +4685,8 @@ I:23:29:0
 W:40:0:280:580
 A:40/3
 P:0:4d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This great sword of foreign origin is approximately 6 feet long. The hilt is
 D:long enough for even four hands to grip. A mighty weapon for a warrior.
@@ -4375,7 +4698,9 @@ I:39:3:0
 W:15:0:50:5000
 A:15/2
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE2
 f:LITE2
 D:Made by the Dwarves, this lantern provides light in the
 D:darkest recesses of the earth.
@@ -4396,7 +4721,9 @@ I:39:2:0
 W:5:0:50:2500
 A:5/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE1
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE1
 f:LITE1
 D:This enchanted torch never needs to be fuelled.
 
@@ -4427,7 +4754,9 @@ I:39:4:0
 W:25:0:50:15000
 A:25/3
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE3
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE3
 f:LITE3
 D:Made by the descendants of the Noldo craftsman, this lamp
 D:contains a part of the flame which burned inside Feanor.
@@ -4458,7 +4787,8 @@ I:24:1:0
 W:10:0:60:120
 A:10/2
 P:0:1d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a larger version of a throwing axe. It has a single
 D:blade with a pick on the reverse, designed for armour piercing.
@@ -4537,7 +4867,8 @@ I:23:26:0
 W:40:0:230:600
 A:40/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A large, two-handed sword with a blade that weaves
 D:left and right until it reaches the hilt.
@@ -4548,7 +4879,8 @@ I:23:23:0
 W:40:0:200:600
 A:40/2
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Also known as a Claidhmore, or Greatsword, this weapon is favoured
 D:by powerful mercenaries. The blade is large, straight, and broad,
@@ -4560,7 +4892,8 @@ I:23:24:0
 W:40:0:200:600
 A:40/3
 P:0:2d9:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the strictly two-handed version of the bastard sword.
 D:The blade is of medium length, double-edged, and considerably
@@ -4572,39 +4905,21 @@ I:23:22:0
 W:40:0:240:500
 A:40/3
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a larger version of the curved oriental blade.
 D:Runes of war decorate its golden hilt.
 
 
-### Trapping Kits
-
-N:549:Arrow
-G:`:r
-I:46:2:0
-W:10:0:60:150
-A:10/2:50/2
-F:SHOW_MODS
-D:It must be loaded with arrows, which will be
-D:fired at the monster who triggers the trap.
-
-N:550:Bolt
-G:`:o
-I:46:3:0
-W:20:0:220:300
-A:20/2:50/2
-F:SHOW_MODS
-D:It must be loaded with crossbow bolts, which will
-D:be fired at the monster who triggers the trap.
-
 N:551:& Fauchard~
 G:/:s
 I:22:6:0
 W:18:0:155:301
 A:18/2
 P:0:1d10:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It is a type of glaive with two ornate hooks on the back
 D:of the blade. It is typically 8 to 9 feet long.
@@ -4615,7 +4930,8 @@ I:22:16:0
 W:21:0:165:320
 A:21/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Mounted on a long shaft for maximum reach, this weapon is
 D:effective at repelling both cavalry and infantry.
@@ -4626,7 +4942,8 @@ I:22:29:0
 W:43:0:400:700
 A:43/2
 P:0:4d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a shock weapon. Its purpose is to unhorse a rider
 D:in single combat, or smash through the armour of opposing lines.
@@ -4642,17 +4959,6 @@ D:This is a two-edged dagger with a long blade. A favourite among travellers
 D:and warriors alike, because it can be worn comfortably with plain clothes
 D:as well as armour.
 
-### Trapping Kits
-
-N:555:Catapult
-G:`:R
-I:46:1:0
-W:1:0:50:40
-A:1/2:20/2
-F:SHOW_MODS
-D:It must be loaded with sling bullets, which will
-D:be fired at the monster who triggers the trap.
-
 N:556:& Ring Mail~
 G:[:s
 I:37:2:0
@@ -4691,16 +4997,6 @@ P:4:1d1:0:0:0
 D:Heavy, multi-layered cloth sewn together to cover the body,
 D:with extra padding between layers.
 
-### Trapping Kits
-
-N:560:Fumes
-G:`:G
-I:46:4:0
-W:2:0:20:50
-A:2/2:30/2
-D:It must be loaded with potions, which will splatter
-D:over the monster who triggers the trap.
-
 N:561:& Golden Ring Mail~
 G:(:y
 I:36:15:0
@@ -4710,26 +5006,6 @@ P:8:1d4:-1:0:0
 D:A suit of non-overlapping thin golden rings sewn onto a soft leather
 D:backing. It looks beautiful, and is worn on special occasions.
 
-### Trapping Kits
-
-N:562:Magic
-G:`:g
-I:46:5:0
-W:5:0:20:50
-A:5/2:40/2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-D:It must be loaded with scrolls, which will release
-D:their spells at the monster who triggers the trap.
-
-N:563:Device
-G:`:v
-I:46:6:0
-W:20:0:20:50
-A:20/2:40/2:60/2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-D:It must be loaded with a magic device (wand, staff, or rod), which
-D:will fire its spell at the monster who triggers the trap.
-
 # XXX
 # XXX
 # XXX
@@ -4752,7 +5028,8 @@ W:70:0:4:10000
 A:70/16
 P:0:1d1:0:0:0
 T:71:2
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:This magical potion contains a small part of the power of
 D:Eru Iluvatar on Middle-Earth.
 
@@ -4768,7 +5045,8 @@ I:6:1:0
 W:5:0:12:300
 A:5/1:20/1:50/1:80/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It looks like a simple walking stick, plain and nondescript.
 D:In the hands of a spellcaster, it can be a deadly weapon.
@@ -4782,8 +5060,10 @@ W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
 a:BA_ELEC_4
-F:RES_ELEC | ACTIVATE
-f:RES_ELEC | IGNORE_ELEC
+F:ACTIVATE
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 D:This sparkling circlet grants you protection, makes electricity less
 D:dangerous and even allows you to call forth a ball of lightning.
 
@@ -4827,8 +5107,9 @@ G:=:d
 I:45:53:4
 W:50:0:2:10000
 A:50/1
-F:INVIS | HIDE_TYPE
-f:INVIS |
+F:HIDE_TYPE
+F:INVIS
+f:INVIS
 D:This magical bauble will hide you from sight.
 
 # XXX
@@ -4982,7 +5263,8 @@ I:72:1:0
 W:5:0:4:100
 A:1/3:5/1:10/1
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This concoction can transform your body for a short period of time.
 
 ### New Parchments for Theme - monster and artifact spoilers
@@ -5174,7 +5456,8 @@ I:36:16:0
 W:5:0:60:400
 A:25/1
 P:9:1d1:0:0:0
-F:RES_FIRE | RES_COLD |
+F:RES_COLD
+F:RES_FIRE
 D:This coat is made from the down of Manwe's Great Eagles, 
 D:gathered painstakingly from nests. It is magical, protecting  
 D:the wearer from extremes of temperatures.
@@ -5184,7 +5467,8 @@ N:647:& Key~
 G:~:g
 I:39:106:0
 W:15:0:15:20000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # Here are the boomerangs
 
@@ -5312,7 +5596,9 @@ G:~:o
 I:102:0:0
 W:1:0:50:0
 A:1/1:10/1:20/1:30/1
-F:INSTA_ART | ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:INSTA_ART
 
 N:663:Craftsmanship
 G:?:d
@@ -5341,7 +5627,9 @@ I:14:60:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CON | ACTIVATE | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:WIELD_CAST
 D:A simple wind instrument made from brass. If used by inexperienced musicians it sounds
 D:like somebody making "prbbt!" noises down a drainpipe.
 
@@ -5351,7 +5639,8 @@ I:14:58:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:STR | WIELD_CAST
+F:STR
+F:WIELD_CAST
 D:A sort of clay pot with a bit of skin stretched over its mouth.
 
 N:671:& Harp~
@@ -5360,7 +5649,8 @@ I:14:59:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CHR | WIELD_CAST
+F:CHR
+F:WIELD_CAST
 D:A number of strings held by a wooden frame.
 
 # XXX
@@ -5383,7 +5673,8 @@ I:10:1:0
 W:5:0:30:100
 A:5/1:15/1:25/1:35/1
 P:0:1d1:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
 
 ### Two more scrolls ###
 
@@ -5403,182 +5694,6 @@ A:30/1:45/1:55/1
 D:This scroll is inscribed with a ritual which allows you to discern what fate holds in store for
 D:you.
 
-### Here comes the Runes ###
-
-N:679:Self
-G:?:b
-I:105:0:0
-W:3:5:2:40
-A:3/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying the caster.
-
-N:680:Ray
-G:?:b
-I:105:2:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | EASY_KNOW
-D:A rune signifying a beam or ray.
-
-N:681:Sphere
-G:?:b
-I:105:3:0
-W:15:5:2:1000
-A:15/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying a ball or sphere.
-
-N:682:Knowledge
-G:?:b
-I:104:91:0
-W:6:5:2:200
-A:6/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying knowledge.
-
-N:683:Life
-G:?:D
-I:104:53:0
-W:3:5:2:200
-A:3/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying life.
-
-N:684:Fire
-G:?:r
-I:104:5:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_FIRE | EASY_KNOW
-D:A rune signifying flame.
-
-N:685:Cold
-G:?:b
-I:104:4:0
-W:12:5:2:300
-A:12/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | EASY_KNOW
-D:A rune signifying cold.
-
-N:686:Lightning
-G:?:W
-I:104:1:0
-W:13:5:2:300
-A:13/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying a lightning beam.
-
-N:687:Acid
-G:?:B
-I:104:3:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying acid.
-
-N:688:Element
-G:?:g
-I:104:10:0
-W:23:5:2:1000
-A:23/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying an element.
-
-N:689:Chaos
-G:?:v
-I:104:30:0
-W:26:5:2:2000
-A:26/1
-P:0:1d1:0:0:0
-F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying raw chaos.
-
-N:690:Mind
-G:?:D
-I:104:85:0
-W:19:5:2:3000
-A:19/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying the mind.
-
-N:691:Holding
-G:?:B
-I:104:75:0
-W:5:5:2:500
-A:5/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying the action of holding, or sleep.
-
-N:692:Arrow
-G:?:b
-I:105:1:0
-W:6:5:2:100
-A:6/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying an arrow.
-
-N:693:Power Surge
-G:?:b
-I:105:4:0
-W:50:5:2:5000
-A:50/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID | EASY_KNOW
-D:A rune signifying a powerful surge.
-
-N:694:Armageddon
-G:?:b
-I:105:5:0
-W:30:5:2:4000
-A:30/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID | EASY_KNOW
-D:A rune signifying a powerful blast.
-
-N:695:Gravity
-G:?:G
-I:104:35:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying the forces of gravity.
-
-# XXX
-
-N:697:Undeath
-G:?:G
-I:104:92:0
-W:35:5:2:1000
-A:35/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying undeath.
-
-N:698:Protection
-G:?:G
-I:104:74:0
-W:45:5:2:1500
-A:45/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying protection.
-
 # XXX
 
 # The Ring of Precognition (now a k_info.txt artifact)
@@ -5588,10 +5703,14 @@ I:45:51:0
 W:90:0:2:300000
 A:90/100
 T:45:23
-F:PRECOGNITION |
-f:PRECOGNITION |
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:PRECOGNITION
+f:PRECOGNITION
 D:This magical ring allows you to know what you will encounter in the near future.
 
 # Athelas, cures Black Breath
@@ -5631,8 +5750,12 @@ I:70:40:0
 W:90:0:5:160000
 A:90/140
 T:70:51
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:It allows you to leave your body to reincarnate into
 D:another one. However, your current body is lost in the process.
 
@@ -5642,7 +5765,8 @@ I:23:33:0
 W:25:0:70:500
 A:25/1:80/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:SHOW_MODS
 f:ANTIMAGIC_50
 D:A strange, very sharp long sword, which seems to drain light from its surroundings. As you
 D:wield it, you feel much less attuned to magic.
@@ -5784,8 +5908,9 @@ G:=:d
 I:45:54:0
 W:20:0:2:16000
 A:20/3
-F:FLY | EASY_KNOW
-f:FLY |
+F:EASY_KNOW
+F:FLY
+f:FLY
 D:This ring is imbued with the power of eagles. It grants you the power of flight.
 
 N:756:& Tome~ of the Time
@@ -5794,7 +5919,8 @@ I:111:8:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome seems to have trouble deciding whether it really exists now. Its flickering pages
 D:contain all that is known about the currents of time.
 
@@ -5812,7 +5938,10 @@ I:111:9:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:This tome gives you deeper insights on the works of magic.
 
 N:759:& Tome~ of the Mind
@@ -5821,7 +5950,8 @@ I:111:10:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome has no pages; knowledge is transferred to you if you simply
 D:hold it.
 
@@ -5831,7 +5961,8 @@ I:111:20:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This dusty tome is filled with ancient rituals,
 D:designed to uncover all that is hidden.
 
@@ -5841,7 +5972,8 @@ I:111:21:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A large jewel-encrusted tome that transfers
 D:wisdom and understanding to its bearer.
 
@@ -5851,7 +5983,8 @@ I:111:22:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome fills you with glorious visions of total devastation.
 D:Anyone in your way shall be destroyed.
 
@@ -5861,7 +5994,9 @@ I:111:11:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
 D:This singed book smells like burned flesh.  Its power is as evident
 D:as its thirst for your blood.
 
@@ -5871,7 +6006,8 @@ I:111:23:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A black and scarlet flame springs from this tome, issuing
 D:a thunderous roar, and you hear the screams of tormented souls.
 
@@ -5881,7 +6017,8 @@ I:111:63:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The sleek black cover of this tome is covered with intricate
 D:carved decorations, inset with rubies that sparkle like fire.
 
@@ -5891,7 +6028,8 @@ I:111:64:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome's cover and pages radiate a soft white light.
 
 N:767:& Ocean Tome~ of Ulmo
@@ -5900,7 +6038,8 @@ I:111:65:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book smells faintly of seaweed and appears to be wet.
 
 N:768:& Forest Tome~ of Yavanna
@@ -5909,7 +6048,8 @@ I:111:24:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome reminds you of tree bark.
 D:You feel the smell of grass and flowers as you read it.
 
@@ -5921,8 +6061,15 @@ I:111:61:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI | SPECIAL_GENE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | NORM_ART
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:SPECIAL_GENE
 D:This book has some of your favourite spells inside.
 
 # The Ring of Phasing -- see artifact list
@@ -5932,7 +6079,8 @@ G:=:d
 I:45:55:0
 W:110:0:2:300000
 A:110/5
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 N:771:& Holy Tome~ of Mandos
 G:?:w
@@ -5940,7 +6088,8 @@ I:111:66:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:Just holding this tome makes you fill with quiet strength.
 
 # XXX #
@@ -5957,8 +6106,12 @@ W:90:0:15:150000
 A:100/14
 P:0:1d1:0:0:0
 T:66:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This rod creates a little hatch, allowing access to your home no matter how far away it is.
 
 # Additional swords
@@ -5968,7 +6121,9 @@ I:23:32:1
 W:50:900:45:2000
 A:48/4:60/2:80/1
 P:0:4d4:-2:2:0
-F:IGNORE_ACID | RES_DARK | STEALTH
+F:IGNORE_ACID
+F:RES_DARK
+F:STEALTH
 f:STEALTH
 D:A thin long sword made of a completely black metal, which reflects no light.
 
@@ -5978,7 +6133,8 @@ I:23:31:0
 W:60:1800:50:6000
 A:60/20
 P:0:1d6:4:0:0
-F:SHOW_MODS | VORPAL
+F:SHOW_MODS
+F:VORPAL
 D:A small sword made of a blueish metal with a strangely rough surface. As anything is hurt
 D:with it, the weapon will stick inside the wound and cause horrible wounds when torn away.
 
@@ -5989,7 +6145,9 @@ I:40:17:0
 W:25:0:3:10000
 A:25/1
 a:BA_POIS_4
-F:RES_POIS | DEX | ACTIVATE
+F:ACTIVATE
+F:DEX
+F:RES_POIS
 D:A petrified serpent's tongue, hung on a thin chain to be clasped around your neck. It makes you
 D:like a snake, able to wriggle out of tight corners, impervious to poisons and poisonous
 D:yourself.
@@ -6008,9 +6166,14 @@ G:=:d
 I:45:5:0
 W:100:0:2:1
 A:100/100
-F:INVIS | DRAIN_EXP | CURSED | HEAVY_CURSE | CURSE_NO_DROP
+F:CURSED
+F:CURSE_NO_DROP
+F:DRAIN_EXP
+F:FULL_NAME
+F:HEAVY_CURSE
+F:INVIS
+F:SPECIAL_GENE
 f:INVIS
-F:SPECIAL_GENE | FULL_NAME
 
 # To help people climb mountains...
 
@@ -6039,7 +6202,9 @@ I:115:55:0
 W:10:0:150:500
 A:10/1
 P:0:4d6:0:0:0
-F:SHOW_MODS | SLAY_DEMON | WIELD_CAST
+F:SHOW_MODS
+F:SLAY_DEMON
+F:WIELD_CAST
 D:This blade has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, helping
 D:you slay other demons.
@@ -6050,7 +6215,8 @@ I:115:56:0
 W:15:0:70:500
 A:15/1
 P:5:1d1:0:0:0
-F:REGEN | WIELD_CAST
+F:REGEN
+F:WIELD_CAST
 D:This shield has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, giving
 D:life to any that wield it.
@@ -6061,7 +6227,8 @@ I:115:57:0
 W:20:0:30:500
 A:20/1
 P:2:1d1:0:0:0
-F:LITE2 | WIELD_CAST
+F:LITE2
+F:WIELD_CAST
 D:This horn is about six feet long, and originates from a demon.
 D:Some demonic energy is still coursing through it.
 
@@ -6136,7 +6303,10 @@ W:70:0:15:2000
 A:70/30
 P:0:1d1:0:0:0
 F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This is the rarest and most powerful kind of rod there is. Its material was once used
 D:to chain Melkor Bauglir in the Halls of Mandos, and only Aule knows the secret of its
 D:making. Treasure this rod greatly.
@@ -6155,8 +6325,12 @@ I:70:43:0
 W:55:0:5:0
 A:55/1
 T:70:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This magical scroll sends a call to the halls of Mandos, issuing forth all those who have been
 D:slain by the reader.
 
@@ -6186,20 +6360,11 @@ I:24:30:0
 W:70:0:300:6000
 A:70/8
 P:0:5d7:0:0:0
-F:SLAY_ANIMAL | SHOW_MODS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A huge axe, the sort used for slaughtering animals, this weapon is unusually deadly against
 D:natural creatures.
 
-N:806:& Runestone~
-G:?:v
-I:105:255:0
-W:10:5:2:300
-A:10/3:20/2:30/1:60/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
-D:A small oval stone. One surface is flat, as if something ought to be scratched or inscribed into
-D:it.
-
 N:807:& Fortune cookie~
 G:,:U
 I:80:42:500
@@ -6226,7 +6391,12 @@ W:10:10:10:3200
 A:10/200
 P:0:10d10:0:0:0
 T:65:6
-F:RECHARGE | SPECIAL_GENE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:The miner's friend.  This wand was used by Thrain to dig into the
 D:walls of the dungeon.  Its indestructible nature makes it quite useful.
 
@@ -6238,7 +6408,11 @@ W:50:10:10:12000
 P:0:10d4:0:0:0
 A:50/200
 T:55:8
-F:RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
 D:Mithrandir's staff that throws powerful fire attacks at all enemies.  It
 D:can be recharged without blowing up, for it is built to hold
 D:much magical energy.
@@ -6272,7 +6446,11 @@ I:11:7:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Eru. The relic now lies in pieces, hidden
 D:from all but but his most dedicated followers.
@@ -6283,7 +6461,11 @@ I:11:8:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Manwe. The relic now lies in pieces, hidden
 D:from all but his most dedicated followers.
@@ -6294,7 +6476,11 @@ I:11:9:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to worshippers of Tulkas. The relic now lies in pieces,
 D:hidden from all but his most dedicated followers.
@@ -6305,7 +6491,11 @@ I:11:10:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Dark Priests. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Melkor.
@@ -6316,7 +6506,11 @@ I:11:11:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Druids. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Yavanna.
@@ -6338,8 +6532,12 @@ I:11:16:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Stonewrights. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Aule.
@@ -6350,8 +6548,12 @@ I:11:17:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Varda. The relic now lies in pieces, 
 D:hidden from all but the most faithful followers of Varda.
@@ -6362,8 +6564,12 @@ I:11:18:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Ulmo. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Ulmo.
@@ -6374,8 +6580,12 @@ I:11:19:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Mandos. The relic now lies in pieces, 
 D:hidden from all but the most faithful followers of Mandos.
@@ -6423,8 +6633,12 @@ G:":d
 I:40:3:3
 W:70:12:3:55000
 A:70/12
-F:BLOWS | STR | DEX
-F:AGGRAVATE | DRAIN_MANA | DRAIN_EXP
+F:AGGRAVATE
+F:BLOWS
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:STR
 D:This rare amulet will magically improve your fighting prowess 
 D:greatly, but this improvement comes at a cost. Nothing can 
 D:ignore the challenge this amulet magically issues when worn.
@@ -6434,7 +6648,10 @@ G:":d
 I:40:16:1
 W:70:12:3:100000
 A:70/12
-F:LIFE | SUST_CON | HOLD_LIFE | DRAIN_MANA
+F:DRAIN_MANA
+F:HOLD_LIFE
+F:LIFE
+F:SUST_CON
 D:This rare amulet will magically increase your life force and 
 D:even prevent it from being sapped. However, wearing this 
 D:amulet makes you feel less adept at using magic.
@@ -6447,8 +6664,16 @@ G:=:d
 I:45:10:2
 W:100:0:2:125000
 A:100/10
-F:MANA | SPELL | SPELL_CONTAIN | WIELD_CAST | HIDE_TYPE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SPELL |
+F:HIDE_TYPE
+F:MANA
+F:SPELL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SPELL
 D:This powerful ring not only stores a chosen spell (which must be 
 D:engraved by 'copying' it); it also improves the power of cast spells 
 D:and augments the wearer's magical reserves.
@@ -6458,11 +6683,19 @@ G:=:d
 I:45:11:2
 W:100:0:2:125000
 A:100/10
-F:SUST_STR | SUST_DEX | SUST_CON | REGEN |
-F:HOLD_LIFE | LIFE |
-F:HIDE_TYPE | ACTIVATE |
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LIFE
+F:REGEN
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 a:CURE_HUNGER
-f:SUST_STR | SUST_DEX | SUST_CON | REGEN |
+f:REGEN
+f:SUST_CON
+f:SUST_DEX
+f:SUST_STR
 D:This valuable ring enhances and protects the wearer's life force in every way.
 
 N:842:Clear Thought
@@ -6470,14 +6703,29 @@ G:=:d
 I:45:12:0
 W:100:0:2:125000
 A:100/10
-F:SUST_INT | SUST_WIS | RES_FEAR | RES_CONF |
-F:ACTIVATE | EASY_KNOW |
+F:ACTIVATE
+F:EASY_KNOW
+F:RES_CONF
+F:RES_FEAR
+F:SUST_INT
+F:SUST_WIS
 a:CURE_INSANITY
-f:SUST_INT | SUST_WIS |
+f:SUST_INT
+f:SUST_WIS
 D:This valuable ring protects the wearer's intellect and intuition, as well as   
 D:guarding him from most mental attacks.  From time to time, the wearer can 
 D:even purge himself of insanity.
 
+N:843:Unmagic
+G:=:d
+I:45:10:2
+W:50:0:2:3000
+A:50/1
+F:ANTIMAGIC_50
+f:ANTIMAGIC_50
+D:This valuable ring projects an aura of anti-magic around its wearer.
+
+
 ### New scroll ###
 N:846:Sterilise
 G:?:d
@@ -6585,7 +6833,8 @@ I:24:3:0
 W:8:0:35:100
 P:0:1d6:0:0:0
 A:8/1:15/1
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A throwing-length axe with a "beard", an increased depth at the lower
 D:end of the blade. Surprisingly light and durable, it doubles as a
@@ -6597,7 +6846,8 @@ I:24:4:0
 W:25:0:200:450
 P:0:3d6:0:0:0
 A:25/1:40/1
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A mighty axe with two moon-shaped blades on each side of the headpiece,
 D:the immense weight leads to slow but powerful swings.
@@ -6618,7 +6868,8 @@ I:24:7:0
 W:22:0:150:420
 A:22/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large axe with an elongated moon shaped blade. Strikes a good balance
 D:between swinging power and speed.
@@ -6673,7 +6924,7 @@ N:867:Map
 G:?:U
 I:8:33:0
 W:70:100:30:50000
-F:INSTA_ART |
+F:INSTA_ART
 D:At first glance, this looks like another crumpled piece of paper. 
 D:As you smooth out the parchment, you see the faint outline of a 
 D:map... You have a feeling you might find use for this map one day.
@@ -6683,7 +6934,7 @@ N:868:& Key~
 G:-:W
 I:11:13:0
 W:70:100:5:50000
-F:INSTA_ART | 
+F:INSTA_ART
 D:As you clear away some mud from this item, you notice that it is 
 D:actually a small silver key. You wonder what it opens. Perhaps 
 D:you should hang on to this key, you might find it useful later.
@@ -6694,7 +6945,7 @@ N:869:& Cup~
 G:+:y
 I:11:14:0
 W:70:100:50:100000
-F:INSTA_ART | 
+F:INSTA_ART
 D:It looks like a lump of clay, and as you prepare to throw it 
 D:away, a piece breaks off, and you see a faint gleam of gold. 
 D:Taking off the rest of the caked-on mud, you see that it is 
@@ -6737,14 +6988,15 @@ N:874:& Amulet~
 G:":B
 I:40:29:5
 W:10:2:2:10000
-F:INSTA_ART 
+F:INSTA_ART
 
 # The Black Banner of Gondor - see artifact list
 N:875:& Black Banner~
 G:~:D
 I:39:108:0
 W:60:30:50:50000
-F:LITE1 | INSTA_ART
+F:INSTA_ART
+F:LITE1
 D:A strange banner of black thread rolled up as though it were a scroll.
 
 # The Pearl 'Nimphelos' - see artifact list
@@ -6753,7 +7005,9 @@ G:~:w
 I:39:109:1
 W:20:10:10:40000
 P:0:1d1:0:0:0
-F:LITE3 | INSTA_ART | FULL_NAME
+F:FULL_NAME
+F:INSTA_ART
+F:LITE3
 D:A beautiful shining pearl, about the size of a dove's egg.
 
 # The Silmaril of Flames - see artifact list
@@ -6762,7 +7016,10 @@ G:*:R
 I:39:110:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:LITE2 | LITE3 | INSTA_ART | FULL_NAME
+F:FULL_NAME
+F:INSTA_ART
+F:LITE2
+F:LITE3
 D:A dazzling, mesmerizingly beautiful jewel, shining in pure white 
 D:light with a slight tinge of red. It hurts your eyes to look at it, 
 D:yet you cannot bear to turn away from it, either.
@@ -6773,7 +7030,9 @@ G:*:B
 I:39:111:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:LITE2 | LITE3 | INSTA_ART
+F:INSTA_ART
+F:LITE2
+F:LITE3
 D:A dazzling, mesmerizingly beautiful jewel, shining in pure white 
 D:light with a slight tinge of blue. It hurts your eyes to look at it, 
 D:yet you cannot bear to turn away from it, either.
@@ -6802,8 +7061,9 @@ I:17:3:0
 W:5:7:1:3
 P:0:2d6:0:0:0
 A:5/7:20/7:50/7
+F:ESP_ANIMAL
 F:SHOW_MODS
-F:SLAY_ANIMAL | ESP_ANIMAL
+F:SLAY_ANIMAL
 D:A sharpened metal head on a piece of wood, fitted with decorative 
 D:green feathers. You can use it for 'f'iring a bow.
 
@@ -6840,7 +7100,8 @@ I:15:3:0
 W:25:0:40:300
 A:25/1:35:/2
 P:0:2d5:0:0:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:A small curved piece of wood with mithril blades on the "forward" edges.
 
 N:885:& Mithril Boomerang~
@@ -6849,7 +7110,8 @@ I:15:4:0
 W:35:5:40:1000
 A:35/1:50/2
 P:0:5d6:0:0:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:A curved leaf-shaped piece of wood, its "forward" edges enhanced with mithril blades.
 
 # N: serial number : & object name~
@@ -6858,4 +7120,4 @@ D:A curved leaf-shaped piece of wood, its "forward" edges enhanced with mithril
 # W: depth : rarity : weight : cost
 # P: base armor class : base damage : plus to-hit : plus to-dam : plus to-ac
 # A: depth/rarity : depth/rarity : etc
-# F: flag | flag | etc
\ No newline at end of file
+# F: flag | flag | etc
diff --git a/lib/mods/theme/edit/maeglin.map b/lib/mods/theme/edit/maeglin.map
index e3be9972..7916fd9b 100644
--- a/lib/mods/theme/edit/maeglin.map
+++ b/lib/mods/theme/edit/maeglin.map
@@ -11,7 +11,7 @@ F:X:63:3
 F:<:172:3
 
 # up stairs with maeglin
-F:{:6:3:825:0:0:0:0:0:0:2
+F:{:6:3:825:0:0:0:0:0:2
 
 # Floor with dirt
 F:.:88:5
@@ -56,7 +56,7 @@ F:R:88:5:644
 F:O:88:5:645
 
 # Floor with dirt with a Lesser Balrog
-F:U:88:5:996:0:0:0:0:0:0:2
+F:U:88:5:996:0:0:0:0:0:2
 
 # Granite wall
 F:#:56:5
diff --git a/lib/mods/theme/edit/misc.txt b/lib/mods/theme/edit/misc.txt
index 98375869..07261ba3 100644
--- a/lib/mods/theme/edit/misc.txt
+++ b/lib/mods/theme/edit/misc.txt
@@ -12,77 +12,8 @@ M:X:101
 # Maximum y size of the wilderness
 M:Y:66
 
-# Maximum number of randart parts in ra_info.txt
-M:Z:519
-
-# Maximum number of monsters in r_info.txt
-# WARNING ! add one more to the real count for the player ghost !!
-M:R:1081
-
-# Maximum number of monsters in re_info.txt
-# WARNING ! Use the exact amount of ego types used, if not you
-# will get weird results !
-M:r:14
-
-# Maximum number of items in k_info.txt
-M:K:886
-
-# Maximum number of vaults in v_info.txt
-M:V:108
-
-# Maximum number of terrain features in f_info.txt
-M:F:249
-
-# Maximum number of artifacts in a_info.txt
-M:A:257
-
-# Maximum number of sets types in set_info.txt
-M:s:17
-
-# Maximum number of ego-items in e_info.txt
-M:E:238
-
-# Maximum number of dungeon types in d_info.txt
-M:D:41
-
-# Maximum number of trap types in tr_info.txt
-M:U:176
-
-# Maximum number of terrain types in wf_info.txt
-M:W:64
-
-# Maximum number of owners types in ow_info.txt
-M:N:215
-
-# Maximum number of building actions in ba_info.txt
-M:B:70
-
-# Maximum number of store types in st_info.txt
-M:S:89
-
 # Maximum size for "o_list[]"
 M:O:1024
 
 # Maximum size for "m_list[]"
 M:M:768
-
-# Maximum number of race types in p_info.txt
-M:P:R:24
-
-# Maximum number of subrace types in p_info.txt
-M:P:S:26
-
-# Maximum number of class types in p_info.txt
-M:P:C:50
-
-# Maximum number of meta class types in p_info.txt
-M:P:M:1
-
-# Maximum number of histories types in p_info.txt
-M:P:H:294
-
-# Maximum number of skills in s_info.txt
-M:k:60
-
-# Maximum number of traits in ab_info.txt
-M:b:50
diff --git a/lib/mods/theme/edit/nirnaeth.map b/lib/mods/theme/edit/nirnaeth.map
index a8c06999..3ad0789c 100644
--- a/lib/mods/theme/edit/nirnaeth.map
+++ b/lib/mods/theme/edit/nirnaeth.map
@@ -14,28 +14,28 @@ F:s:88:5
 F:V:84:5
 
 # Dirt with Olog
-F:a:88:5:538:0:0:0:0:0:0:2
+F:a:88:5:538:0:0:0:0:0:2
 
 # Dirt with Cave Troll
-F:b:88:5:496:0:0:0:0:0:0:2
+F:b:88:5:496:0:0:0:0:0:2
 
 # Dirt with with Eldrak
-F:c:88:1:620:0:0:0:0:0:0:2
+F:c:88:1:620:0:0:0:0:0:2
 
 # Dirt with with Ettin
-F:e:88:1:621:0:0:0:0:0:0:2
+F:e:88:1:621:0:0:0:0:0:2
 
 # Dirt with with War troll
-F:f:88:1:631:0:0:0:0:0:0:2
+F:f:88:1:631:0:0:0:0:0:2
 
 # Dirt with with Hru
-F:g:88:1:709:0:0:0:0:0:0:2
+F:g:88:1:709:0:0:0:0:0:2
 
 # Dirt with Ulik the Troll
-F:h:88:5:729:0:0:0:0:0:0:2
+F:h:88:5:729:0:0:0:0:0:2
 
 # Dirt with Ancient green dragon
-F:i:88:5:618:0:0:0:0:0:0:2
+F:i:88:5:618:0:0:0:0:0:2
 
 # Dungeon
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/numenor.txt b/lib/mods/theme/edit/numenor.txt
index ec8621b1..0ca52738 100644
--- a/lib/mods/theme/edit/numenor.txt
+++ b/lib/mods/theme/edit/numenor.txt
@@ -1,7 +1,7 @@
 # File: numenor.txt
 
 # Way to the lost land of Numenor
-F:>:7:3:0:0:0:0:0:7
+F:>:7:3:0:0:0:0:7
 
 ############### Town Layout ###############
 
diff --git a/lib/mods/theme/edit/ow_info.txt b/lib/mods/theme/edit/ow_info.txt
index 75683581..abb4b1d9 100644
--- a/lib/mods/theme/edit/ow_info.txt
+++ b/lib/mods/theme/edit/ow_info.txt
@@ -17,242 +17,530 @@
 N:0:Bell Goodchild(Hobbit)
 I:20000:120
 C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning | Druadan | Dark-Elf
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Druadan
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The General Store - 1 ###
 
 N:1:Balin(Dwarf)
 I:25000:130
 C:150:100:50
-L:Dwarf | Petty-Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:2:Berylla Boffin(Hobbit)
 I:20000:130
 C:125:100:70
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:3:Adrahil(Half-Elf)
 I:30000:120
 C:110:100:80
-L:Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:4:Aegnor(Wood-Elf)
 I:10000:140
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Armoury - 2 ###
 
 N:5:Bifur(Dwarf)
 I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:6:Lalia Clayhanger(Hobbit)
 I:25000:130
 C:125:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:7:Alcarin(Human)
 I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dunadan
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:8:Alatariel(High-Elf)
 I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Weaponsmith - 3 ###
 
 N:9:Bofur(Dwarf)
 I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:10:Daisy Gamgee(Hobbit)
 I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:11:Beregond(Dunadan)
 I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:12:Amarie(Dark-Elf)
 I:10000:140
 C:125:100:50
-L:Dark-Elf | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll | Easterling
+L:Dark-Elf
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Temple - 4 ###
 
 N:13:Bombur(Dwarf)
 I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:14:Dora Baggins(Hobbit)
 I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:15:Bergil(Half-Elf)
 I:10000:140
 C:125:100:50
-L:Human | Half-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:16:Amdir(Wood-Elf)
 I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Alchemist - 5 ###
 
 N:17:Borin(Dwarf)
 I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:18:Elfstan Fairbairn(Hobbit)
 I:10000:140
 C:125:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:19:Cemendur(Human)
 I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:20:Annael(High-Elf)
 I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Magic Shop - 6 ###
 
 N:21:Dis(Dwarf)
 I:30000:120
 C:125:100:50
-L:Petty-Dwarf | Dwarf | Half-Elf | Dunadan
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Human | Troll | Eagle
+L:Dunadan
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Eagle
+H:Half-Ogre
+H:Human
+H:Orc
+H:Troll
 
 N:22:Folco Boffin(Hobbit)
 I:10000:140
 C:110:100:80
 L:Hobbit
-H:Dragon | Demon | Orc | Troll
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:23:Ciryon(Dunadan)
 I:25000:130
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:24:Arminas(Dark-Elf)
 I:20000:130
 C:125:100:70
-L:Human | Dark-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | High-Elf | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dark-Elf
+L:Elf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Black Market - 7 ###
 
 N:25:Dori(Dwarf)
 I:30000:150
 C:110:100:90
-L:Dwarf | Easterling
-H:Dragon | Demon | Orc 
+L:Dwarf
+L:Easterling
+H:Demon
+H:Dragon
+H:Orc
 
 N:26:Halfred Greenhand(Hobbit)
 I:30000:150
 C:110:100:90
-L:Hobbit 
-H:Dragon | Demon | Troll
+L:Hobbit
+H:Demon
+H:Dragon
+H:Troll
 
 N:27:Deorwine(Half-Elf)
 I:30000:150
 C:110:100:90
-L:Half-Elf | Easterling
-H:Dragon | Demon | Dark-Elf
+L:Easterling
+L:Half-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
 
 N:28:Artanis(Wood-Elf)
 I:30000:150
 C:110:100:90
-L:High-Elf | Elf | Easterling
-H:Dragon | Demon | Orc | Troll
+L:Easterling
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 ### The Bookstore - 9 ###
 
 N:29:Dwalin(Dwarf)
 I:20000:130
 C:125:100:70
-L:Human | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Elf | Half-Ogre | Troll
+L:Dwarf
+L:Human
+L:Petty-Dwarf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:30:Tanta Hornblower(Hobbit)
 I:10000:140
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:31:Dorlas(Human)
 I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:32:Caranthir(High-Elf)
 I:25000:130
 C:110:100:80
-L:Half-Elf | High-Elf | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Pet Shop - 0 ###
 
 N:33:Fili(Dwarf)
 I:20000:130
 C:125:100:70
-L:RohanKnight | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:34:Lalia Clayhanger(Hobbit)
 I:25000:130
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:35:Elfwine(Dunadan)
 I:10000:140
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:36:Edrahil(Dark-Elf)
 I:30000:120
 C:150:100:50
-L:Dark-Elf | Elf | Easterling
-H:Dragon | Demon | Orc | High-Elf | Half-Ogre | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Troll
 
 ### The Mayors/Kings/Rulers ###
 
@@ -260,210 +548,461 @@ H:Dragon | Demon | Orc | High-Elf | Half-Ogre | Dwarf | Troll
 N:37:Uldrik(Human)
 I:0:0
 C:0:0:0
-L:Human | RohanKnight | Dunadan | Hobbit | 
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Minas Anor
 N:38:Aragorn (Dunadan)
 I:0:0
 C:0:0:0
-L:Human | High-Elf | RohanKnight | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Khazad-Dum
 N:39:Gimli(Dwarf)
 I:0:0
 C:0:0:0
-L:RohanKnight | Dunadan | Hobbit | Elf | Dwarf 
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Hobbit
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Beorn's Halls
 N:40:Deor(Beorning)
 I:100:100
 C:110:100:90
-L:Beorning | Dwarf | Maia | Hobbit | Ent
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Beorning
+L:Dwarf
+L:Ent
+L:Hobbit
+L:Maia
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Dale
 N:41:Bard the Grim(Human)
 I:100:100
 C:110:100:90
-L:Human | Hobbit | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  
+L:Dwarf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Henneth Annun
 N:42:Halbarad(Dunadan)
 I:100:100
 C:110:100:90
-L:Human | High-Elf | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Imladris
 N:43:Elrond Half-Elven
 I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf | Dwarf | Ent
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Ent
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Helm's Deep
 N:44:Erkenbrand(RohanKnight)
 I:100:100
 C:110:100:90
-L:Human | Maia | RohanKnight | Dunadan | Hobbit | Elf | Dwarf | Ent
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Ent
+L:Hobbit
+L:Human
+L:Maia
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Thranduil's Halls
 N:45:Legolas Greenleaf(Wood-Elf)
 I:100:100
 C:110:100:90
-L:High-Elf | Dunadan | Ent | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Ent
+L:High-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Edoras
 N:46:Theoden(RohanKnight)
 I:100:100
 C:110:100:90
-L:Human | RohanKnight | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Troll  
+L:Dunadan
+L:Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Esgaroth
 N:47:The Master(Human)
 I:100:100
 C:110:100:90
-L:Human 
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll  
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Hobbiton
 N:48:Samwise Gamgee(Hobbit)
 I:100:100
 C:110:100:90
-L:Hobbit | Elf | High-Elf | Dark-Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll  
+L:Dark-Elf
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Osgiliath
 N:49:Eldacar(Human)
 I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Pelargir
 N:50:Earnil(Dunadan)
 I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Caras Galadhon owners ###
 
 N:51:Galadriel(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:52:Celeborn(High-Elf)
 I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:53:Aulendil(Elf)
 I:30000:110
 C:120:100:80
 #L:Warrior | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:54:Valceronwe(Elf)
 I:30000:110
 C:120:100:80
 #L:Mage | Thaumaturgist | Sorceror
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:55:Voronwe(Elf)
 I:30000:110
 C:120:100:80
 #L:Priest | Paladin
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:56:Celegail(Elf)
 I:30000:110
 C:120:100:80
 #L:Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### Gondolin owners ###
 
 N:57:Turgon(High-Elf)
 I:30000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:58:Pengolodh(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:59:Aerandir(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:60:Celebrimbor(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Warrior | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:61:Lomelosse(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:62:Arlindel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Harper | Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:63:Sulraen(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Mage | Sorceror
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:64:Firiel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:65:Earendur(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:66:Glorfindel(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:67:Ecthelion(High-Elf)
 I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Paladin
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Inn-Keepers (minus Gondolin) ###
 
@@ -471,97 +1010,204 @@ H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling
 N:68:Barliman Butterbur(Human)
 I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning | Easterling
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Pelargir
 N:69:Ciryatur(Dunadan)
 I:100:120
 C:110:100:80
-L:Dunadan | Human | RohanKnight
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Caras Galadhon
 N:70:Celebor(Elf)
 I:100:120
 C:110:100:80
-L:High-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Minas Anor
 N:71:Bregolas(Human)
 I:100:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Khazad-Dum
 N:72:Thror(Dwarf)
 I:100:120
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | High-Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Troll
 
 #Dale
 N:73:Troin(Dwarf)
 I:100:120
 C:110:100:80
-L:Human | Dwarf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Edoras
 N:74:Theodwyn(Shieldmaiden)
 I:100:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Esgaroth
 N:75:Garm(Human)
 I:100:120
 C:110:100:80
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Hobbiton
 N:76:Rose Cotton(Hobbit)
 I:100:120
 C:110:100:80
-L:Human | High-Elf | Hobbit
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:High-Elf
+L:Hobbit
+L:Human
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Osgiliath
 N:77:Palantir(Human)
 I:100:120
 C:110:100:80
-L:Human | High-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Soothsayers ###
 
 N:78:Ori(Dwarf)
 I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:79:Tolman Gardner(Hobbit)
 I:25000:130
 C:150:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:80:Inziladun(Human)
 I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:81:Gelmir(High-Elf)
 I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Eagles ###
 
@@ -569,103 +1215,199 @@ N:82:Palano(Eagle)
 I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | RohanKnight
+H:Demon
+H:Dragon
+H:RohanKnight
 
 N:83:Eglad(Eagle)
 I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | Hobbit
+H:Demon
+H:Dragon
+H:Hobbit
 
 N:84:Hiron(Eagle)
 I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | Dunadan
+H:Demon
+H:Dragon
+H:Dunadan
 
 N:85:Grada(Eagle)
 I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | High-Elf
+H:Demon
+H:Dragon
+H:High-Elf
 
 ### The Librarians ###
 
 N:86:Frerin(Dwarf)
 I:25000:130
 C:150:100:50
-L:Dwarf | Petty-Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:87:Malva Headstrong(Hobbit)
 I:20000:130
 C:125:100:70
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:88:Erendis(Half-Elf)
 I:30000:120
 C:110:100:80
-L:Half-Elf | High-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:89:Elemmakil(Wood-Elf)
 I:10000:140
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Casino Owners ###
 
 N:90:Fror(Dwarf)
 I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:91:Marmadas Brandybuck(Hobbit)
 I:25000:130
 C:150:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:92:Fastred(Human)
 I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:93:Elured(High-Elf)
 I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Beastmasters ###
 
 N:94:Gloin(Dwarf)
 I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:95:Milo Burrows(Hobbit)
 I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:96:Findegil(Dunadan)
 I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:97:Elurin(Dark-Elf)
 I:10000:140
 C:150:100:50
-L:Dark-Elf | Elf  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Gondor/Rohan owners ###
 
@@ -674,130 +1416,272 @@ H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
 N:98:Tarcil(Human)
 I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:99:Ulbar(Easterling)
 I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-L:Half-Elf | High-Elf | Elf  | Easterling
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:100:Brego(RohanKnight)
 I:25000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:101:Ostoher(Dunadan)
 I:20000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Tower of Magery
 
 N:102:Arveleg(Human)
 I:25000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:103:Uldar(Easterling)
 I:30000:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:104:Aldor(RohanKnight)
 I:20000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:105:Tarannon(Dunadan)
 I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Inner Temple
 
 N:106:Eradan(Human)
 I:30000:120
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:107:Ulwise(Easterling)
 I:25000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:108:Gram(RohanKnight)
 I:20000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:109:Minalcar(Dunadan)
 I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Paladins Guild
 
 N:110:Herion(Human)
 I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:111:Ulgug(Easterling)
 I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:112:Walda(RohanKnight)
 I:25000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:113:Calimehtar(Dunadan)
 I:20000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Rangers Guild
 
 N:114:Egalmoth(Human)
 I:25000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:115:Ulaf(Easterling)
 I:30000:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:116:Fengel(RohanKnight)
 I:20000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:117:Telemnar(Dunadan)
 I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### Dungeon Markets ###
 
@@ -807,25 +1691,36 @@ N:118:Ris(Dwarf)
 I:30000:150
 C:150:100:50
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:119:Malach Aradan(Human)
 I:25000:200
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:120:Indis(Half-Elf)
 I:20000:170
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:121:Rogdug(Half-Orc)
 I:10000:130
 C:125:100:80
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Haftedsmiths ###
 
@@ -833,25 +1728,36 @@ N:122:Sogur(Dwarf)
 I:20000:170
 C:125:100:80
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:123:Manwendil(Human)
 I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:124:Lenwe(Half-Elf)
 I:10000:130
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:125:Ghaz(Half-Orc)
 I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Polearmsmiths ###
 
@@ -859,25 +1765,36 @@ N:126:Tolin(Dwarf)
 I:10000:130
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:127:Narmacil(Human)
 I:25000:200
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:128:Lindir(Half-Elf)
 I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:129:Stogash(Half-Orc)
 I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Swordsmiths ###
 
@@ -885,25 +1802,36 @@ N:130:Tis(Dwarf)
 I:20000:170
 C:125:100:80
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:131:Nuneth(Human)
 I:10000:130
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:132:Mahtan(Half-Elf)
 I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:133:Rudak(Half-Orc)
 I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Rare Jewellers ###
 
@@ -911,25 +1839,36 @@ N:134:Uin(Dwarf)
 I:25000:200
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:135:Ornendil(Human)
 I:10000:130
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:136:Malgalad(Half-Elf)
 I:30000:150
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:137:Ghashuf(Half-Orc)
 I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Jewellers ###
 
@@ -937,285 +1876,433 @@ N:138:Vali(Dwarf)
 I:25000:200
 C:150:100:50
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:139:Orodreth(Human)
 I:30000:150
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:140:Theodred(Half-Elf)
 I:10000:130
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:141:Rangush(Half-Orc)
 I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Footwear Shop owners ###
 
 N:142:Nellas(Human)
 I:10000:130
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:143:Tindomiel(Half-Elf)
 I:25000:200
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:144:Ragnor(Half-Elf)
 I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:145:Idrish(Half-Orc)
 I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Rare Footwear Shop owners ###
 
 N:146:Nerwen(Human)
 I:20000:170
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:147:Ulbar (Half-Elf)
 I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:148:Pelendur(Half-Elf)
 I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:149:Budgar(Half-Orc)
 I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Dungeon Librarians ###
 
 N:150:Nom(Human)
 I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:151:Urwen (Half-Elf)
 I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:152:Rian(Half-Elf)
 I:30000:150
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:153:Mosrog(Half-Orc)
 I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Expensive Black Marketeers ###
 
 N:154:Olwe(Human)
 I:30000:200
 C:125:100:90
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:155:Valacar(Half-Elf)
 I:30000:200
 C:125:100:90
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:156:Silmarien(Half-Elf)
 I:30000:200
 C:125:100:90
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:157:Ghaz(Half-Orc)
 I:30000:200
 C:125:100:90
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Common Shop Owners ###
 
 N:158:Ioreth(Human)
 I:25000:200
 C:150:100:50
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:159:Vidugavia(Half-Elf)
 I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:160:Soronto(Half-Elf)
 I:10000:130
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:161:Nazg(Half-Orc)
 I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Dragon Hunters ###
 
 N:162:Oropher(Human)
 I:10000:130
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:163:Walda(Half-Elf)
 I:25000:200
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:164:Mithrellas(Half-Elf)
 I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:165:Urbag(Half-Orc)
 I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Speed Ring Market Owners ###
 
 N:166:Orophin(Human)
 I:20000:170
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:167:Wulf(Half-Orc)
 I:10000:130
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:168:Baguk(Half-Troll)
 I:30000:150
 C:115:100:70
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 N:169:Zikram(Half-Orc)
 I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Scribes ###
 
 N:170:Rumil(Human)
 I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:171:Saeros(Half-Elf)
 I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:172:Zartosh(Half-Orc)
 I:30000:150
 C:125:100:80
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:173:Shog(Half-Troll)
 I:20000:170
 C:150:100:50
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 ### The Potion Peddlers ###
 
 N:174:Zamin(Human)
 I:25000:200
 C:150:100:50
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:175:Algosh(Half-Orc)
 I:30000:150
 C:115:100:70
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:176:Seghash(Half-Troll)
 I:10000:130
 C:125:100:80
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 N:177:Kabbug(Half-Orc)
 I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Master Archers ###
 
 N:178:Palin(Dwarf)
 I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:179:Wilcome Cotton(Hobbit)
 I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:180:Inzilbeth(Dunadan)
 I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:181:Gildor Inglorion(Dark-Elf)
 I:10000:140
 C:150:100:50
-L:Dark-Elf | Elf  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Theme stores ###
 
@@ -1224,104 +2311,248 @@ H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
 N:182:Gror(Dwarf)
 I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:183:Saradoc Oldbuck(Hobbit)
 I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:184:Gloredhel(Half-Elf)
 I:10000:140
 C:150:100:50
-L:Human | Half-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:185:Erellont(Wood-Elf)
 I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Hunters ###
 
 N:186:Kili(Dwarf)
 I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:187:Ruby Bolger(Hobbit)
 I:10000:140
 C:150:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:188:Goldwine(Human)
 I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:189:Erestor(High-Elf)
 I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Runecrafters ###
 
 N:190:Nori(Dwarf)
 I:30000:120
 C:150:100:50
-L:Petty-Dwarf | Dwarf | Half-Elf | Dunadan
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Human | Troll | Eagle
+L:Dunadan
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Eagle
+H:Half-Ogre
+H:Human
+H:Orc
+H:Troll
 
 N:191:Camellia Sackville(Hobbit)
 I:10000:140
 C:110:100:80
-L:Hobbit  | Easterling
-H:Dragon | Demon | Orc | Troll
+L:Easterling
+L:Hobbit
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:192:Hador Lorindol(Dunadan)
 I:25000:130
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:193:Galathil(Dark-Elf)
 I:20000:130
 C:125:100:70
-L:Human | Dark-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | High-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dark-Elf
+L:Elf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Musicians ###
 
 N:194:Oin(Dwarf)
 I:20000:130
 C:125:100:70
-L:Human | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Elf | Half-Ogre | Troll  | Easterling
+L:Dwarf
+L:Human
+L:Petty-Dwarf
+H:Demon
+H:Dragon
+H:Easterling
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:195:Robin Smallburrow(Hobbit)
 I:10000:140
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll  | Easterling
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Orc
+H:Troll
 
 N:196:Hareth(Half-Elf)
 I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:197:Galdor(Wood-Elf)
 I:25000:130
 C:110:100:80
-L:Half-Elf | High-Elf | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Precious Metalsmiths ###
 
@@ -1329,82 +2560,176 @@ N:198:Gabil(Dwarf)
 I:10000:130
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:199:Isil(Human)
 I:25000:200
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:200:Grima(Half-Orc)
 I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:201:Kosh(Half-Troll)
 I:30000:150
 C:125:100:60
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 ### The Mapmakers ###
 
 N:202:Pas(Dwarf)
 I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:203:Isumbras Took(Hobbit)
 I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:204:Labadal(Half-Elf)
 I:10000:140
 C:150:100:50
-L:Human | Half-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:205:Guilin(Wood-Elf)
 I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Farmers ###
 
 N:206:Rili(Dwarf)
 I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:207:Wiseman Gamwich(Hobbit)
 I:10000:140
 C:150:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:208:Lalaith(Human)
 I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:209:Gwindor(High-Elf)
 I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Old Mage in Minas Anor ###
 
 N:210:Malbeth the Seer
 I:20000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan | High-Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
diff --git a/lib/mods/theme/edit/p_info.txt b/lib/mods/theme/edit/p_info.txt
index 89d335ab..f8a3e25e 100644
--- a/lib/mods/theme/edit/p_info.txt
+++ b/lib/mods/theme/edit/p_info.txt
@@ -29,7 +29,6 @@ G:k:+1000:+1000:Magic-Device
 # C:D:1:titles
 # C:S:str:int:wis:dex:con:chr:mana:bonus blows
 # C:K:dis:dev:sav:stl:srh:fos:thn:thb
-# C:X:dis:dev:sav:stl:srh:fos:thn:thb
 # C:P:hitdie:xp%
 # C:B:num:wgt:mul
 # C:C:(H|L):(H|L):base:pl:plus
@@ -52,7 +51,7 @@ G:k:+1000:+1000:Magic-Device
 # C:a:b:level:ability
 # C:a:O:tval:sval:xdy
 
-C:N:0:Warrior
+C:N:0:0:Warrior
 C:D:0:Simple fighters, they hack away with their trusty weapon.
 C:D:1:Rookie
 C:D:1:Soldier
@@ -65,10 +64,7 @@ C:D:1:Baron
 C:D:1:Duke
 C:D:1:Lord
 C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:5
-C:C:H:L:9000:2:40
 C:P:9:0
 C:R:30:0
 C:F:RES_FEAR
@@ -82,9 +78,7 @@ C:k:+0:+400:Axe-mastery
 C:k:+0:+400:Hafted-mastery
 C:k:+0:+400:Polearm-mastery
 C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
 C:k:+1000:+300:Magic
 C:k:+1000:+400:Spirituality
 C:k:+0:+550:Antimagic
@@ -182,8 +176,6 @@ C:a:k:=0:=0:Axe-mastery
 C:a:k:=0:=0:Hafted-mastery
 C:a:k:=0:=0:Polearm-mastery
 C:a:k:+1000:-200:Archery
-C:a:k:+1000:+900:Sneakiness
-C:a:k:+1000:+900:Disarming
 C:a:k:+1000:+400:Magic
 C:a:k:+1000:+300:Spirituality
 C:a:k:=0:=0:Antimagic
@@ -209,7 +201,7 @@ C:a:k:+0:+500:Spirituality
 C:a:k:+1000:+200:Prayer 
 C:a:k:=0:=0:Antimagic
 
-C:N:1:Mage
+C:N:1:3:Mage
 C:D:0:The basic spellcaster with lots of different skills
 C:D:1:Apprentice
 C:D:1:Trickster
@@ -222,10 +214,7 @@ C:D:1:Sorcerer
 C:D:1:Ipsissimus
 C:D:1:Archimage
 C:S:-5:3:0:1:-2:1:50:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:40:2
-C:C:L:H:240000:1:5
 C:P:0:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
@@ -243,12 +232,10 @@ C:k:+0:+700:Nature
 C:k:+0:+700:Meta
 C:k:+0:+700:Mind
 C:k:+0:+700:Necromancy
-C:k:+0:+700:Runecraft
 C:k:+0:+700:Thaumaturgy
 C:k:+1000:+550:Spirituality
 C:k:+1000:+200:Combat
 C:k:+700:+500:Weaponmastery
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
 C:b:1:Perfect casting
 C:g:All Gods
@@ -321,7 +308,6 @@ C:a:k:+0:+300:Divination
 C:a:k:+0:+300:Meta
 C:a:k:+0:+300:Mind
 C:a:k:+0:+200:Necromancy
-C:a:k:+0:+200:Runecraft
 C:a:k:+0:+200:Thaumaturgy
 C:a:O:36:2:1d1
 C:a:O:111:50:1d1
@@ -343,17 +329,6 @@ C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 C:a:b:25:Undead Form
 
-C:a:N:Runecrafter
-C:a:D:Runecrafters use the runes found in Middle-earth to create
-C:a:D:finely tuned spells for each specific situation.
-C:a:k:+1000:+50:Magic
-C:a:k:+1000:+300:Runecraft
-C:a:k:+0:-100:Weaponmastery
-C:a:O:111:50:1d1
-C:a:O:105:1:1d1
-C:a:O:104:5:1d1
-C:a:O:23:4:1d1
-
 C:a:N:Thaumaturgist
 C:a:D:Thaumaturgy spells come from within and are different for each character.
 C:a:D:Since attack is the best defence, all their spells are offensive.
@@ -371,7 +346,6 @@ C:a:k:=0:=0:Nature
 C:a:k:=0:=0:Meta
 C:a:k:=0:=0:Mind
 C:a:k:=0:=0:Necromancy
-C:a:k:=0:=0:Runecraft
 C:a:k:+1000:+300:Thaumaturgy
 C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-150:Magic-Device
@@ -393,7 +367,6 @@ C:a:k:=0:=0:Nature
 C:a:k:=0:=0:Temporal 
 C:a:k:=0:=0:Meta 
 C:a:k:=0:=0:Necromancy 
-C:a:k:=0:=0:Runecraft 
 C:a:k:=0:=0:Thaumaturgy 
 C:a:k:+1000:+300:Divination
 C:a:k:+1000:+300:Mind
@@ -403,7 +376,7 @@ C:a:k:+1000:+700:Mindcraft
 C:a:O:111:50:1d1
 C:a:O:21:3:1d1
 
-C:N:2:Archer
+C:N:2:1:Archer
 C:D:0:'Kill them before they see you' could be the motto of the archer class.
 C:D:0:As deadly with a bow as a warrior is with a sword.
 C:D:1:Rock Thrower
@@ -417,10 +390,7 @@ C:D:1:Archer
 C:D:1:Archer
 C:D:1:Great Archer
 C:S:2:1:0:2:1:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:4
-C:C:H:L:9000:2:40
 C:P:4:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+800:Combat
@@ -431,9 +401,7 @@ C:k:+0:+300:Crossbow-mastery
 C:k:+0:+300:Sling-mastery
 C:k:+0:+300:Boomerang-mastery
 C:k:+0:%150:Boulder-throwing
-C:k:+1000:+900:Sneakiness
 C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
 C:k:+1000:+300:Magic
 C:k:+0:+100:Magic-Device
 C:k:+1000:+400:Spirituality
@@ -461,8 +429,6 @@ C:a:k:+0:+200:Weaponmastery
 C:a:k:+0:+400:Magic
 C:a:k:+0:+500:Nature
 C:a:k:+0:+500:Divination
-C:a:k:+0:+700:Disarming
-C:a:k:+0:+50:Sneakiness
 C:a:k:+0:+200:Monster-lore
 C:a:k:+0:+300:Summoning
 C:a:O:19:12:1d1
@@ -477,15 +443,12 @@ C:a:g:Varda Elentari
 C:a:g:Aule the Smith
 C:a:g:Ulmo
 C:a:g:Mandos
-C:a:b:1:Trapping
 
 C:a:N:Sniper
 C:a:D:Snipers are very stealthy archers without much hand-to-hand combat 
 C:a:D:ability, but with a penchant to disappear when it suits them.
 C:a:k:+0:-300:Combat
-C:a:k:+1000:+100:Sneakiness
 C:a:k:+1000:+700:Stealth 
-C:a:k:+0:+100:Disarming
 C:a:k:+1000:+700:Backstab
 C:a:k:+0:+300:Magic
 C:a:k:+1000:+500:Conveyance
@@ -493,9 +456,9 @@ C:a:O:19:12:1d1
 C:a:O:17:1:10d3
 C:a:g:All Gods
 
-C:N:3:Rogue
+C:N:3:2:Rogue
 C:D:0:Rogues are masters of tricks. They can steal from shops and monsters,
-C:D:0:and lure monsters into deadly monster traps.
+C:D:0:and excel at stealthily exploring the dungeon.
 C:D:1:Cutpurse
 C:D:1:Robber
 C:D:1:Burglar
@@ -507,10 +470,7 @@ C:D:1:Master Thief
 C:D:1:Assassin
 C:D:1:Guildmaster
 C:S:2:1:-2:3:1:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:H:20000:2:40
 C:P:6:25
 C:O:23:4:1d1
 C:G:EASE_STEAL
@@ -557,9 +517,7 @@ C:k:+0:+500:Conveyance
 C:k:+0:+500:Divination
 C:k:+0:+500:Temporal
 C:k:+1000:+700:Spirituality
-C:k:+1000:+2000:Sneakiness
 C:k:+1000:+1500:Stealth
-C:k:+1000:+2000:Disarming
 C:k:+1000:+1000:Backstab
 C:k:+1000:+2000:Stealing
 C:k:+1000:+2000:Dodging
@@ -569,7 +527,6 @@ C:b:10:Extra Max Blow(1)
 C:a:N:Rogue
 C:a:D:Rogues are masters of tricks. They can steal from shops and monsters,
 C:a:D:and lure monsters into deadly monster traps.
-C:a:b:1:Trapping
 C:a:O:46:1:1d1
 
 C:a:N:Assassin
@@ -584,7 +541,6 @@ C:a:k:+0:-400:Conveyance
 C:a:k:+0:-400:Divination
 C:a:k:+0:-300:Temporal
 C:a:k:+0:+500:Stealth
-C:a:k:+0:-1000:Disarming
 C:a:k:+0:+1000:Backstab
 C:a:k:+0:-1800:Stealing
 C:a:k:+0:-550:Magic-Device
@@ -602,7 +558,7 @@ C:a:b:15:Extra Max Blow(2)
 C:a:O:23:7:1d1
 C:a:O:35:1:1d1
 
-C:N:4:Loremaster
+C:N:4:5:Loremaster
 C:D:0:Loremasters are skilled in most combat and monster skills.
 C:D:1:Apprentice
 C:D:1:Apprentice
@@ -615,10 +571,7 @@ C:D:1:Lorekeeper
 C:D:1:Loremaster
 C:D:1:Loremaster
 C:S:1:-2:1:1:0:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:L:9000:2:40
 C:P:8:40
 C:E:0:0:0:0:0:0
 C:k:+1000:+700:Combat
@@ -626,9 +579,7 @@ C:k:+1000:+700:Weaponmastery
 C:k:+1000:+700:Archery
 C:k:+1000:+700:Barehand-combat
 C:k:+0:+600:Magic
-C:k:+1000:+700:Sneakiness
 C:k:+1000:+700:Stealth
-C:k:+1000:+700:Disarming
 C:k:+1000:+700:Spirituality
 C:k:+1000:+600:Monster-lore
 C:k:+0:+500:Possession
@@ -657,7 +608,6 @@ C:a:k:+0:-100:Combat
 C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-300:Archery
 C:a:k:-1000:-700:Barehand-combat
-C:a:k:+0:-200:Disarming
 C:a:k:+0:-200:Spirituality
 C:a:k:+1000:+300:Possession
 C:a:k:+0:+200:Corpse-preservation
@@ -676,7 +626,6 @@ C:a:k:+0:+100:Combat
 C:a:k:+0:+100:Weaponmastery
 C:a:k:+0:-100:Barehand-combat
 C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
 C:a:k:+0:+100:Stealth
 C:a:k:+0:-200:Spirituality
 C:a:k:+0:-400:Possession
@@ -695,7 +644,6 @@ C:a:k:+0:+100:Combat
 C:a:k:+0:+100:Weaponmastery
 C:a:k:+0:-100:Barehand-combat
 C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
 C:a:k:+0:+100:Stealth
 C:a:k:+0:-200:Spirituality
 C:a:k:+0:-400:Possession
@@ -715,9 +663,7 @@ C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-300:Archery
 C:a:k:-1000:-700:Barehand-combat
 C:a:k:+1000:+200:Magic
-C:a:k:+0:+0:Sneakiness
 C:a:k:+0:+0:Stealth
-C:a:k:+0:-200:Disarming
 C:a:k:+0:-200:Spirituality
 C:a:k:+15000:+100:Monster-lore
 C:a:k:+0:-500:Possession
@@ -737,9 +683,7 @@ C:a:k:-1000:-400:Weaponmastery
 C:a:k:-1000:-300:Archery
 C:a:k:+0:+200:Barehand-combat
 C:a:k:+0:+0:Magic
-C:a:k:+0:+200:Sneakiness
 C:a:k:+0:+200:Stealth
-C:a:k:+0:+200:Disarming
 C:a:k:+0:+200:Spirituality
 C:a:k:+0:-400:Possession
 C:a:k:+0:-200:Corpse-preservation
@@ -762,7 +706,6 @@ C:a:O:14:59:1d1
 C:a:k:+1000:+0:Magic
 C:a:k:-1000:-700:Archery
 C:a:k:+0:-100:Barehand-combat
-C:a:k:+0:-100:Disarming
 C:a:k:+0:+100:Spirituality
 C:a:k:+0:-500:Possession
 C:a:k:+0:-100:Summoning
@@ -778,7 +721,6 @@ C:a:k:+0:+200:Combat
 C:a:k:=0:=0:Weaponmastery
 C:a:k:+0:+200:Barehand-combat
 C:a:k:+1000:+1000:Antimagic
-C:a:k:+0:+200:Disarming
 C:a:k:+0:+300:Stealth
 C:a:k:+0:+1000:Dodging
 C:a:k:=0:=0:Magic
@@ -801,7 +743,7 @@ C:a:b:5:Extra Max Blow(2)
 C:a:O:71:37:1d1
 C:a:g:Nobody
 
-C:N:5:Pacifist
+C:N:5:6:Pacifist
 C:D:0:Pacifists do not believe in violence and do not want to kill 
 C:D:0:everything in sight.
 C:D:1:Novice
@@ -815,21 +757,16 @@ C:D:1:Negotiator
 C:D:1:Pacifist
 C:D:1:Peacemaker
 C:S:0:2:2:2:0:4:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:P:0:0
 C:B:0:0:0
-C:C:H:H:20000:2:40
 C:Z:detect doors and traps
 C:E:-1:0:0:0:0:0
 C:k:=0:=0:Combat
 C:k:=0:=0:Weaponmastery
 C:k:=0:=0:Archery
 C:k:=0:=0:Barehand-combat
-C:k:+0:+600:Sneakiness
 C:k:+0:+600:Stealth
 C:k:+1000:+700:Dodging
-C:k:+1000:+600:Disarming
 C:k:+1000:+600:Magic
 C:k:=0:=0:Magic-Device
 C:k:+0:+500:Spell-power
@@ -843,14 +780,6 @@ C:k:=0:=0:Music
 C:b:15:Perfect casting
 C:g:All Gods
 
-C:a:N:Trapper
-C:a:D:These pacifists use traps to snare monsters, and
-C:a:D:make totems from corpses to summon aid.
-C:O:46:1:1d1
-C:a:k:+1000:+600:Summoning
-C:a:b:1:Trapping
-C:a:b:10:Ammo creation
-
 C:a:N:Peace-mage
 C:a:D:These pacifists use magic to escape danger, and
 C:a:D:rely on symbiotic relationships to defend themselves.
@@ -861,7 +790,7 @@ C:a:k:+0:+700:Divination
 C:a:k:+0:+700:Temporal
 C:a:k:+1000:+600:Symbiosis
 
-C:N:6:Priest
+C:N:6:4:Priest
 C:D:0:A priest serves a god (Vala, Maia or Eru himself) to bring down
 C:D:0:the empire of fear and shadows of Morgoth.
 C:D:1:Believer
@@ -875,13 +804,10 @@ C:D:1:Cardinal
 C:D:1:Inquisitor
 C:D:1:Pope
 C:S:-1:-3:3:-1:0:2:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:3
-C:C:L:H:10000:2:40
 C:P:2:20
 C:Z:detect curses
-C:G:GOD_FRIEND |
+C:G:GOD_FRIEND
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
 C:k:+0:+600:Spell-power
@@ -891,8 +817,6 @@ C:k:+1000:+1000:Spirituality
 C:k:+1000:+700:Prayer
 C:k:+2000:+700:Combat
 C:k:+1000:+700:Weaponmastery
-C:k:+1000:+900:Sneakiness
-C:k:+0000:+900:Disarming
 C:k:+0000:+400:Stealth
 C:k:+0:+50:Magic-Device
 C:b:1:Perfect casting
@@ -964,7 +888,6 @@ C:a:g:Mandos
 C:a:k:+0:-300:Prayer
 C:a:k:+0:-200:Necromancy
 C:a:k:+1000:+300:Mindcraft
-C:a:k:+0:+200:Sneakiness
 C:a:k:+0:+100:Magic-Device
 
 C:a:N:Stonewright
@@ -1008,47 +931,6 @@ C:a:k:+0:+300:Prayer
 C:a:k:+0:-600:Necromancy
 C:a:k:+0:+100:Spell-power
 
-###############################TEST###############################
-C:N:30:Test
-C:D:0:Simple testers.
-C:D:1:Rookie
-C:D:1:Soldier
-C:D:1:Mercenary
-C:D:1:Veteran
-C:D:1:Swordsman
-C:D:1:Champion
-C:D:1:Hero
-C:D:1:Baron
-C:D:1:Duke
-C:D:1:Lord
-C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
-C:B:6:30:5
-C:C:H:L:9000:2:40
-C:P:9:0
-C:R:30:0
-C:F:RES_FEAR
-C:E:0:0:0:0:0:0
-C:O:45:38:1d1
-C:O:37:4:1d1
-C:k:+1000:+800:Combat
-C:k:+1000:+850:Weaponmastery
-C:k:+0:+200:Sword-mastery
-C:k:+0:+200:Axe-mastery
-C:k:+0:+200:Hafted-mastery
-C:k:+0:+200:Polearm-mastery
-C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
-C:k:+1000:+900:Disarming
-C:k:+1000:+300:Magic
-C:k:+0:+550:Antimagic
-
-C:a:N:Shinny test
-C:a:D:Simple testers, they test all with their shiny hacks !
-C:a:O:23:16:1d1
-###############################TEST###############################
-
 
 
 
@@ -1063,8 +945,7 @@ C:a:O:23:16:1d1
 # R:D:race desc
 # R:S:str:int:wis:dex:con:chr:luck
 # R:K:dis:dev:sav:stl:srh:fos:thn:thb
-# R:P:hitdie:xp%:infra:history chart
-# R:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
+# R:P:hitdie:xp%:infra
 # R:E:weapons:torso:arms:finger:head:legs
 # R:C:allowed classes
 # R:G:race flags
@@ -1080,26 +961,32 @@ R:D:Humans are the second born, the Edain.
 R:D:They are the basic race to which all others are compared.
 R:D:Average in ability, they can be any class.
 R:S:0:0:0:0:0:0:0
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:1
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 
 R:N:1:Half-Elf
 R:D:A crossbreed of elf and human, they get the best of the two races.
 R:S:0:1:1:1:-1:1:0
-R:K:2:3:3:1:6:11:-1:5
-R:P:9:110:2:4
-R:M:24:16:66:6:130:15:62:6:100:10
+R:P:9:110:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:ELF
-R:k:+200:+000:Disarming
 R:k:+300:+000:Magic-Device
 R:k:+1500:+000:Spirituality
 R:k:+1000:+000:Stealth
-R:k:+600:+000:Sneakiness
 R:k:-100:+000:Weaponmastery
 R:k:+500:+000:Archery
 
@@ -1108,19 +995,20 @@ R:D:Elves are the first born, the Eldar.
 R:D:More spiritual than physical beings, they are weaker than humans
 R:D:but are more intelligent.
 R:S:-1:2:2:1:-2:2:0
-R:K:5:6:6:2:8:12:-5:15
-R:P:8:120:3:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:8:120:3
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
+R:F:RES_LITE
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:G:ELF
-R:k:+500:+000:Disarming
 R:k:+600:+000:Magic-Device
 R:k:+3000:+000:Spirituality
 R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:+1500:+000:Archery
 
@@ -1128,21 +1016,23 @@ R:N:3:Hobbit
 R:D:An old but quiet race related to humans.
 R:D:They are small and quite weak but good at many things.
 R:S:-2:2:1:3:2:1:5
-R:K:15:18:18:5:12:15:-10:20
-R:P:7:110:4:10
-R:M:21:12:36:3:60:3:33:3:50:3
+R:P:7:110:4
 R:E:1:1:1:2:1:0
 R:Z:create food
-R:G:RESIST_BLACK_BREATH | XTRA_MIGHT_SLING |
+R:G:RESIST_BLACK_BREATH
+R:G:XTRA_MIGHT_SLING
 R:R:1:0
-R:F:SUST_DEX | 
-R:C:Warrior | Archer | Mage | Rogue | Loremaster | Pacifist
+R:F:SUST_DEX
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Rogue
+R:C:Warrior
 R:k:+0:+300:Sling-mastery
-R:k:+1500:+000:Disarming
 R:k:+1800:+000:Magic-Device
 R:k:+9000:+000:Spirituality
 R:k:+6000:+000:Stealth
-R:k:+1200:+000:Sneakiness
 R:k:-1000:+000:Weaponmastery
 R:k:+2000:+000:Archery
 
@@ -1150,19 +1040,18 @@ R:N:4:Gnome
 R:D:Related to dwarves, Gnomes are between Dwarves and Hobbits in size.
 R:D:Very good at magic use, they are poor as fighters.
 R:S:-1:2:0:2:1:-2:2
-R:K:10:12:12:3:6:13:-8:12
-R:P:8:135:4:13
-R:M:50:40:42:3:90:6:39:3:75:3
+R:P:8:135:4
 R:E:1:1:1:2:1:1
 R:Z:blink
 R:R:1:0
-R:F:FREE_ACT | 
-R:C:Warrior | Mage | Rogue | Pacifist
-R:k:+1000:+000:Disarming
+R:F:FREE_ACT
+R:C:Mage
+R:C:Pacifist
+R:C:Rogue
+R:C:Warrior
 R:k:+1200:+000:Magic-Device
 R:k:+6000:+000:Spirituality
 R:k:+3000:+000:Stealth
-R:k:+600:+000:Sneakiness
 R:k:-800:+000:Weaponmastery
 R:k:+1200:+000:Archery
 
@@ -1170,39 +1059,37 @@ R:N:5:Dwarf
 R:D:The children of Aule, a strong but small race.
 R:D:Miners and fighters of legend.
 R:S:2:-2:2:-2:2:-3:0
-R:K:2:9:10:-1:7:10:15:0
-R:P:11:125:5:16
-R:M:35:15:48:3:150:10:46:3:120:10
+R:P:11:125:5
 R:E:1:1:1:2:1:1
 R:Z:find secret passages
 R:R:1:0
-R:F:RES_BLIND | LITE1
-R:C:Warrior | Priest | Pacifist
+R:F:LITE1
+R:F:RES_BLIND
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:k:+0:+200:Axe-mastery
-R:k:+200:+000:Disarming
 R:k:+900:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:-1000:+000:Stealth
-R:k:+700:+000:Sneakiness
 R:k:+1500:+000:Weaponmastery
 R:k:+500:+000:Archery
 
 R:N:6:Orc
 R:D:Quite strong but not very smart.
 R:S:2:-1:0:1:1:-4:-3
-R:K:-3:-3:-3:-1:0:7:12:-5
-R:P:10:110:3:25
-R:M:11:4:66:1:150:5:62:1:120:5
+R:P:10:110:3
 R:E:1:1:1:2:1:1
 R:Z:remove fear
 R:R:1:0
-R:F:RES_DARK | 
-R:C:Warrior | Archer | Rogue | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:C:Archer
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:-300:+000:Magic-Device
 R:k:-1000:+000:Spirituality
 R:k:-1000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+1200:+000:Weaponmastery
 R:k:-500:+000:Archery
 
@@ -1210,21 +1097,17 @@ R:N:7:Troll
 R:D:They can bear the light of the sun.
 R:D:They are extremely strong and dumb.
 R:S:4:-4:-2:-4:3:-6:-4
-R:K:-5:-8:-8:-2:-1:5:20:-10
-R:P:12:137:3:22
-R:M:20:10:96:10:250:50:84:8:225:40
+R:P:12:137:3
 R:E:1:1:1:2:1:1
 R:Z:berserk
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:15:0
-R:F:REGEN | 
+R:F:REGEN
 R:C:Warrior
-R:k:-500:+000:Disarming
 R:k:-800:+000:Magic-Device
 R:k:-4000:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2000:+000:Weaponmastery
 R:k:+0:+200:Hafted-mastery
 R:k:-1000:+000:Archery
@@ -1233,18 +1116,21 @@ R:N:8:Dunadan
 R:D:The greatest of the Edain, humans in all respects but
 R:D:stronger, smarter and wiser.
 R:S:1:2:2:2:3:2:2
-R:K:4:5:5:2:3:13:15:10
-R:P:10:180:0:1
-R:M:50:50:82:5:190:20:78:6:180:15
+R:P:10:180:0
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SUST_CON | REGEN | 
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
-R:k:+400:+000:Disarming
+R:F:REGEN
+R:F:SUST_CON
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+2500:+000:Spirituality
 R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:+1500:+000:Weaponmastery
 R:k:+1000:+000:Archery
 
@@ -1253,20 +1139,21 @@ R:D:Elves are the first born, the Eldar.
 R:D:High elves are the best of the Eldar, strong, fast, intellectual, though
 R:D:they sometimes lack wisdom.
 R:S:1:3:2:3:1:5:0
-R:K:4:20:20:4:3:14:10:25
-R:P:10:200:4:7
-R:M:100:30:90:10:190:20:82:10:180:15
+R:P:10:200:4
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SEE_INVIS | 
-R:F:RES_LITE | 
+R:F:RES_LITE
+R:F:SEE_INVIS
 R:G:ELF
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
-R:k:+400:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:k:+2000:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:+4000:+000:Stealth
-R:k:+300:+000:Sneakiness
 R:k:+1000:+000:Weaponmastery
 R:k:+2500:+000:Archery
 
@@ -1274,19 +1161,18 @@ R:N:10:Half-Ogre
 R:D:A crossbreed between a human and an ogre.
 R:D:They are similar to half-trolls, strong and dumb.
 R:S:3:-1:-1:-1:3:-3:-2
-R:K:-3:-5:-5:-2:-1:5:20:0
-R:P:12:130:3:74
-R:M:40:10:92:10:255:60:80:8:235:60
+R:P:12:130:3
 R:E:1:1:1:2:1:1
 R:Z:set explosive rune
 R:R:1:0
-R:F:SUST_STR | RES_DARK | 
-R:C:Warrior | Priest | Pacifist
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:F:SUST_STR
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:k:-500:+000:Magic-Device
 R:k:-2500:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1294,22 +1180,20 @@ R:N:11:Beorning
 R:D:A race of men shapeshifters.
 R:D:They have the unique power of being able to polymorph to bear forms.
 R:S:4:-2:-2:-1:3:-5:1
-R:K:-6:-8:-6:-2:-1:5:25:5
-R:P:12:150:3:75
-R:M:40:10:100:10:255:65:80:10:240:64
+R:P:12:150:3
 R:E:1:1:1:2:1:1
 R:Z:turn into a bear
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:20:1
-R:F:STR | 
-R:C:Warrior | Rogue | Loremaster
+R:F:STR
+R:C:Loremaster
+R:C:Rogue
+R:C:Warrior
 R:k:+1000:+1000:Bearform-combat
-R:k:-600:+000:Disarming
 R:k:-800:+000:Magic-Device
 R:k:-3000:+000:Spirituality
 R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
 R:k:+2500:+000:Weaponmastery
 R:k:+500:+000:Archery
 
@@ -1320,20 +1204,20 @@ R:D:Druedain are an ancient branch of the race of Men.
 R:D:Wiser and quicker than the Edain, but weaker and less intelligent. 
 R:D:Not as pretty as their common human cousins, but sturdier. 
 R:S:-2:-3:2:3:2:-2:1 
-R:K:5:0:0:5:15:15:0:5 
-R:P:9:115:0:82
-R:M:14:6:65:6:162:25:58:4:145:20 
+R:P:9:115:0
 R:E:1:1:1:2:1:1 
 R:Z:poison dart
 R:R:1:0
-R:F:RES_POIS | 
-R:C:Warrior | Archer | Rogue | Loremaster | Pacifist
+R:F:RES_POIS
+R:C:Archer
+R:C:Loremaster
+R:C:Pacifist
+R:C:Rogue
+R:C:Warrior
 R:k:+0:+250:Boomerang-mastery 
-R:k:-200:+000:Disarming
 R:k:-300:+000:Magic-Device
 R:k:-1000:+000:Spirituality
 R:k:+1000:+000:Stealth
-R:k:+100:+000:Sneakiness
 R:k:+1000:+000:Weaponmastery
 R:k:+800:+000:Archery
 
@@ -1341,19 +1225,18 @@ R:N:13:Petty-Dwarf
 R:D:A nearly extinct subrace of dwarves.
 R:D:They prefer to live in the darkness.
 R:S:1:-1:2:0:2:-4:-5
-R:K:3:5:10:1:5:10:9:0
-R:P:11:135:5:87
-R:M:40:12:43:3:92:6:40:3:78:3
+R:P:11:135:5
 R:E:1:1:1:2:1:1
 R:Z:detect doors and traps
 R:R:1:0
-R:F:RES_DARK | RES_DISEN | LITE1
-R:C:Warrior | Rogue
-R:k:+300:+000:Disarming
+R:F:LITE1
+R:F:RES_DARK
+R:F:RES_DISEN
+R:C:Rogue
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:+1000:+000:Stealth
-R:k:+500:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1362,23 +1245,23 @@ R:D:Elves are the first born, the Eldar.
 R:D:Dark elves are rare on Middle-earth and even though not evil
 R:D:they are not good.
 R:S:-1:3:2:2:-2:1:-2
-R:K:5:15:20:3:8:12:-5:10
-R:P:9:150:5:69
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:9:150:5
 R:E:1:1:1:2:1:1
 R:Z:magic missile
 R:R:1:0
-R:F:RES_DARK | 
+R:F:RES_DARK
 R:R:20:0
-R:F:SEE_INVIS | 
-R:C:Warrior | Archer | Mage | Rogue | Priest
+R:F:SEE_INVIS
+R:C:Archer
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:ELF
 R:k:+0:+200:Magic
-R:k:+500:+000:Disarming
 R:k:+1500:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:+3000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:+1000:+000:Archery
 
@@ -1386,30 +1269,34 @@ R:N:15:Ent
 R:D:Guardian of the forests of Middle-earth, summoned by Yavanna before
 R:D:even the elves awoke. It is said 'Trolls are strong, Ents are STRONGER'.
 R:S:10:-3:2:-5:11:-3:-2
-R:K:5:5:20:-6:5:4:15:5
-R:P:14:210:5:95
-R:M:255:70:72:6:100:25:66:4:100:20
+R:P:14:210:5
 R:E:1:1:1:2:1:1
 R:Z:grow trees
-R:G:NO_STUN | NO_FOOD |
-R:G:AC_LEVEL | 
+R:G:AC_LEVEL
+R:G:NO_FOOD
+R:G:NO_STUN
 R:R:1:-5
-R:F:SPEED | SENS_FIRE | SLOW_DIGEST | RES_POIS
+R:F:RES_POIS
+R:F:SENS_FIRE
+R:F:SLOW_DIGEST
+R:F:SPEED
 R:R:5:0
-R:F:SEE_INVIS | 
+R:F:SEE_INVIS
 R:R:20:0
-R:F:ESP_ORC | 
-R:F:ESP_TROLL | ESP_EVIL | 
-R:C:Warrior | Priest | Loremaster | Pacifist
+R:F:ESP_EVIL
+R:F:ESP_ORC
+R:F:ESP_TROLL
+R:C:Loremaster
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:O:70:32:2d3
 R:b:1:Tree walking
 R:k:+0:+200:Barehand-combat
 R:k:+0:+600:Boulder-throwing
-R:k:+500:+000:Disarming
 R:k:+500:+000:Magic-Device
 R:k:+10000:+000:Spirituality
 R:k:-6000:+000:Stealth
-R:k:+500:+000:Sneakiness
 R:k:-300:+000:Weaponmastery
 R:k:-200:+000:Archery
 
@@ -1417,37 +1304,35 @@ R:N:16:RohanKnight
 R:D:Humans from the land of Rohan, riding the great Mearas.
 R:D:Fast and powerful in battle.
 R:S:4:-2:3:1:4:2:0
-R:K:10:5:5:-8:1:1:5:5
-R:P:10:220:0:84
-R:M:20:3:60:3:80:4:54:3:70:4
+R:P:10:220:0
 R:E:1:1:1:2:1:1
 R:Z:Rohan Knight's Powers
 R:R:1:3
-R:F:SPEED | 
+R:F:SPEED
 R:R:5:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:10:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:15:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:20:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:25:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:30:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:35:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:40:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:45:1
-R:F:SPEED | 
-R:C:Warrior | Priest | Pacifist
-R:k:+1000:+000:Disarming
+R:F:SPEED
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:k:+500:+000:Magic-Device
 R:k:+2500:+000:Spirituality
 R:k:-8000:+000:Stealth
-R:k:+100:+000:Sneakiness
 R:k:+100:+200:Weaponmastery
 R:k:+500:+000:Archery
 
@@ -1457,35 +1342,35 @@ R:N:17:Eagle
 R:D:A Great Eagle of Manwe, his most faithful servant.
 R:D:They have been given many gifts from their master.
 R:S:6:2:1:-2:3:6:4
-R:K:6:0:10:-16:30:10:0:0
-R:P:12:300:5:89
-R:M:14:6:180:6:255:25:150:4:230:20
+R:P:12:300:5
 R:E:0:1:0:4:1:1
 R:R:1:0
-R:F:FEATHER | FLY
+R:F:FEATHER
+R:F:FLY
 R:R:4:0
-R:F:ESP_DRAGON |
+R:F:ESP_DRAGON
 R:R:5:0
-R:F:RES_ELEC | 
+R:F:RES_ELEC
 R:R:10:0
-R:F:RES_COLD | 
+R:F:RES_COLD
 R:R:15:0
-R:F:RES_ACID | 
+R:F:RES_ACID
 R:R:17:0
-R:F:RES_FIRE | 
+R:F:RES_FIRE
 R:R:35:0
-R:F:RES_POIS | 
+R:F:RES_POIS
 R:R:45:0
-R:F:IM_ELEC | 
+R:F:IM_ELEC
 R:R:50:0
 R:F:CLIMB
 R:k:+1000:+300:Barehand-combat
-R:C:Loremaster | Mage | Priest | Pacifist
-R:k:+600:+000:Disarming
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
 R:k:+000:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:-16000:+000:Stealth
-R:k:+3000:+000:Sneakiness
 
 ### Base race characteristics tweaked from Annals of Ea for Theme.
 
@@ -1495,37 +1380,37 @@ R:D:Very strong and smart, but unstealthy.
 R:D:They cannot play instruments or wield weapons.
 # R:S:str:int:wis:dex:con:chr:luck
 R:S:3:2:2:-2:2:-5:-2
-R:K:5:5:5:-10:5:5:5:-20
-R:P:9:250:5:100
-R:M:50:150:200:-200:80:120:54:-50:100:60
-# R:E:weapons:torso:arms:finger:head:legs
+R:P:9:250:5
 R:E:0:1:0:6:1:1
 R:R:1:0
 R:k:=0:=0:Weaponmastery
 R:k:+0:+400:Barehand-combat
 R:k:=0:=0:Geomancy
 R:F:FLY
-R:C:Loremaster | Mage | Priest | Pacifist
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
 #R:G:EVIL
-R:k:+1000:+000:Disarming
 R:k:+500:+000:Magic-Device
 R:k:-4000:+000:Spirituality
 R:k:-10000:+000:Stealth
-R:k:+000:+000:Sneakiness
 
 R:N:19:Yeek
 R:D:The weakest of all the races, bad at everything except gaining levels quickly.
 R:S:-5:-5:-5:-5:-5:-5:-5
-R:K:-5:-5:-10:0:-5:0:-10:-10
-R:P:6:25:2:29
-R:M:10:4:40:5:50:10:35:4:45:10
+R:P:6:25:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
-R:k:-500:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:k:-500:+000:Magic-Device
 R:k:-2500:+000:Spirituality
 R:k:-5000:+000:Stealth
-R:k:-500:+000:Sneakiness
 R:k:-500:+000:Weaponmastery
 R:k:-500:+000:Archery
 
@@ -1536,22 +1421,24 @@ R:D:Elves are the first born, the Eldar.
 R:D:Wood Elves live in the great forests of Middle-earth.
 R:D:They are more dangerous but less wise than High Elves.
 R:S:2:2:-3:5:0:1:0
-R:K:5:6:6:5:8:12:-5:40
-R:P:7:130:4:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:7:130:4
 R:E:1:1:1:2:1:1
-R:G:XTRA_MIGHT_BOW | 
+R:G:XTRA_MIGHT_BOW
 R:R:1:1
-R:F:XTRA_MIGHT | RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
+R:F:RES_LITE
+R:F:XTRA_MIGHT
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 R:G:ELF
 R:k:+0:+200:Archery
 R:b:1:Tree walking
-R:k:+500:+000:Disarming
 R:k:+600:+000:Magic-Device
 R:k:+3000:+000:Spirituality
 R:k:+5000:+000:Stealth
-R:k:+800:+000:Sneakiness
 R:k:+1000:+000:Weaponmastery
 R:k:+4000:+000:Archery
 
@@ -1561,36 +1448,75 @@ R:N:21:Maia
 R:D:An old race, dating from before the creation of Arda, the Maiar were
 R:D:created by Eru to help the Valar in their task.
 R:S:0:0:0:0:0:0:4
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:91
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
 R:G:NO_GOD
 R:R:20:0
-R:F:DRAIN_EXP | 
+R:F:DRAIN_EXP
 R:R:6:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:12:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:18:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:24:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:30:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:36:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:42:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:48:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
-R:C:Warrior | Archer | Mage | Pacifist
-R:k:+000:+000:Disarming
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
+R:C:Archer
+R:C:Mage
+R:C:Pacifist
+R:C:Warrior
 R:k:+000:+000:Magic-Device
 R:k:+000:+000:Spirituality
 R:k:=0:=0:Prayer
 R:k:+000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1601,12 +1527,12 @@ R:D:The humans of the Southeast, servants of the Dark.
 R:D:They are traditional masters of many combat skills.
 R:D:Fanatical warriors, they do not trust magic.
 R:S:2:-2:-2:-2:2:-1:-1
-R:K:0:-5:-1:0:0:10:5:5
-R:P:10:140:0:105
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:140:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer
-R:G:XTRA_MIGHT_XBOW | NO_STUN
+R:C:Archer
+R:C:Warrior
+R:G:NO_STUN
+R:G:XTRA_MIGHT_XBOW
 R:R:5:0
 R:F:FREE_ACT
 R:R:15:0
@@ -1618,9 +1544,7 @@ R:k:+0:+200:Axe-mastery
 R:k:+0:+200:Hafted-mastery
 R:k:+0:+200:Polearm-mastery
 R:k:+2000:+200:Archery
-R:k:+1000:+300:Sneakiness
 R:k:+1000:+200:Stealth
-R:k:+1000:+200:Disarming
 R:k:=0:=0:Magic
 R:k:=0:=0:Magic-Device
 R:k:=0:=0:Spell-power
@@ -1635,20 +1559,23 @@ R:D:corrupted by Melkor to serve his ends.
 # They all get an inherent CHR penalty, other stats depend on subrace.
 R:S:0:0:0:0:0:-1:0
 # Again, here everything depends on subrace
-R:K:0:0:0:0:0:0:0:0
-R:P:10:170:3:109
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:170:3
 # Everything at zero here, depends on type of demon.
 R:E:0:0:0:0:0:0
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:CORRUPT
-R:F:RES_FEAR | HOLD_LIFE | RES_DARK
+R:F:HOLD_LIFE
+R:F:RES_DARK
+R:F:RES_FEAR
 R:Z:spear of darkness
-R:k:+500:+000:Disarming
 R:k:+050:+000:Magic-Device
 R:k:-5000:+000:Spirituality
 R:k:+000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1662,7 +1589,6 @@ R:k:+000:+000:Archery
 # S:S:str:int:wis:dex:con:chr:luck:mana
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
 # S:P:hitdie:xp%:infra
-# S:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
 # S:E:weapons:torso:arms:finger:head:legs
 # S:A:allowed races
 # S:C:'A'llow/'F'orbid:allowed/forbiden classes
@@ -1678,14 +1604,30 @@ I:
 S:N:0: 
 S:D:A:A normal member of the race.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Eagle | 
-S:A:Yeek | Wood-Elf | Maia | Easterling
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Eagle
+S:A:Easterling
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 
 # Just a place holder, the actualy setting are done with corruptions, see
 # corrupt.lua and player.lua
@@ -1693,13 +1635,24 @@ S:N:1:Vampire
 S:D:B:Vampires are powerful undead, wielding great powers. They still fear the
 S:D:B:sunlight and cannot easily satiate their hunger.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Hobbit | Gnome | Dwarf | Orc |
-S:A:Troll | Dunadan | Half-Ogre | Beorning | Druadan | Petty-Dwarf | 
-S:A:Dark-Elf | RohanKnight | Yeek | Easterling
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Yeek
 S:C:A:Mage
 S:O:70:0:5d3
 S:O:70:32:2d3
@@ -1708,24 +1661,45 @@ S:N:2:Spectre
 S:D:B:Spectres only partially exist in the mortal world and so they can
 S:D:B:pass through walls. They are somewhat physically weak.
 S:S:-5:1:1:2:-3:-6:-3:105
-S:K:2:8:7:2:2:7:-5:-2
 S:P:-4:80:3
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:C:F:Warrior | Archer
-S:G:UNDEAD | NO_CUT | NO_FOOD | SEMI_WRAITH | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_COLD | RES_POIS | RES_NETHER | 
+S:F:HOLD_LIFE
+S:F:RES_COLD
+S:F:RES_NETHER
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:O:70:32:2d3
-S:k:+200:+000:Disarming
 S:k:+800:+000:Magic-Device
 S:k:+700:+000:Spirituality
 S:k:+2000:+000:Stealth
-S:k:+200:+000:Sneakiness
 S:k:-500:+000:Weaponmastery
 S:k:-200:+000:Archery
 
@@ -1733,70 +1707,106 @@ S:N:3:Skeleton
 S:D:B:Yet an other kind of undead. Their physical 'body' is not very vulnerable
 S:D:B:to sharp things.
 S:S:0:-2:-2:0:1:-4:-3:70
-S:K:-5:-5:5:-1:-1:8:8:0
 S:P:0:45:1
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:G:UNDEAD | NO_CUT | NO_FOOD | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:RES_POIS | RES_SHARDS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:RES_SHARDS
+S:F:SEE_INVIS
 S:R:10:0
-S:F:RES_COLD | 
+S:F:RES_COLD
 S:O:70:32:2d3
-S:k:-500:+000:Disarming
 S:k:-500:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
 S:k:+800:+000:Weaponmastery
 S:k:+000:+000:Archery
 
 S:N:4:Zombie
 S:D:B:Strong and dumb is a zombie.
 S:S:2:-6:-6:1:4:-5:-4:70
-S:K:-2:-2:5:-1:-1:2:5:0
 S:P:3:45:1
-S:M:50:15:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:C:F:Mage
-S:G:UNDEAD | NO_FOOD | NO_SUBRACE_CHANGE
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_POIS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:R:5:0
-S:F:RES_COLD | 
+S:F:RES_COLD
 S:O:70:32:2d3
-S:k:-200:+000:Disarming
 S:k:-200:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
 S:k:+500:+000:Weaponmastery
 S:k:+000:+000:Archery
 
 S:N:5:Barbarian
 S:D:A:Hardy members of their race, they are strong fighters but poor spellcasters.
 S:S:2:-3:-2:1:1:-3:1:50
-S:K:-2:-10:2:-2:0:1:12:5
 S:P:1:25:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Dwarf | Orc | Troll | Half-Ogre | Beorning | Druadan | Easterling
+S:A:Beorning
+S:A:Druadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Half-Ogre
+S:A:Human
+S:A:Orc
+S:A:Troll
 S:C:F:Mage
 S:R:10:0
-S:F:RES_FEAR | 
-S:k:-200:+000:Disarming
+S:F:RES_FEAR
 S:k:-1000:+000:Magic-Device
 S:k:+200:+000:Spirituality
 S:k:-2000:+000:Stealth
-S:k:+000:+000:Sneakiness
 S:k:+1200:+000:Weaponmastery
 S:k:+500:+000:Archery
 
@@ -1804,34 +1814,53 @@ S:N:6:Hermit
 S:D:A:Through years of isolation hermits can manage to increase their mana
 S:D:A:reserves but at the cost of an increased physical weakness.
 S:S:-3:1:1:-3:-3:1:0:120
-S:K:5:10:5:3:4:10:-5:-5
 S:P:-3:20:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf |
-S:A:Dunadan | High-Elf | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | 
-S:A:Eagle | Yeek | Wood-Elf | Maia | 
-S:C:F:Warrior | Archer
-S:k:+500:+000:Disarming
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Eagle
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
 S:k:+1000:+000:Magic-Device
 S:k:+500:+000:Spirituality
 S:k:+3000:+000:Stealth
-S:k:+400:+000:Sneakiness
 S:k:-500:+000:Weaponmastery
 S:k:-500:+000:Archery
 
 S:N:8:LostSoul
 S:D:A:In some very rare occasions souls can come back from the Halls of Mandos.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:G:ASTRAL | NO_SUBRACE_CHANGE
+S:G:ASTRAL
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:SEE_INVIS
-S:A:Half-Elf | Elf | High-Elf | Dark-Elf | Wood-Elf | Maia | 
-S:A:Hobbit | Gnome | Dwarf | Petty-Dwarf | Ent | Eagle |
+S:A:Dark-Elf
+S:A:Dwarf
+S:A:Eagle
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:Wood-Elf
 S:O:70:32:25d2
 S:O:70:12:25d3
 
@@ -1839,9 +1868,7 @@ S:O:70:12:25d3
 S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
 
 ### Dragon subraces added for Theme
@@ -1852,15 +1879,16 @@ S:D:B:They are especially resistant to fire and with time learn
 S:D:B:to resist its effects entirely. They are stronger than other
 S:D:B:dragons and can prevent attacks from sapping their strength.
 S:S:3:0:0:0:0:0:0:100
-S:K:0:0:0:0:-2:2:5:0
 S:P:0:0:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Warrior | Archer
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_STR | SH_FIRE | RES_FIRE
+S:F:RES_FIRE
+S:F:SH_FIRE
+S:F:SUST_STR
 S:R:5:1
 S:F:STR
 S:R:10:1
@@ -1876,7 +1904,8 @@ S:F:STR
 S:R:45:0
 S:F:IM_FIRE
 S:R:50:1
-S:F:STR | CLIMB
+S:F:CLIMB
+S:F:STR
 S:Z:fire breath
 S:k:+1000:+600:Fire
 
@@ -1886,15 +1915,15 @@ S:D:B:liquid. They are especially resistant to acid and with time
 S:D:B:will come to resist its effects entirely. They look more  
 S:D:B:beautiful than other dragons and are expert at protecting that.
 S:S:0:0:0:0:0:3:0:100
-S:K:2:0:1:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CHR | | RES_ACID
+S:F:RES_ACID
+S:F:SUST_CHR
 S:R:5:1
 S:F:CHR
 S:R:10:1
@@ -1910,7 +1939,8 @@ S:F:CHR
 S:R:45:0
 S:F:IM_ACID
 S:R:50:1
-S:F:CHR | CLIMB
+S:F:CHR
+S:F:CLIMB
 S:Z:spit acid
 S:k:+1000:+600:Water
 
@@ -1920,15 +1950,15 @@ S:D:B:vapours. They are especially resistant to poison and resist
 S:D:B:poison attacks exceptionally well. They are healthier and sturdier
 S:D:B:than other dragons and are not as susceptible to diseases.
 S:S:0:0:0:0:3:0:0:100
-S:K:0:0:2:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CON | RES_POIS
+S:F:RES_POIS
+S:F:SUST_CON
 S:R:5:1
 S:F:CON
 S:R:10:1
@@ -1942,7 +1972,8 @@ S:F:CON
 S:R:40:1
 S:F:CON
 S:R:50:1
-S:F:CON | CLIMB
+S:F:CLIMB
+S:F:CON
 S:Z:poison dart
 S:k:+1000:+600:Air
 
@@ -1951,15 +1982,16 @@ S:D:B:These enormous creatures are wreathed in living lightning.
 S:D:B:They are especially nimble and agile, and their dexterity  
 S:D:B:is not sapped easily.
 S:S:0:0:0:3:0:0:0:100
-S:K:3:0:0:2:1:0:0:0
 S:P:0:0:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_DEX | RES_ELEC | SH_ELEC
+S:F:RES_ELEC
+S:F:SH_ELEC
+S:F:SUST_DEX
 S:R:5:1
 S:F:DEX
 S:R:10:1
@@ -1975,7 +2007,8 @@ S:F:DEX
 S:R:45:0
 S:F:IM_ELEC
 S:R:50:1
-S:F:DEX | CLIMB
+S:F:CLIMB
+S:F:DEX
 S:Z:dazzle
 S:k:+1000:+600:Earth
 
@@ -1984,15 +2017,16 @@ S:D:B:These enormous dragons look like they'd been hewed from ice.
 S:D:B:They are the most cunning and calculating among their kind,   
 S:D:B:and attacks against their intelligence are unlikely to succeed.
 S:S:0:3:0:0:0:0:0:100
-S:K:0:2:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_INT | RES_COLD | SENS_FIRE
+S:F:RES_COLD
+S:F:SENS_FIRE
+S:F:SUST_INT
 S:R:5:1
 S:F:INT
 S:R:10:1
@@ -2008,7 +2042,8 @@ S:F:INT
 S:R:45:0
 S:F:IM_COLD
 S:R:50:1
-S:F:INT | CLIMB
+S:F:CLIMB
+S:F:INT
 S:Z:cold breath
 S:k:+1000:+600:Divination
 
@@ -2018,15 +2053,17 @@ S:D:B:They are powerful undead beings and are thus wiser than other
 S:D:B:dragons. Wisdom-sapping and life-draining attacks are not 
 S:D:B:very effective against them.
 S:S:0:0:3:0:0:0:0:100
-S:K:0:0:1:5:2:2:0:0
 S:P:0:0:3
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
-S:G:NO_SUBRACE_CHANGE | UNDEAD | SEMI_WRAITH
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SUST_WIS | HOLD_LIFE
+S:F:HOLD_LIFE
+S:F:SUST_WIS
 S:R:5:1
 S:F:WIS
 S:R:10:1
@@ -2040,7 +2077,8 @@ S:F:WIS
 S:R:40:1
 S:F:WIS
 S:R:50:1
-S:F:WIS | CLIMB
+S:F:CLIMB
+S:F:WIS
 S:Z:chaos breath
 S:k:+1000:+600:Meta
 
@@ -2052,11 +2090,9 @@ S:D:A:quick, scurrying feet, and winglike appendages on their
 S:D:A:slick, black backs. They are somewhat weak and sickly,
 S:D:A:but sly, cunning, and agile.
 S:S:-1:1:1:1:-1:-2:0:100
-S:K:2:0:1:2:2:20:0:0
 S:P:1:20:1
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
@@ -2072,8 +2108,6 @@ S:F:SPEED
 S:Z:poison dart
 R:k:-200:+000:Weaponmastery
 R:k:+1000:+300:Archery
-R:k:+1000:+000:Sneakiness
-R:k:+500:+200:Disarming
 S:k:+1000:+500:Stealth
 R:k:+050:+000:Magic-Device
 S:k:+0:+200:Magic
@@ -2085,16 +2119,17 @@ S:D:A:These birdlike demons' wings flap with blinding speed.
 S:D:A:They are somewhat physically weak, but may befuddle enemies
 S:D:A:so that they believe they'd never seen anything so beautiful.
 S:S:-2:0:0:0:0:+3:0:100
-S:K:0:0:1:-2:0:10:0:0
 S:P:1:0:1
-S:M:14:6:72:6:180:25:66:4:150:20
 # R:E:weapons:torso:arms:finger:head:legs
 S:E:0:1:2:4:1:1
 S:A:Demon
-S:C:F:Warrior | Archer | Priest
+S:C:F:Archer
+S:C:F:Priest
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CHR | FLY
+S:F:FLY
+S:F:SUST_CHR
 S:R:5:0
 S:F:FREE_ACT
 S:R:10:0
@@ -2103,8 +2138,6 @@ S:R:50:0
 S:F:CLIMB
 R:k:-400:+000:Weaponmastery
 R:k:+000:+300:Archery
-R:k:+1000:+000:Sneakiness
-R:k:+500:+100:Disarming
 S:k:+500:+200:Stealth
 S:k:+0:+200:Magic
 S:k:+1000:+300:Mind
@@ -2115,37 +2148,34 @@ S:D:A:These doglike demons are one of the lowest forms of Morgoth's
 S:D:A:corrupted races, though their sense of smell is uncanny, and 
 S:D:A:increases with experience.
 S:S:-1:0:0:0:-1:0:0:100
-S:K:2:0:2:0:5:30:0:0
 S:P:0:-10:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:5:0
 S:F:ESP_ANIMAL
 S:R:10:1
-S:F:ESP_ORC | SEARCH
+S:F:ESP_ORC
 S:R:15:0
 S:F:ESP_TROLL
 S:R:20:1
-S:F:ESP_DRAGON | SEARCH
+S:F:ESP_DRAGON
 S:R:25:0
 S:F:ESP_UNDEAD
 S:R:30:1
-S:F:ESP_NONLIVING | SEARCH
+S:F:ESP_NONLIVING
 S:R:35:0
 S:F:ESP_EVIL
 S:R:40:1
-S:F:ESP_GOOD | SEARCH
+S:F:ESP_GOOD
 S:R:45:0
 S:F:ESP_DEMON
 S:R:50:1
-S:F:ESP_ALL | SEARCH
+S:F:ESP_ALL
 S:Z:smell monsters
 S:Z:smell metal
 R:k:+500:+300:Stealth
-R:k:+500:+200:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -2155,31 +2185,36 @@ S:D:A:They are clumsy and dumb, but very strong and stout, and
 S:D:A:resist the elements fairly well.
 S:S:2:-1:-2:-2:2:-1:0:100
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:-1:0:0:-8:-2:-10:5:0
 S:P:2:20:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Mage
-S:G:NO_SUBRACE_CHANGE | NO_STUN
+S:A:Demon
+S:C:F:Mage
+S:C:F:Priest
+S:G:NO_STUN
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:RES_POIS
 S:R:10:1
-S:F:RES_FIRE | TUNNEL
+S:F:RES_FIRE
+S:F:TUNNEL
 S:R:20:1
-S:F:RES_ACID | TUNNEL
+S:F:RES_ACID
+S:F:TUNNEL
 S:R:30:1
-S:F:RES_ELEC | TUNNEL
+S:F:RES_ELEC
+S:F:TUNNEL
 S:R:40:1
-S:F:RES_COLD | TUNNEL
+S:F:RES_COLD
+S:F:TUNNEL
 S:R:45:1
-S:F:RES_SHARDS | TUNNEL
+S:F:RES_SHARDS
+S:F:TUNNEL
 S:R:50:1
-S:F:RES_SOUND | TUNNEL
+S:F:RES_SOUND
+S:F:TUNNEL
 S:k:+1000:+500:Boulder-throwing
 S:Z:eat rock
 R:k:-800:+000:Stealth
-R:k:-500:+000:Sneakiness
 R:k:-500:+000:Archery
 
 S:N:20:(Caborrog)
@@ -2189,13 +2224,14 @@ S:D:A:As a result of their corruption, they develop a strange
 S:D:A:protective layer around them as they mature.
 S:S:-1:2:1:0:0:-3:0:100
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:0:0:1:-10:2:10:0:0
 S:P:2:10:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
 S:A:Demon
-S:C:F:Archer | Priest
-S:G:NO_SUBRACE_CHANGE | NO_STUN | AC_LEVEL
+S:C:F:Archer
+S:C:F:Priest
+S:G:AC_LEVEL
+S:G:NO_STUN
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:RES_POIS
 S:R:1:7
@@ -2212,7 +2248,6 @@ S:k:+0:+300:Conveyance
 S:k:+0:+300:Temporal
 S:Z:panic hit
 R:k:-1000:+000:Stealth
-R:k:-500:+000:Sneakiness
 
 S:N:21:(Draugrog)
 S:D:A:These doglike demons are of a higher order than the Huroeg, 
@@ -2220,33 +2255,31 @@ S:D:A:they learn more quickly and have more sophisticated magical
 S:D:A:powers. Their arrogant snarling, however, makes them quite
 S:D:A:unstealthy.
 S:S:1:1:1:1:1:-1:0:100
-S:K:2:0:2:-20:5:30:0:0
 S:P:0:-20:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:4:0
 S:F:ESP_ANIMAL
 S:R:8:1
-S:F:ESP_ORC | SEARCH
+S:F:ESP_ORC
 S:R:12:0
 S:F:ESP_TROLL
 S:R:16:1
-S:F:ESP_DRAGON | SEARCH
+S:F:ESP_DRAGON
 S:R:20:0
 S:F:ESP_UNDEAD
 S:R:24:1
-S:F:ESP_NONLIVING | SEARCH
+S:F:ESP_NONLIVING
 S:R:28:0
 S:F:ESP_EVIL
 S:R:32:1
-S:F:ESP_GOOD | SEARCH
+S:F:ESP_GOOD
 S:R:36:0
 S:F:ESP_DEMON
 S:R:40:1
-S:F:ESP_ALL | SEARCH
+S:F:ESP_ALL
 S:R:50:0
 S:F:PRECOGNITION
 S:Z:smell monsters
@@ -2255,7 +2288,6 @@ S:k:+0:+200:Magic
 S:k:+0:+200:Spirituality
 S:k:+1000:+500:Mindcraft
 R:k:-10000:+000:Stealth
-R:k:-500:+200:Sneakiness
 R:k:+300:+000:Weaponmastery
 R:k:+200:+000:Archery
 
@@ -2266,61 +2298,114 @@ S:D:A:These slithering snakelike forms lack many physical
 S:D:A:advantages, but are no less deadly for it. Their magical
 S:D:A:abilities, stealth, and cunning are legendary.
 S:S:-3:5:5:5:-1:-6:0:200
-S:K:5:5:5:10:5:50:0:0
 S:P:2:40:3
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:0:1:0:1:1:0
 S:A:Demon
-S:C:F:Warrior | Archer | Priest | Rogue
+S:C:F:Archer
+S:C:F:Priest
+S:C:F:Rogue
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:FEATHER | FREE_ACT | LITE1 | RES_POIS | 
+S:F:FEATHER
+S:F:FREE_ACT
+S:F:LITE1
+S:F:RES_POIS
 S:R:1:0
-S:F:REGEN | SEE_INVIS | SLOW_DIGEST | SUST_CHR |
+S:F:REGEN
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
+S:F:SUST_CHR
 S:R:1:10
-S:F:SPEED |
+S:F:SPEED
 S:R:5:0
-S:F:ESP_ANIMAL | RES_FIRE | RES_COLD | SUST_WIS |
+S:F:ESP_ANIMAL
+S:F:RES_COLD
+S:F:RES_FIRE
+S:F:SUST_WIS
 S:R:5:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:10:0
-S:F:ESP_ORC | RES_ELEC | RES_ACID | SUST_INT | WATER_BREATH |
+S:F:ESP_ORC
+S:F:RES_ACID
+S:F:RES_ELEC
+S:F:SUST_INT
+S:F:WATER_BREATH
 S:R:10:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:15:0
-S:F:ESP_TROLL | FLY | RES_CONF | RES_LITE | SUST_CON |
+S:F:ESP_TROLL
+S:F:FLY
+S:F:RES_CONF
+S:F:RES_LITE
+S:F:SUST_CON
 S:R:15:1
-S:F:LUCK | SPEED | SPELL |
+S:F:LUCK
+S:F:SPEED
+S:F:SPELL
 S:R:20:0
-S:F:ESP_DRAGON | ESP_GIANT | LITE2 | RES_BLIND | SUST_DEX |
+S:F:ESP_DRAGON
+S:F:ESP_GIANT
+S:F:LITE2
+S:F:RES_BLIND
+S:F:SUST_DEX
 S:R:20:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:25:0
-S:F:ESP_UNDEAD | ESP_NONLIVING | RES_DISEN | RES_CHAOS | SUST_STR |
+S:F:ESP_NONLIVING
+S:F:ESP_UNDEAD
+S:F:RES_CHAOS
+S:F:RES_DISEN
+S:F:SUST_STR
 S:R:25:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:30:0
-S:F:ESP_EVIL | ESP_DEMON | RES_SOUND |
+S:F:ESP_DEMON
+S:F:ESP_EVIL
+S:F:RES_SOUND
 S:R:30:1
-S:F:LUCK | SPEED | SPELL |
+S:F:LUCK
+S:F:SPEED
+S:F:SPELL
 S:R:35:0
-S:F:CLIMB | ESP_GOOD | ESP_THUNDERLORD | RES_SHARDS |
+S:F:CLIMB
+S:F:ESP_GOOD
+S:F:ESP_THUNDERLORD
+S:F:RES_SHARDS
 S:R:35:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:40:0
-S:F:ESP_UNIQUE | LITE3 | PRECOGNITION | RES_NEXUS | RES_NETHER |
+S:F:ESP_UNIQUE
+S:F:LITE3
+S:F:PRECOGNITION
+S:F:RES_NETHER
+S:F:RES_NEXUS
 S:R:40:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:45:0
-S:F:ESP_ALL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | MAGIC_BREATH |
+S:F:ESP_ALL
+S:F:IM_ACID
+S:F:IM_COLD
+S:F:IM_ELEC
+S:F:IM_FIRE
+S:F:MAGIC_BREATH
 S:R:45:1
-S:F:SPEED | SPELL |
+S:F:SPEED
+S:F:SPELL
 S:R:50:0
-S:F:IM_NETHER | REFLECT | WRAITH |
+S:F:IM_NETHER
+S:F:REFLECT
+S:F:WRAITH
 S:R:50:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 R:k:+25000:+500:Stealth
-R:k:+2000:+200:Sneakiness
 R:k:+2000:+300:Magic-Device
 
 S:N:23:(Limrog)
@@ -2328,11 +2413,9 @@ S:D:A:Humanoid creatures with gill slits at the necks,
 S:D:A:they seem to flit in and out of existence. 
 S:S:-2:1:1:3:-1:-1:2:150
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:2:2:2:2:2:30:0:0
 S:P:1:50:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
@@ -2340,8 +2423,6 @@ S:F:WATER_BREATH
 S:R:50:0
 S:F:MAGIC_BREATH
 R:k:+3000:+300:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+2000:+200:Disarming
 S:k:+0:+200:Magic
 S:k:+0:+500:Conveyance
 S:k:+0:+500:Temporal
@@ -2356,25 +2437,25 @@ S:D:A:These creatures resemble lions standing on two legs.
 S:D:A:Very strong and smart, they instill fear in all who 
 S:D:A:encounter them and are afraid of nothing.
 S:S:2:1:1:-1:2:1:1:100
-S:K:0:0:4:-3:0:10:10:10
 S:P:2:30:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Mage
+S:A:Demon
+S:C:F:Mage
+S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:5:0
-S:F:RES_FIRE | RES_COLD
+S:F:RES_COLD
+S:F:RES_FIRE
 S:R:10:0
-S:F:RES_ELEC | RES_ACID
+S:F:RES_ACID
+S:F:RES_ELEC
 S:R:15:0
-S:F:RES_POIS | RES_CONF
+S:F:RES_CONF
+S:F:RES_POIS
 S:k:+1000:+100:Combat
 S:k:+1000:+100:Weaponmastery
 R:k:+1000:+100:Archery
 R:k:-300:+000:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+500:+100:Disarming
 S:Z:scare monster
 S:Z:berserk
 
@@ -2384,451 +2465,20 @@ S:D:A:They can be equally skilled in combat and
 S:D:A:magic; and they can temporarily assume the 
 S:D:A:forms of true Balrogs.
 S:S:1:1:1:1:1:1:0:150
-S:K:1:1:1:1:1:20:15:10
 S:P:3:50:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Loremaster | Rogue
+S:A:Demon
+S:C:F:Loremaster
+S:C:F:Priest
+S:C:F:Rogue
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:IM_FIRE | SH_FIRE
+S:F:IM_FIRE
+S:F:SH_FIRE
 S:k:+0:+300:Combat
 S:k:+0:+300:Magic
 S:Z:turn into a Balrog
 R:k:+1000:+300:Weaponmastery
 R:k:+1000:+300:Archery
 R:k:+1000:+200:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+1000:+200:Disarming
 R:k:+500:+200:Magic
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# H: Race history
-# H:index:chance:chart:next chart:social class bonus:desc
-
-# Dunadan, Human: 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# RohanKnight:   84 -> 85 -> 50 -> 51 -> 52 -> 53.
-# Half-Ogre:     74 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Beorning:      75 -> 76 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Half-elf:       4 -> 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Elf,  Wood-elf: 5 -> 6 -> 9 -> 54 -> 55 -> 56.
-# High-elf:       7 -> 8 -> 9 -> 54 -> 55 -> 56.
-# Dark-elf:      69 -> 70 -> 71 -> 72 -> 73.
-# Hobbit:        10 -> 11 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Gnome:         13 -> 14 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Dwarf:         16 -> 17 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Petty-Dwarf:   87 -> 88 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Eagle:   	     89 -> 90.
-# Maia:          91 -> 92 -> 93 -> 94.
-# Ent:           95 -> 96.
-# Troll:         22 -> 23 -> 24 -> 62 -> 63 -> 64 -> 65 -> 66.
-# Orc            25 -> 26 -> 27 -> 28 -> 80 -> 81 -> 65 -> 66.
-# Yeek:          29 -> 3 -> 50 -> 51 -> 52 -> 53.
-#   (not used:   78 -> 79 -> 80 -> 81 -> 65 -> 66.)
-# Druadan:       82 -> 83 -> 71 -> 72 -> 73.
-# Dragon:	100 -> 101 -> 102 -> 103 -> 104.
-# Easterling:	105 -> 106 -> 107 -> 108.
-# Demon:	109 -> 110 -> 111 -> 112.
-
-H:0:10:1:2:25:You are the illegitimate and unacknowledged child 
-H:1:20:1:2:35:You are the illegitimate but acknowledged child 
-H:2:95:1:2:45:You are one of several children 
-H:3:100:1:2:50:You are the first child 
-
-H:4:40:2:3:65:of a Serf.  
-H:5:65:2:3:80:of a Yeoman.  
-H:6:80:2:3:90:of a Townsman.  
-H:7:90:2:3:105:of a Guildsman.  
-H:8:96:2:3:120:of a Landed Knight.  
-H:9:99:2:3:130:of a Noble Lord.  
-H:10:100:2:3:140:of the Royal Blood Line.  
-
-H:11:20:3:50:20:You are the black sheep of the family.  
-H:12:80:3:50:55:You are a credit to the family.  
-H:13:100:3:50:60:You are a well-liked child.  
-
-H:14:25:4:1:40:Your mother was of the Avari.  
-H:15:40:4:1:50:Your father was of the Avari.  
-H:16:65:4:1:60:Your mother was of the Nandor.  
-H:17:80:4:1:60:Your father was of the Nandor.  
-H:18:96:4:1:70:Your mother was of the Sindar.  
-H:19:99:4:1:70:Your father was of the Sindar.  
-H:20:100:4:1:100:Your ancestry traces to Elrond.  
-
-H:21:60:5:6:50:You are one of several children 
-H:22:100:5:6:55:You are the only child 
-
-H:23:40:6:9:40:of an Avarin 
-H:24:70:6:9:50:of a Nandorin 
-H:25:100:6:9:60:of a Sindarin 
-
-H:26:60:7:8:50:You are one of several children 
-H:27:100:7:8:55:You are the only child 
-
-H:28:75:8:9:50:of a Telerin 
-H:29:95:8:9:55:of a Noldorin 
-H:30:100:8:9:60:of a Vanyarin 
-
-H:31:40:9:54:80:Ranger.  
-H:32:70:9:54:90:Archer.  
-H:33:87:9:54:110:Warrior.  
-H:34:95:9:54:125:Mage.  
-H:35:99:9:54:140:Prince.  
-H:36:100:9:54:145:King.  
-
-H:37:85:10:11:45:You are one of several children of a Hobbit 
-H:38:100:10:11:55:You are the only child of a Hobbit 
-
-H:39:20:11:3:55:Bum.  
-H:40:30:11:3:80:Tavern Owner.  
-H:41:40:11:3:90:Miller.  
-H:42:50:11:3:100:Home Owner.  
-H:43:80:11:3:110:Burglar.  
-H:44:95:11:3:115:Warrior.  
-H:45:99:11:3:125:Mage.  
-H:46:100:11:3:140:Clan Elder.  
-
-H:47:85:13:14:45:You are one of several children of a Gnome 
-H:48:100:13:14:55:You are the only child of a Gnome 
-
-H:49:20:14:3:55:Beggar.  
-H:50:50:14:3:70:Braggart.  
-H:51:75:14:3:85:Prankster.  
-H:52:95:14:3:100:Warrior.  
-H:53:100:14:3:125:Mage.  
-
-H:54:25:16:17:40:You are one of two children of a Dwarven 
-H:55:100:16:17:50:You are the only child of a Dwarven 
-
-H:56:10:17:18:60:Thief.  
-H:57:35:17:18:80:Smith.  
-H:58:75:17:18:90:Miner.  
-H:59:90:17:18:110:Warrior.  
-H:60:99:17:18:130:Priest.  
-H:61:100:17:18:150:King.  
-
-H:62:15:18:57:10:You are the black sheep of the family.  
-H:63:85:18:57:50:You are a credit to the family.  
-H:64:100:18:57:55:You are a well liked child.  
-
-H:65:100:20:2:50:You are the adopted child 
-
-H:66:100:22:23:50:You are the offspring of a 
-
-H:67:30:23:24:20:Forest-Troll 
-H:68:60:23:24:25:Cave-Troll 
-H:69:75:23:24:30:Hill-Troll 
-H:70:90:23:24:35:Stone-Troll 
-H:71:95:23:24:40:Snow-Troll 
-H:72:100:23:24:45:Water-Troll 
-
-H:73:25:24:62:50:Worker.  
-H:74:95:24:62:55:Warrior.  
-H:75:99:24:62:65:Shaman.  
-H:76:100:24:62:80:Clan Chief.  
-
-H:77:100:25:26:50:You are one of several children of 
-
-H:78:40:26:27:40:a Snaga 
-H:79:80:26:27:50:an Orc 
-H:80:100:26:27:60:an Uruk 
-
-H:81:30:27:28:20:Slave 
-H:82:60:27:28:50:Archer 
-H:83:90:27:28:60:Warrior 
-H:84:95:27:28:80:Shaman 
-H:85:100:27:28:100:Chieftain 
-
-H:86:30:28:80:50:from the Misty Mountains.  
-H:87:60:28:80:50:from the Grey Mountains.  
-H:88:90:28:80:70:from the orc-hold of Mount Gundabad.  
-H:89:100:28:80:80:from the Pits of Angband.  
-
-H:90:25:29:3:50:You are one of five children of a blue Yeek.  
-H:91:75:29:3:75:You are one of five children of a brown Yeek.  
-H:92:100:29:3:100:You are one of five children of a master Yeek.  
-
-H:93:20:50:51:50:You have dark brown eyes, 
-H:94:60:50:51:50:You have brown eyes, 
-H:95:70:50:51:50:You have hazel eyes, 
-H:96:80:50:51:50:You have green eyes, 
-H:97:90:50:51:50:You have blue eyes, 
-H:98:100:50:51:50:You have blue-gray eyes, 
-
-H:99:70:51:52:50:straight 
-H:100:90:51:52:50:wavy 
-H:101:100:51:52:50:curly 
-
-H:102:30:52:53:50:black hair, 
-H:103:70:52:53:50:brown hair, 
-H:104:80:52:53:50:auburn hair, 
-H:105:90:52:53:50:red hair, 
-H:106:100:52:53:50:blond hair, 
-
-H:107:10:53:0:50:and a very dark complexion.
-H:108:30:53:0:50:and a dark complexion.
-H:109:80:53:0:50:and an average complexion.
-H:110:90:53:0:50:and a fair complexion.
-H:111:100:53:0:50:and a very fair complexion.
-
-H:112:85:54:55:50:You have light grey eyes, 
-H:113:95:54:55:50:You have light blue eyes, 
-H:114:100:54:55:50:You have light green eyes, 
-
-H:115:75:55:56:50:straight 
-H:116:100:55:56:50:wavy 
-
-H:117:75:56:0:50:black hair, and a fair complexion.
-H:118:85:56:0:50:brown hair, and a fair complexion.
-H:119:95:56:0:50:blond hair, and a fair complexion.
-H:120:100:56:0:50:silver hair, and a fair complexion.
-
-H:121:99:57:58:50:You have dark brown eyes, 
-H:122:100:57:58:60:You have glowing red eyes, 
-
-H:123:90:58:59:50:straight 
-H:124:100:58:59:50:wavy 
-
-H:125:75:59:60:50:black hair, 
-H:126:100:59:60:50:brown hair, 
-
-H:127:25:60:61:50:a one foot beard, 
-H:128:60:60:61:51:a two foot beard, 
-H:129:90:60:61:53:a three foot beard, 
-H:130:100:60:61:55:a four foot beard, 
-
-H:131:100:61:0:50:and a dark complexion.
-
-H:132:60:62:63:50:You have slime green eyes, 
-H:133:85:62:63:50:You have puke yellow eyes, 
-H:134:99:62:63:50:You have blue-bloodshot eyes, 
-H:135:100:62:63:55:You have glowing red eyes, 
-
-H:136:33:63:64:50:dirty 
-H:137:66:63:64:50:mangy 
-H:138:100:63:64:50:oily 
-
-H:139:33:64:65:50:sea-weed green hair, 
-H:140:66:64:65:50:bright red hair, 
-H:141:100:64:65:50:dark purple hair, 
-
-H:142:25:65:66:50:and green 
-H:143:50:65:66:50:and blue 
-H:144:75:65:66:50:and white 
-H:145:100:65:66:50:and black 
-
-H:146:33:66:0:50:ulcerous skin.
-H:147:66:66:0:50:scabby skin.
-H:148:100:66:0:50:leprous skin.
-
-H:149:85:69:70:45:You are one of several children of a Dark Elven 
-H:150:100:69:70:55:You are the only child of a Dark Elven 
-
-H:151:50:70:71:60:Warrior.  
-H:152:80:70:71:75:Warlock.  
-H:153:100:70:71:95:Noble.  
-
-H:154:100:71:72:50:You have black eyes, 
-
-H:155:70:72:73:50:straight 
-H:156:90:72:73:50:wavy 
-H:157:100:72:73:50:curly 
-
-H:158:100:73:0:50:black hair and a very dark complexion.
-
-H:159:25:74:20:25:Your mother was an Ogre, but it is unacknowledged.  
-H:160:100:74:20:25:Your father was an Ogre, but it is unacknowledged.  
-
-H:161:90:75:76:50:You are a descendant of Beorn to the 
-H:162:100:75:20:100:Your father was Beorn.  
-
-H:163:13:76:20:55:9th degree.  
-H:164:25:76:20:60:8th degree.  
-H:165:38:76:20:65:7th degree.  
-H:166:50:76:20:70:6th degree.  
-H:167:63:76:20:75:5th degree.  
-H:168:75:76:20:80:4th degree.  
-H:169:88:76:20:85:3rd degree.  
-H:170:100:76:20:90:2nd degree.  
-
-H:171:100:78:79:50:You are one of several children of 
-
-H:172:50:79:80:50:a Brown Yeek.  
-H:173:75:79:80:50:a Blue Yeek.  
-H:174:95:79:80:85:a Master Yeek.  
-H:175:100:79:80:120:Boldor, the King of the Yeeks.  
-
-H:176:25:80:81:50:You have pale eyes, 
-H:177:50:80:81:50:You have glowing eyes, 
-H:178:75:80:81:50:You have tiny black eyes, 
-H:179:100:80:81:50:You have shining black eyes, 
-
-H:180:20:81:65:50:no hair at all, 
-H:181:40:81:65:50:short black hair, 
-H:182:60:81:65:50:long black hair, 
-H:183:80:81:65:50:bright red hair, 
-H:184:100:81:65:50:colourless albino hair, 
-
-### Kobold histories replaced by Druadan histories
-
-H:185:100:82:83:50:You are one of several children of 
-
-H:186:40:83:71:50:a Druadan Gatherer.  
-H:187:75:83:71:55:a Druadan Hunter.  
-H:188:95:83:71:65:a Druadan Shaman.  
-H:189:100:83:71:100:Ghan-buri-Ghan.  
-
-H:190:85:84:85:45:You are one of several children 
-H:191:100:84:85:50:You are the first child 
-
-H:192:60:85:50:40:of a Serf.  
-H:193:85:85:50:55:of a Devoted Mercenary.  
-H:194:96:85:50:60:of a Landed Knight.  
-H:195:99:85:50:100:of a Marshal of the Riddermark.  
-H:196:100:85:50:120:of a King of the Mark.  
-
-H:197:100:87:88:89:You are one of several children of 
-
-H:198:30:88:18:20:a Petty-Dwarf Slave.  
-H:199:50:88:18:40:a Petty-Dwarf Thief.  
-H:200:70:88:18:60:a Petty-Dwarf Smith.  
-H:201:90:88:18:75:a Petty-Dwarf Miner.  
-H:202:95:88:18:100:a Petty-Dwarf Shaman.  
-H:203:100:88:18:100:Mim, Betrayer of Turin.  
-
-H:204:85:89:90:50:You are one of many Eagles of Manwe.  
-H:205:100:89:90:60:You are the one of the most known Eagles of Manwe.  
-
-H:206:90:90:0:100:Your back and breast are dark brown, and you have very large wings.  
-H:207:100:90:0:120:Your back and breast are dazzling white, your wings magnificent.  
-
-H:208:10:91:92:20:You are a unnoticed minion of 
-H:209:25:91:92:30:You are a minor servant of 
-H:210:45:91:92:40:You are a subject of 
-H:211:65:91:92:50:You have attached yourself to 
-H:212:85:91:92:65:You are associated with 
-H:213:95:91:92:80:You are a notable follower of 
-H:214:100:91:92:100:You are a celebrated assistant to 
-
-H:215:20:92:93:55:Nessa.  
-H:216:40:92:93:60:Vana.  
-H:217:50:92:93:65:Tulkas.  
-H:218:80:92:93:75:Mandos.  
-H:219:90:92:93:80:Nienna.  
-H:220:95:92:93:90:Varda.  
-H:221:100:92:93:95:Manwe.  
-
-H:222:100:93:94:50:In the past you dwelt on earth in the form of 
-
-H:223:25:94:0:50:various animals.
-H:224:55:94:0:55:a spirit of forest and river.
-H:225:70:94:0:60:a beneficent but unseen force.
-H:226:96:94:0:70:a wise and ancient counsellor.
-H:227:100:94:0:80:a Wizard of legend.
-
-H:228:30:95:96:30:You are of an unknown generation of the Ents.  
-H:229:40:95:96:50:You are of the third generation of the Ents.  
-H:230:60:95:96:60:You are of the second generation of the Ents.  
-H:231:100:95:96:80:You are one of the first beings who awoke on Arda.  
-
-H:232:50:96:0:50:You have green skin and inflexible members.
-H:233:100:96:0:50:You have brown skin and inflexible members.
-
-### Death Mold histories have been replaced by Dragon histories.
-
-H:234:10:100:101:30:You were born in the land of Rhun, 
-H:235:20:100:101:35:You were born in the Misty Mountains, 
-H:236:30:100:101:40:You were born in the Blue Mountains, 
-H:237:40:100:101:45:You were born in Dol Guldur, 
-H:238:50:100:101:50:You were born in Angmar, 
-H:239:60:100:101:50:You were born in Barad-dur, 
-H:240:70:100:101:55:You were born at the foot of the Orodruin, 
-H:241:80:100:101:60:You were born in Angband, 
-H:242:90:100:101:65:You were born in Utumno, 
-H:243:100:100:101:70:You were born in the Void, 
-
-H:244:10:101:102:30:awakened by accident.  
-H:245:20:101:102:35:awakened by hunger.  
-H:246:30:101:102:40:awakened by the glint of jewels.  
-H:247:40:101:102:45:awakened by an unsuspecting traveler.  
-H:248:50:101:102:50:awakened by a corrupt Mage.  
-H:249:60:101:102:50:awakened by an evil Sorcerer.  
-H:250:70:101:102:55:awakened by a powerful evil Wizard.  
-H:251:80:101:102:60:awakened by the Witch-King of Angmar.  
-H:252:90:101:102:65:awakened by Gorthaur.  
-H:253:100:101:102:70:awakened by Melkor Bauglir.  
-
-H:254:100:102:103:50:Since then you have destroyed 
-
-H:255:10:103:104:30:no 
-H:256:20:103:104:35:one weak-willed 
-H:257:30:103:104:40:two 
-H:258:40:103:104:45:three 
-H:259:50:103:104:50:four 
-H:260:60:103:104:50:five 
-H:261:70:103:104:55:about twenty 
-H:262:80:103:104:60:dozens of 
-H:263:90:103:104:65:hundreds of 
-H:264:100:103:104:70:uncounted multitudes of 
-
-H:265:100:104:0:50:enemies of the Dark.
-
-### Easterling histories added in the Theme module
-
-H:266:50:105:106:50:You are one of many children of 
-H:267:100:105:106:50:You are the only child of 
-
-H:268:20:106:107:35:an Easterling slave. 
-H:269:30:106:107:40:an Easterling landlord. 
-H:270:40:106:107:45:an Easterling squire. 
-H:271:50:106:107:50:an Easterling warrior. 
-H:272:60:106:107:55:a Wainrider from Near Harad. 
-H:273:70:106:107:60:a warlord from Far Harad. 
-H:274:80:106:107:65:a Corsair of Umbar. 
-H:275:90:106:107:70:Ulfast, son of Ulfang. 
-H:276:100:106:107:75:Ulwarth, son of Ulfang. 
-
-H:277:25:107:108:10:You have brown eyes, 
-H:278:50:107:108:30:You have piercing black eyes, 
-H:279:100:107:108:60:You have alert yellow eyes, 
-
-H:280:50:108:0:25:chestnut brown hair, and a dark complexion.
-H:281:100:108:0:50:jet-black hair, and a dark complexion.
-
-H:282:40:109:110:60:You have only recently been corrupted, 
-H:283:60:109:110:70:You've been corrupted for quite a while, 
-H:284:100:109:110:80:You were one of the first beings to be corrupted, 
-
-H:285:40:110:111:60:and your entire being detests this fact. 
-H:286:60:110:111:70:but you don't mind it so much anymore. 
-H:287:100:110:111:80:and you consider that to have been your true birth. 
-
-H:288:40:111:112:60:Your watery green eyes 
-H:289:60:111:112:70:Your piercing black eyes 
-H:290:100:111:112:80:Your glowing red eyes 
-
-H:291:40:112:0:60:radiate miserable servility.
-H:292:60:112:0:70:radiate contempt.
-H:293:100:112:0:80:radiate pure evil.
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# M:N:idx:color:Meta class name
-# M:C:class name
-
-I:
-
-M:N:0:U:Classes       -- The Classes of Middle-earth
-M:C:Warrior
-M:C:Archer
-M:C:Rogue
-M:C:Mage
-M:C:Priest
-M:C:Loremaster
-M:C:Pacifist
diff --git a/lib/mods/theme/edit/qrand1.map b/lib/mods/theme/edit/qrand1.map
index f42cbf1c..041e221c 100644
--- a/lib/mods/theme/edit/qrand1.map
+++ b/lib/mods/theme/edit/qrand1.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
diff --git a/lib/mods/theme/edit/qrand10.map b/lib/mods/theme/edit/qrand10.map
index ae45b9cb..cfe57e16 100644
--- a/lib/mods/theme/edit/qrand10.map
+++ b/lib/mods/theme/edit/qrand10.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:2056:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
@@ -26,11 +23,11 @@ F:F:85:12
 D:                   
 D:      xxxxxxx      
 D:      xFFFFFx      
-D: xxxxxx,t.ttxxxx   
-D: xFFG,t....t,,,xxx 
-D: xFpG.......t.t.DD 
-D: xFFG,t....t,,,xxx 
-D: xxxxxx,t.ttxxxx   
+D: xxxxxx,....xxxx   
+D: xFFG,......,,,xxx 
+D: xFpG...........DD 
+D: xFFG,......,,,xxx 
+D: xxxxxx,....xxxx   
 D:      xFFFFFx      
 D:      xxxxxxx      
 D:                   
diff --git a/lib/mods/theme/edit/qrand11.map b/lib/mods/theme/edit/qrand11.map
index 4af3c266..67d5258a 100644
--- a/lib/mods/theme/edit/qrand11.map
+++ b/lib/mods/theme/edit/qrand11.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:L:85:6
 
diff --git a/lib/mods/theme/edit/qrand12.map b/lib/mods/theme/edit/qrand12.map
index 4621ef0b..f24a7927 100644
--- a/lib/mods/theme/edit/qrand12.map
+++ b/lib/mods/theme/edit/qrand12.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:187:6
 
diff --git a/lib/mods/theme/edit/qrand14.map b/lib/mods/theme/edit/qrand14.map
index 9f339db0..ee6e8975 100644
--- a/lib/mods/theme/edit/qrand14.map
+++ b/lib/mods/theme/edit/qrand14.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/mods/theme/edit/qrand6.map b/lib/mods/theme/edit/qrand6.map
index 3b55e985..407a9083 100644
--- a/lib/mods/theme/edit/qrand6.map
+++ b/lib/mods/theme/edit/qrand6.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/mods/theme/edit/qrand7.map b/lib/mods/theme/edit/qrand7.map
index a7c0607f..4da79778 100644
--- a/lib/mods/theme/edit/qrand7.map
+++ b/lib/mods/theme/edit/qrand7.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
@@ -26,10 +23,10 @@ F:W:84:6
 F:w:187:6
 
 # Dungeon wayout
-D:ttttt      
-D:tGGGt  ,x, 
-D:tGpGt  x,x 
-D:tGGGt  ,x, 
-D:ttttt      
+D:           
+D: GGG   ,x, 
+D: GpG   x,x 
+D: GGG   ,x, 
+D:           
 D:      ,x,  
 D:           
diff --git a/lib/mods/theme/edit/r_info.txt b/lib/mods/theme/edit/r_info.txt
index 18bf6643..2f6ab2fe 100644
--- a/lib/mods/theme/edit/r_info.txt
+++ b/lib/mods/theme/edit/r_info.txt
@@ -130,6 +130,7 @@
 # S: spell frequency |
 # S: spell type | spell type | etc
 # D: Description
+# A: a_ptr_index : %chance
 
 # 'N' indicates the beginning of an entry. The serial number must
 # increase for each new item. Entry 0 is used for the player.
@@ -200,10 +201,18 @@ E:1:1:1:2:1:1
 O:1:1:1:1
 B:BEG:*
 B:TOUCH:EAT_GOLD
-F:MALE | EVIL | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 |  FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He looks squalid and thoroughly revolting. 
 
 N:2:Scrawny cat
@@ -213,9 +222,16 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d1
-F:RAND_25 | WILD_GRASS | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
 D:A skinny little furball with sharp claws. 
 
 N:3:Sparrow
@@ -225,9 +241,18 @@ W:0:3:90:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:Utterly harmless, except when angry. 
 
 N:4:Chaffinch
@@ -237,9 +262,19 @@ W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | AQUATIC 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Utterly harmless, except when angry. 
 
 N:5:Wild rabbit
@@ -249,9 +284,16 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_50
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It is not a carnivore, but will defend itself if you stray too 
 D:close. 
 
@@ -262,11 +304,21 @@ W:0:1:1000:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:MALE | WILD_ONLY | WILD_WOOD |
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | HAS_LITE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET |
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_WOOD
 D:He has a strong axe with a sharp edge. 
 
 N:7:Scruffy little dog
@@ -276,8 +328,15 @@ W:0:3:300:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:A thin flea-ridden mutt, growling as you get close. 
 
 N:8:Farmer Maggot
@@ -286,12 +345,23 @@ I:110:35d10:40:10:3
 W:0:4:730:0
 E:0:1:1:2:1:1
 O:0:100:0:0
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | NO_TARGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
 F:NEVER_MOVE
-F:OPEN_DOOR | BASH_DOOR | SPECIAL_GENE
-F:NEUTRAL | NO_TARGET | NO_DEATH
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:NO_DEATH
+F:NO_TARGET
+F:NO_TARGET
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:A broad and thick-set hobbit with a round red face. "There's earth under
 D:his old feet, and clay on his fingers; wisdom in his bones, and both his 
 D:eyes are open." He seems sad about something.
@@ -303,9 +373,18 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He tends to blubber a lot. 
 
 N:10:Boil-covered wretch
@@ -315,10 +394,20 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY |
-F:RAND_25 | DROP_1D2 | NEUTRAL | NO_TARGET
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Ugly doesn't begin to describe him. 
 
 N:11:Village idiot
@@ -328,9 +417,18 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Drooling and comical, he runs around town with a stupid grin. 
 
 N:12:Pitiful-looking beggar
@@ -340,10 +438,19 @@ W:0:1:1300:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You just can't help feeling sorry for him. 
 
 N:13:Mangy-looking leper
@@ -354,10 +461,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
 B:TOUCH:DISEASE
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You feel it isn't safe to touch him. 
 
 N:14:Agent of the black market
@@ -369,11 +485,21 @@ O:25:50:20:5
 B:HIT:HURT:1d6
 B:TOUCH:EAT_ITEM
 B:INSULT:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:DROP_60 | WILD_TOWN |
-F:WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:He 'finds' new wares for the Black Market. From unwary adventurers. 
 
 N:15:Singing, happy drunk
@@ -383,11 +509,21 @@ W:0:1:1100:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE |
-F:RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NEUTRAL | NO_TARGET
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He makes you glad to be sober. 
 
 N:16:Aimless-looking merchant
@@ -397,10 +533,21 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:MALE | RAND_50 | 
-F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NEUTRAL | NO_TARGET
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:The typical ponce around town, with purse jingling, and looking for more 
 D:amulets of adornment to buy. 
 
@@ -411,10 +558,21 @@ W:0:1:1700:0
 E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_GRASS | WILD_TOWN | WILD_WOOD | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:No job is too low for him. 
 
 N:18:Battle-scarred veteran
@@ -424,10 +582,18 @@ W:0:1:1650:0
 E:1:1:1:2:1:1
 O:25:50:25:0
 B:HIT:HURT:2d6
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't take to strangers kindly. 
 
 N:19:The Squint-eyed Southerner
@@ -440,9 +606,20 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:PUNCH:HURT:3d8
 B:PUNCH:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK | BASEANGBAND | HAS_LITE |
-F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_RANDART | MORTAL
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_RANDART
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't look like he's from around here, and a gut 
 D:feeling tells you he's a spy.
 
@@ -456,11 +633,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A small strange growth. 
 
 N:21:Large white snake
@@ -471,9 +653,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:CRUSH:HURT:1d1
-F:RAND_50 | WILD_TOO |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is about eight feet long. 
 
 N:22:Grey mushroom patch
@@ -483,10 +670,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 N:23:Newt
@@ -497,9 +689,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:WEIRD_MIND | CAN_SWIM | WILD_TOO | DROP_CORPSE | 
-F:WILD_GRASS | WILD_WASTE | WILD_SHORE | WILD_MOUNTAIN |
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
 D:A small, harmless lizard. 
 
 # New monster added by furiosity for the Theme module
@@ -513,9 +713,21 @@ B:KICK:HURT:10d10
 B:KICK:HURT:10d10
 B:BUTT:HURT:10d10
 B:BUTT:HURT:10d10
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS 
-F:FRIEND | FRIENDS | FORCE_SLEEP | STUPID | WEIRD_MIND | 
-F:SUSCEP_POIS | KILL_BODY | NEUTRAL | NO_TARGET | KILL_ITEM | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:STUPID
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:A strong and powerful animal with sharp-looking horns. Large cattle 
 D:used to carry and draw burdens, and for milk and meat. It is domestic and 
 D:utterly harmless, except when angry. 
@@ -531,9 +743,21 @@ B:KICK:HURT:20d20
 B:KICK:HURT:20d20
 B:KICK:HURT:20d20
 B:KICK:HURT:20d20
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | GOOD | 
-F:KILL_BODY | NEUTRAL | NO_TARGET | KILL_ITEM | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:GOOD
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:The oxen that live on the lands around the Sea of Rhun are hardier 
 D:and wilder than any others in Middle-earth. Legends claim that they 
 D:are descended from the cattle of the Huntsman of the Valar, Orome 
@@ -552,8 +776,18 @@ B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:Woolly grazing animals, especially common on the Barrow-downs 
 D:and in the Vales of Anduin. Utterly harmless unless angered.
 
@@ -564,10 +798,13 @@ W:1:1:600:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | WILD_TOO | WILD_GRASS |
-F:CAN_SWIM |
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND |
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
 S:MULTIPLY
 D:It is about three feet long, with large teeth. 
 
@@ -579,9 +816,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:CRUSH:HURT:1d4
-F:RAND_25 | CAN_SWIM |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
 D:It is about eight feet long. 
 
 # New monster added by furiosity for the Theme module
@@ -595,8 +837,16 @@ B:KICK:HURT:10d12
 B:KICK:HURT:10d12
 B:KICK:HURT:10d12
 B:KICK:HURT:10d12
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | NEUTRAL | NO_TARGET | GOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:The great Mearas are legendary horses bred by the Rohirrim.
 D:Swift and sure they are, but only members of the royal 
 D:family of Rohan are allowed to ride them. This animal will 
@@ -613,8 +863,17 @@ B:KICK:HURT:8d10
 B:KICK:HURT:8d10
 B:KICK:HURT:8d10
 B:KICK:HURT:8d10
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | WILD_TOWN | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
 D:Beasts of burden and transport used by Elves and Men through the ages. 
 D:A noble animal, it can be quite a sight as it prances gracefully 
 D:through the fields. It won't attack you unless provoked.
@@ -626,10 +885,17 @@ W:1:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | HURT_LITE | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -640,8 +906,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
 D:A disembodied eye, floating a few feet above the ground. 
 
 N:33:Rock lizard
@@ -651,9 +920,13 @@ W:1:1:100:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is a small lizard with a hardened hide. 
 
 # New monster added by furiosity for the Theme module
@@ -666,8 +939,15 @@ O:0:0:0:0
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_TOO | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | WILD_WOOD | UNIQUE | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A monstrous beast that inhabited Everholt in the Firien Wood, 
 D:around the feet of the Halifirien in the White Mountains. It 
 D:is twice the size of a regular boar, and twice as aggressive. 
@@ -680,9 +960,14 @@ W:1:1:400:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:FRIENDS |
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a yapping snarling wild dog, dangerous when in a pack. 
 
 N:36:Soldier ant
@@ -692,9 +977,13 @@ W:1:1:300:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | WILD_TOO | WILD_GRASS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:A large ant with powerful mandibles. 
 
 N:37:Fruit bat
@@ -704,8 +993,13 @@ W:1:1:20:1
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE
-F:MORTAL | BASEANGBAND | AI_ANNOY
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving pest. 
 
 N:38:Insect swarm
@@ -716,9 +1010,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:STING:HURT:1d1
-F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_TOO | WILD_GRASS |
-F:WILD_WOOD | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A lone insect may be harmless, but there's a whole swarm of 
 D:them here! 
 
@@ -731,8 +1032,14 @@ E:0:1:0:2:1:2
 O:0:0:0:0
 B:BUTT:HURT:3d3
 B:BUTT:HURT:3d3
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_TOO | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | WILD_WOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:Aggressive tusked beasts common to woodland regions.
 
 N:40:Shrieker mushroom patch
@@ -741,11 +1048,19 @@ I:110:1d1:4:1:0
 W:2:1:40:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | WILD_TOO | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:Yum!  It looks quite tasty.  It doesn't sound so nice, though. 
 
@@ -760,8 +1075,18 @@ B:KICK:HURT:7d7
 B:BUTT:HURT:7d7
 B:KICK:HURT:7d7
 B:BUTT:HURT:7d7
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:Domestic horned beasts kept throughout Middle-earth. 
 D:Utterly harmless, unless angered.
 
@@ -776,7 +1101,7 @@ D:Utterly harmless, unless angered.
 #B:KICK:HURT:4d5
 #B:KICK:HURT:4d5
 #B:KICK:HURT:4d5
-#F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
+#F:ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS |
 #F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | WILD_TOWN | 
 #D:It's a short, stocky pack animal, related to the horse, but smaller. 
 #D:A common beast of burden in Middle-earth, especially used by Hobbits 
@@ -790,10 +1115,15 @@ E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 N:44:Novice rogue
@@ -804,10 +1134,16 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:45:Novice priest
@@ -817,13 +1153,21 @@ W:2:1:1500:6
 E:1:1:1:2:1:1
 O:25:0:50:20
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:46:Novice mage
@@ -833,13 +1177,21 @@ W:2:1:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:47:Yellow mushroom patch
@@ -849,11 +1201,16 @@ W:2:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d6
-F:NEVER_MOVE | WILD_TOO | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:48:White jelly
@@ -863,10 +1220,16 @@ W:2:1:2000:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It's a large pile of white flesh. 
 
 N:49:Giant black ant
@@ -876,10 +1239,15 @@ W:2:1:500:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:WEIRD_MIND | DROP_SKELETON | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is about three feet long. 
 
 N:50:Salamander
@@ -889,9 +1257,15 @@ W:2:1:100:10
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:RAND_25 | CAN_SWIM | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | SUSCEP_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A small black and orange lizard. 
 
 N:51:White harpy
@@ -903,8 +1277,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d1
 B:CLAW:HURT:1d1
 B:BITE:HURT:1d2
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | 
-F:RAND_50 | DROP_CORPSE | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A flying, screeching bird with a woman's face. 
 
 # New monster added by furiosity for the Theme module
@@ -918,8 +1299,17 @@ B:KICK:HURT:8d8
 B:BUTT:HURT:8d8
 B:KICK:HURT:8d8
 B:BUTT:HURT:8d8
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | WILD_WOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Graceful creature found throughout Middle-earth. Deer are 
 D:traditionally dedicated to the Vala Nessa, and are said to 
 D:follow her as she travels through the wild lands. They will 
@@ -932,10 +1322,14 @@ W:2:2:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR | ANIMAL
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -946,10 +1340,14 @@ W:2:2:650:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -960,10 +1358,14 @@ W:2:2:700:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -974,9 +1376,13 @@ W:2:1:200:6
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_25 | WILD_ONLY | WILD_SHORE | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_SHORE
 D:It is as big as a wolf. 
 
 # New monster added by furiosity for the Theme module
@@ -989,8 +1395,15 @@ O:0:0:0:0
 B:BITE:TERRIFY:2d8
 B:CLAW:HURT:2d16
 B:CLAW:HURT:2d16
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:Master of all felines, it's a huge cat with enormous paws 
 D:and a thick mane. Its roar is deafeningly terrifying.
 
@@ -1001,11 +1414,17 @@ W:2:1:40:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_ACID | CAN_SWIM | 
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_ACID
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1017,8 +1436,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:HURT:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:60:Cave spider
@@ -1028,10 +1454,15 @@ W:2:1:400:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:FRIENDS | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | SPIDER | HURT_LITE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
 D:It is a black spider that moves in fits and starts. 
 
 N:61:Crow
@@ -1042,8 +1473,14 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, gray except for the black wings and head. 
 
 N:62:Wild cat
@@ -1054,8 +1491,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:BASH_DOOR | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_TOO
 D:A larger than normal feline, hissing loudly. Its velvet claws conceal a 
 D:fistful of needles. 
 
@@ -1067,13 +1508,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:TOUCH:EAT_GOLD
 B:BITE:HURT:2d4
-F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | DROP_CHOSEN | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
-F:EVIL | BASEANGBAND
-S:1_IN_25 |
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+S:1_IN_25
 S:S_SPIDER
 D:Also known as Gollum.  He is of the Periannath, but does not look it. 
 D:He is thin and frail, sneaking around in dark corners, hoping to 
@@ -1086,10 +1542,18 @@ W:3:2:300:4
 E:0:0:0:0:0:0
 O:50:0:25:20
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | DROP_90 | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_90
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
 D:It's green and it's oozing. 
 
 N:65:Poltergeist
@@ -1099,12 +1563,24 @@ W:3:1:0:8
 E:0:0:0:0:0:0
 O:50:5:30:10
 B:TOUCH:TERRIFY
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:DROP_60 | DROP_90 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | TAKE_ITEM | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
 S:BLINK
 D:It is a ghastly, ghostly form. 
 
@@ -1115,11 +1591,17 @@ W:3:1:2000:12
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It's a large pile of yellow flesh. 
 
@@ -1131,9 +1613,15 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A funny chittering creature, looking for nuts. 
 
 N:68:Raven
@@ -1144,8 +1632,17 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
-F:ANIMAL | WILD_ONLY | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | NEUTRAL | NO_TARGET | IMPRESED | BASEANGBAND | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_ONLY
+F:WILD_WOOD
 D:Larger than a crow, and pitch black. 
 
 N:69:White midge
@@ -1155,8 +1652,12 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is an evil relative of the moth, native to marshlands.
 
@@ -1170,8 +1671,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:6d1
 B:BITE:HURT:7d1
-F:WILD_TOO | WILD_WOOD | DROP_CORPSE | CAN_FLY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:An ominous-looking squirrel with dark fur, covered in 
 D:leaves for better masquerade. It has glowing eyes and 
 D:unusually sharp teeth. It is a horrific creation of the 
@@ -1185,10 +1690,14 @@ W:3:1:1700:20
 E:0:0:0:0:1:0
 O:0:75:20:5
 B:CRUSH:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
 D:A large black serpent's body with a female torso. 
 
 N:72:Spotted mushroom patch
@@ -1198,10 +1707,15 @@ W:3:1:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:2d4
-F:NEVER_MOVE | WILD_TOO | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:73:Silver jelly
@@ -1212,11 +1726,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_LITE:1d3
 B:TOUCH:EAT_LITE:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND |
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It is a large pile of silver flesh that sucks all light from its 
 D:surroundings. 
@@ -1229,10 +1749,14 @@ E:1:1:1:2:1:1
 O:0:50:0:40
 B:HIT:HURT:1d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A short little guy, in bedraggled clothes. He appears to be looking 
 D:for a good tavern. 
 
@@ -1243,9 +1767,13 @@ W:3:1:800:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is about two feet long and has sharp pincers. 
 
 N:76:Yellow mold
@@ -1255,10 +1783,14 @@ W:3:1:30:9
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 # New monster added by furiosity for the Theme module
@@ -1271,8 +1803,13 @@ O:0:0:0:0
 B:BITE:HURT:2d2
 B:BITE:DISEASE:1d1
 B:BITE:EAT_FOOD:1d1
-F:BASEANGBAND | ANIMAL | MORTAL | AI_ANNOY | 
-F:RAND_50 | RAND_25 | SMART | WEIRD_MIND | 
+F:AI_ANNOY
+F:ANIMAL
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:SMART
+F:WEIRD_MIND
 S:1_IN_10
 S:SHRIEK
 D:A large humanoid form, relatively rare on Middle-earth.
@@ -1285,10 +1822,16 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:LOSE_DEX:1d3
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1299,12 +1842,19 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | INVISIBLE | 
-F:ANIMAL | 
-F:IM_POIS | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:INVISIBLE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of poisonous worms. 
 
@@ -1315,9 +1865,13 @@ W:3:1:500:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:LOSE_STR:1d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+S:1_IN_11
 S:DRAIN_MANA
 D:A disembodied eye, crackling with energy. 
 
@@ -1328,8 +1882,14 @@ W:4:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:BLIND
-F:EMPTY_MIND | CAN_FLY | NONLIVING | SUSCEP_ELEC | 
-F:BASEANGBAND | HAS_LITE | RAND_50 | RAND_25 | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:NONLIVING
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:SUSCEP_ELEC
 D:A fast-moving bright light, apparently totally random in its movement. 
 
 N:82:Cave lizard
@@ -1339,8 +1899,15 @@ W:4:1:100:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
-F:ANIMAL | CAN_SWIM | DROP_CORPSE | HAS_EGG | WILD_ONLY
-F:MORTAL | NEUTRAL | NO_TARGET | IMPRESED | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_ONLY
 D:It is an armoured lizard with a powerful bite. 
 
 N:83:Novice ranger
@@ -1351,13 +1918,20 @@ E:1:1:1:2:1:1
 O:25:45:25:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:84:Blue jelly
@@ -1367,10 +1941,18 @@ W:4:1:2000:14
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:COLD:1d6
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
 D:It's a large pile of pulsing blue flesh. 
 
 N:85:Creeping copper coins
@@ -1381,10 +1963,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:TOUCH:POISON:2d4
-F:ONLY_GOLD | DROP_1D2 | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | CHAR_MULTI | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of copper coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1395,8 +1984,9 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d3
-F:RAND_25 | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a very vicious rodent. 
 
@@ -1407,11 +1997,21 @@ W:4:1:900:15
 E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:Immature Orcling, running wild and screaming all the time. 
 
 N:88:Swordfish
@@ -1422,8 +2022,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fish with a swordlike "beak". 
 
 N:89:Blue worm mass
@@ -1433,11 +2036,19 @@ W:4:1:40:5
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | COLD_BLOOD | 
-F:ANIMAL | IM_COLD | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:COLD_BLOOD
+F:HURT_LITE
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1449,8 +2060,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
 B:CRUSH:HURT:1d8
-F:RAND_25 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | WILD_TOO | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 # New monster added by furiosity for the Theme module
@@ -1464,14 +2082,31 @@ O:30:50:20:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | TAKE_ITEM | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:MISSILE
 D:A person with no love for Gondor. He thinks you are a soldier in  
 D:the King's army.
 
@@ -1486,12 +2121,20 @@ O:80:10:10:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:POISON:2d8
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_2D2 | SUSCEP_ELEC | FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:ARROW_1 | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_ELEC
+F:TAKE_ITEM
+S:1_IN_5
+S:ARROW_1
 D:A person with no love for Rohan. He thinks you are a Rider of the 
 D:Mark in disguise.
 
@@ -1502,13 +2145,22 @@ W:6:2:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:94:Green naga
@@ -1519,10 +2171,18 @@ E:0:0:0:0:1:0
 O:0:25:0:65
 B:CRUSH:HURT:1d8
 B:SPIT:ACID:2d6
-F:FEMALE | 
-F:RAND_25 | TAKE_ITEM | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:EVIL | IM_ACID | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large green serpent with a female torso. Her green skin glistens with 
 D:acid. 
 
@@ -1534,7 +2194,10 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:3d1
 B:BITE:HURT:3d1
-F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25 | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:RAND_25
+F:WEIRD_MIND
 D:Yech! The disgusting thing only wants your blood! 
 
 N:96:Barracuda
@@ -1545,8 +2208,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A predatory fish with razor-sharp teeth. 
 
 N:97:Novice paladin
@@ -1557,13 +2223,20 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:An adventurer both devoutly religious and skillful in combat.  
 D:He seems to consider you an agent of Morgoth. 
 
@@ -1577,10 +2250,19 @@ O:30:70:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | MALE | 
-F:EVIL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:WILD_TOO
+F:WILD_WOOD
 D:A dark-skinned human who worships Sauron. A powerful warrior, 
 D:almost as strong as a troll. He has bizarre white eyes. 
 
@@ -1591,10 +2273,18 @@ W:5:1:300:7
 E:0:0:0:0:0:0
 O:45:20:20:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | DROP_60 | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | SUSCEP_FIRE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
 D:It's blue and it's oozing. 
 
 N:100:Green glutton ghost
@@ -1604,10 +2294,19 @@ W:5:1:0:15
 E:0:0:0:0:0:0
 O:30:30:30:5
 B:TOUCH:EAT_FOOD:1d1
-F:RAND_50 | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:UNDEAD
 D:It is a very ugly green ghost with a voracious appetite. 
 
 N:101:Green jelly
@@ -1617,10 +2316,16 @@ W:5:1:2500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:1d2
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_ACID | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of pulsing green flesh. 
 
 # New monster added for the Theme module
@@ -1634,9 +2339,22 @@ O:0:50:0:50
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:BASEANGBAND | UNIQUE | FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:EVIL | ORC | OPEN_DOOR | BASH_DOOR | IM_FIRE | IM_COLD | 
-F:IM_POIS | ESCORT | ESCORTS | DROP_1D2 | DROP_GOOD | MALE | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:ORC
+F:SMART
+F:UNIQUE
 D:A strong and cunning orc warrior, a commander of Saruman's orcs. 
 
 # New monster added for the Theme module
@@ -1650,19 +2368,50 @@ O:0:45:45:10
 B:INSULT:INSANITY:2d10
 B:INSULT:EAT_GOLD:2d10
 B:INSULT:EAT_ITEM:2d10
-F:MALE | SMART | CAN_SPEAK | JOKEANGBAND | 
-F:FORCE_MAXHP |
-F:RAND_25 |
-F:DROP_90 | DROP_GOOD | DROP_GREAT |
-F:DROP_4D2 | DROP_2D2 | ONLY_ITEM | AI_ANNOY | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | KILL_BODY | RES_NETH | RES_DISE |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | HAS_LITE | NO_CUT | NO_STUN |
-F:REFLECTING |
-S:1_IN_5 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_2 | FORGET | TRAPS | 
-S:BO_MANA | ROCKET |
+F:AI_ANNOY
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_90
+F:DROP_GOOD
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RAND_25
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_MANA
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:ROCKET
+S:SCARE
+S:TELE_AWAY
+S:TPORT
 D:This annoying little gnome won't stop bragging about his great 
 D:magical powers and shiny new equipment--unless someone silences 
 D:him permanently.  Unfortunately, your own weapons and spells  
@@ -1675,10 +2424,15 @@ W:5:2:500:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:UN_BONUS
-F:ATTR_MULTI | ATTR_ANY | RES_DISE | DROP_CORPSE | 
-F:NEVER_MOVE | CAN_FLY | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
-S:1_IN_9 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+F:RES_DISE
+S:1_IN_9
 S:DRAIN_MANA
 D:A disembodied eye, crackling with magic. 
 
@@ -1689,11 +2443,19 @@ W:5:1:40:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:FIRE:1d6
-F:RAND_50 | RAND_25 | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_COLD
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1704,8 +2466,16 @@ W:5:1:200:15
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d4
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | BASH_DOOR | 
-F:ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It has a copper head and sharp venomous fangs. 
 
 N:107:Death sword
@@ -1718,10 +2488,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:NEVER_MOVE | NONLIVING | NO_FEAR | SUSCEP_ACID |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | EVIL | IM_COLD | IM_FIRE | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_ACID
 D:A bloodthirsty blade lurking for prey. Beware! 
 
 N:108:Purple mushroom patch
@@ -1733,9 +2518,14 @@ O:0:0:0:0
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yuck!  It doesn't look so tasty. 
 
 N:109:Apprentice priest
@@ -1745,13 +2535,22 @@ W:6:2:1500:6
 E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:1d5
-F:MALE | GOOD |
-F:FORCE_SLEEP |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:110:Apprentice warrior
@@ -1762,10 +2561,16 @@ E:1:1:1:2:1:1
 O:0:95:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 # New monster added for the Theme module
@@ -1776,10 +2581,13 @@ I:110:6d6:25:80:200
 W:8:4:0:30
 B:HIT:HURT:3d4
 B:TOUCH:EAT_GOLD
-F:MALE
-F:DROP_1D2 | DROP_GOOD
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_GOOD
 F:EVIL
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_8
 S:ARROW_1
 D:A filthy little dwarf. He wants your purse, and judging by the 
@@ -1793,13 +2601,19 @@ I:120:7d10:20:16:20
 W:10:1:0:50
 B:HIT:HURT:1d6
 B:HIT:HURT:UN_BONUS:1d6
-F:MALE
-F:FORCE_SLEEP
-F:ONLY_ITEM | DROP_1D2
-F:OPEN_DOOR | BASH_DOOR
+F:BASH_DOOR
+F:DROP_1D2
 F:EVIL
+F:FORCE_SLEEP
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
 S:1_IN_5
-S:BLIND | CONF | MISSILE | DARKNESS | BA_POIS
+S:BA_POIS
+S:BLIND
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A small dwarf in mage's robes. He looks comical, but he has slain any 
 D:adventurer foolish enough to laugh at him.
 
@@ -1810,10 +2624,15 @@ W:6:1:50:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange brown growth on the dungeon floor. 
 
 N:114:Giant brown bat
@@ -1823,9 +2642,15 @@ W:6:1:600:10
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | DROP_CORPSE | AI_ANNOY
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It screeches as it attacks. 
 
 # New monster added by furiosity for the Theme module
@@ -1835,8 +2660,17 @@ I:120:1d1:6:5:10
 W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:RAND_50 | RAND_25 | NEUTRAL | NO_TARGET | WILD_ONLY | WILD_WOOD | NEVER_BLOW | 
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND | WILD_GRASS | 
+F:ANIMAL
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NO_TARGET
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A large insect with beautiful fluttering wings.
 
 N:116:Apprentice rogue
@@ -1847,10 +2681,17 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | FRIENDS | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:117:Creeping silver coins
@@ -1861,9 +2702,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:TOUCH:POISON:2d6
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | SUSCEP_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of silver coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1874,11 +2724,19 @@ W:6:1:1600:15
 E:1:1:1:2:1:1
 O:20:50:5:15
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
 D:goblin. 
 
@@ -1889,8 +2747,16 @@ W:6:1:200:20
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d5
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is recognised by the hard-scaled end of its body that is often rattled 
 D:to frighten its prey. 
 
@@ -1902,9 +2768,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:ACID:2d4
 B:BITE:ACID:2d6
-F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM |  WILD_TOO |
-F:DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:WILD_TOO
 S:1_IN_10
 S:BR_ACID
 D:It is slowly making its way towards you, eating everything in 
@@ -1917,9 +2788,13 @@ W:7:1:200:16
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:2d4
-F:RAND_50 | WILD_ONLY | WILD_SHORE | 
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_ONLY
+F:WILD_SHORE
 D:It looks poisonous. 
 
 N:122:Dark elf
@@ -1930,13 +2805,20 @@ E:1:1:1:2:1:1
 O:20:20:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:CONF | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+S:1_IN_10
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:An elven figure with jet black skin and white hair, his eyes are large and 
 D:twisted with evil. 
 
@@ -1948,8 +2830,15 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d1
-F:RAND_50 | RAND_25 | HURT_LITE | WILD_TOO | WILD_WOOD | 
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND | WILD_GRASS | 
+F:ANIMAL
+F:HURT_LITE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 S:MULTIPLY
 D:Nocturnal insect of a kind closely related to butterflies.
 
@@ -1962,12 +2851,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:POISON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
 F:RAND_25
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | 
-F:NO_CONF | NO_SLEEP | HURT_LITE | BASEANGBAND | NO_CUT
+F:UNDEAD
 S:1_IN_10
-S:CAUSE_1 | S_UNDEAD
+S:CAUSE_1
+S:S_UNDEAD
 D:A frightening skeletal figure in a black robe. 
 
 N:125:Rotting corpse
@@ -1978,9 +2877,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:POISON:1d3
 B:CLAW:POISON:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | EMPTY_MIND | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:Corpses awakened from their sleep by dark sorcery. 
 
 N:126:Cave orc
@@ -1990,11 +2899,18 @@ W:7:1:1900:20
 E:1:1:1:2:1:1
 O:20:70:0:0
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is often found in huge numbers in deep caves. 
 
 N:127:Wood spider
@@ -2005,10 +2921,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:POISON:1d4
-F:FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_WOOD | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:It scuttles towards you. 
 
 N:128:Hurog
@@ -2018,10 +2940,14 @@ W:7:2:300:16
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND | 
-S:1_IN_50 | 
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+S:1_IN_50
 S:BR_NETH
 D:A minor demonic servant of evil. Its features remind you of a dog - in fact, 
 D:Huroeg are the result of the corruption of dogs by Morgoth. 
@@ -2033,9 +2959,13 @@ W:7:3:550:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:BLIND:2d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
 S:DRAIN_MANA
 D:A disembodied eye, bloodshot and nasty. 
 
@@ -2047,10 +2977,17 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:1d10
 B:BITE:LOSE_STR:1d4
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_60 | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large red snake with a woman's torso. 
 
 N:131:Red jelly
@@ -2060,10 +2997,15 @@ W:7:1:2500:26
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:1d5
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:HURT_LITE |  CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pulsating mound of red flesh. 
 
 # New monster added by furiosity for the Theme module
@@ -2073,9 +3015,18 @@ I:110:1d1:30:1:10
 W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | NEVER_BLOW | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND | DG_CURSE | 
+F:ANIMAL
+F:CAN_FLY
+F:DG_CURSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Small brown birds of thrush kind, famous for their clear 
 D:singing, and the fact that they will sing during the night 
 D:as well as the day (hence their name). Since the days of 
@@ -2091,12 +3042,23 @@ E:0:0:0:0:0:0
 O:60:0:25:0
 B:HIT:HURT:2d2
 B:TOUCH:LOSE_WIS
-F:RAND_50 | DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is almost insubstantial. 
 
 N:134:Night lizard
@@ -2107,8 +3069,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_SWIM | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
 D:It is a black lizard with overlapping scales and a powerful jaw. 
 
 # New monster added by furiosity for the Theme module
@@ -2121,8 +3087,16 @@ O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
 B:BITE:DISEASE:1d4
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE | WILD_SHORE | 
-F:MORTAL | HAS_EGG | BASEANGBAND | EVIL | WILD_SWAMP | IMPRESED | 
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, camouflaged well for a swampland or forest. 
 D:It is a carrion bird that often lives close alongside the mewlips, 
 D:the remains of whose prey it devours.
@@ -2134,10 +3108,19 @@ W:8:1:1700:26
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d5
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an animated orc skeleton. 
 
 N:137:Grima the Wormtongue, Agent of Saruman
@@ -2150,14 +3133,28 @@ B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_5
+S:BA_POIS
+S:BO_COLD
+S:HEAL
+S:SLOW
 D:He was once the chief counsellor to King Theoden of Rohan. 
 D:He betrayed king and country by becoming a spy for the 
 D:corrupted Istari Saruman. 
@@ -2172,12 +3169,29 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM