--- a/www/wizards.txt	Sat Jul 02 18:25:26 2011 +0300
+++ b/www/wizards.txt	Sat Jul 02 18:35:25 2011 +0300
@@ -68,7 +68,7 @@
 	japanese girl-idols or buying photobooks, he might be fixing some
 	bugs around older areas.$
 
-Kyo;bat;img/kyo.jpg;
+Kyo;;img/kyo.jpg;
 	One of the most established eq-leaders as mortal, Kyo is now
 	rocking the BatWorld as immortal. His first finished project
 	was "Small Meadow" area with G'naa'Byeh in 2007. Several
@@ -253,7 +253,7 @@
 Neth;;img/neth.jpg;
 	Mr. Neth is mostly concentrating on producing new areas for newbies
 	and harder/more difficult content for high-end of the playerbase.
-	Working as an unofficial co-op development team with [b]Enandor[/b].
+	Working as an unofficial co-op development team with ~Enandor~.
 	$
 
 Souc;bat;img/souc.jpg;
@@ -289,22 +289,6 @@
 	some aspects of Heidel's area "Tyr Farwyn".
 	$
 
-Ens;;;
-	Immorted 29 Aug 2010.$
-
-
-############################# WIP ################################
-
-Zhaman;;img/zhaman.jpg;
-	Coder of the "infamous" Kender mansion. Remorted 16 Sep 2008.
-	$
-
-
-Rutaliator;;;
-	Short-time wizard (remorted rather soon after immorting),
-	who worked on small parts of VotK.
-	$
-
 Malitrius;bat;;
 	Malitrius, the mighty wizard from Sweden sports an
 	impressive catalogue of created areas, several events
@@ -332,9 +316,16 @@
 	Check out his wizard homepage for more information.
 	$
 
-Aarugotti;;;
-	Level 200 archwizard. [b]Passed away on Monday, March 13th of 2000
-	at his home.[/b] May he rest in peace.$
+Mordrin;;;Quoteth Wizard Plaque: "A very old wizard, he even used to be an archwizard.
+	The first american archwizard. But after a conflict with the other arches 
+	he removed his legendary Infernal Knights and left Bat. A lot of old players
+	got screwed when he did that, much more screwed then you can imagine.
+	So swallow your tunes, it's nothing compared to Mordrin removing IKs."$
+
+Zilch;;;Quoteth Wizard Plaque: "American archwizard who was one of the
+	driving forces behind completing the conversion in 1996. He left bat
+	short after the conversion, because of all the whines."$
+
 
 Bj;;;
 	Original coder of the Shrine Search quest (LQ 41) and Unholy Cathedral area.
@@ -345,6 +336,80 @@
 	He was last on Sun Feb 08 04:05:11 1998 (9y, 138d, 20h and 28s ago).[br]
 	$
 
+
+Aarugotti;;;
+	Level 200 archwizard. [b]Passed away on Monday, March 13th of 2000
+	at his home.[/b] May he rest in peace.$
+
+
+Era;bat;img/era.jpg;
+	Another all-around wizard, who was also well known as mortal.
+	Has worked on many things, including guild code maintenance
+	and cleanups. Was also previously known as Maggoth.
+	He has a easy to use boon-calculator and some nice triggers
+	for BatClient and TF on his homepage, so check them out.
+	$
+
+Plura;;;
+	The first swedish archwizard and coder of the well-known classic area,
+	"Plura's Castle".
+	[p]
+	[b]UUHUHSSCCAARYY!!! UUHHH!! AHRRUHH!![/b]
+	$
+
+Freld;;;
+	Established leader of parties and well-known player in general,
+	immorted in September 2010 and has since worked on game-balance issues,
+	minor tunes and improvements.$
+
+Grizzt;bat;;
+	One of the quiet codeslaves who work in the shadows, Grizzt's
+	work for the greater good of BatMUD has gone mostly unknown to the
+	general public.
+	[p]
+	As a notable exception to the rule, he did the recoding of ~Saruman~'s
+	popular old area "Wrebies".
+	$
+
+Tarken;;;
+	Known as a "trigger-master" and "Tarken the robot" as mortal,
+	Tarken was practically forced to wizardhood to pay for his
+	sins as a cheater. But as they say, good cheaters make the
+	best wizards...
+	[p]
+	During his wizardly career Tarken has worked on the usual
+	bugfixes, but has mainly concentrated on improving ship code.
+	He is also (as of July 2011) responsible for the Nergal subguild
+	of Lords of Chaos.
+	$
+
+Duke;;;
+	American archwizard. Has coded a lots of stuff, including the
+	legendary Narcuul (and his shards). Famous for his sudden
+	tunes, often ad-libbed as "duketunes".$
+
+################################## WIP ######################################
+################################## WIP ######################################
+################################## WIP ######################################
+
+
+Ens;;;
+	Immorted 29 Aug 2010.$
+
+
+
+Zhaman;;img/zhaman.jpg;
+	Coder of the "infamous" Kender mansion. Remorted 16 Sep 2008.
+	$
+
+
+Rutaliator;;;
+	Short-time wizard (remorted rather soon after immorting),
+	who worked on small parts of VotK.
+	$
+
+
+
 Anipa;;;
 	One of the BatMUD's "God"-level wizards.
 	$
@@ -367,10 +432,10 @@
 
 Jaina;bat;img/jaina.jpg;$
 
-#Mandrake;;bat://fdsa;$
+Mandrake;;;$
 
 Enandor;;;
-	Working as an unofficial co-op development team with [b]Neth[/b].
+	Working as an unofficial co-op development team with ~Neth~.
 	$
 
 Hackop;;img/hackop.jpg;
@@ -384,21 +449,6 @@
 
 Entropy;bat;;Promoter and organizer of Campcon, BatMUD-related mudcon.$
 
-Plura;;;
-	The first swedish archwizard and coder of the well-known classic area,
-	"Plura's Castle".
-	[p]
-	[b]UUHUHSSCCAARYY!!! UUHHH!! AHRRUHH!![/b]
-	$
-
-Era;bat;img/era.jpg;
-	Another all-around wizard, who was also well known as mortal.
-	Has worked on many things, including guild code maintenance
-	and cleanups. Was also previously known as Maggoth.
-	He has a easy to use boon-calculator and some nice triggers
-	for BatClient and TF on his homepage, so check them out.
-	$
-
 Lanfear;;;LQ85 Flying Citadel, alchemist guild, plants, ores.$
 
 Merri;;;Expanded Zoso's Caverns of the Undying, adding Massive iron statue and Listar.$
@@ -413,10 +463,6 @@
 Shardik;;;Was also previously known as Dragonfly.$
 
 
-Duke;;;American archwizard. Has coded a lots of stuff, including the
-	legendary Narcuul (and his shards). Famous for his sudden
-	tunes, often ad-libbed as "duketunes".$
-
 Elwood;;;$
 
 Firefox;;;$
@@ -425,16 +471,6 @@
 Athlestane;;;Athlestane was an ancient wizard, now forgotten.$
 Kultamarja;;;Original creator of Club Sarnath in Arelium.$
 
-Mordrin;;;Quoteth Wizard Plaque: "A very old wizard, he even used to be an archwizard.
-	The first american archwizard. But after a conflict with the other arches 
-	he removed his legendary Infernal Knights and left Bat. A lot of old players
-	got screwed when he did that, much more screwed then you can imagine.
-	So swallow your tunes, it's nothing compared to Mordrin removing IKs."$
-
-Zilch;;;Quoteth Wizard Plaque: "American archwizard who was one of the
-	driving forces behind completing the conversion in 1996. He left bat
-	short after the conversion, because of all the whines."$
-
 Saruman;;;
 	Original coder of the Wrebie forest, which was finished 1998 by
 	~Souc~ and re-coded again by ~Grizzt~ in 2010.$
@@ -462,30 +498,6 @@
 	One of the most feared pirates on Bat-seas as a mortal, he
 	appropriately works on ship code and related things as a wizard.$
 
-Freld;;;Established leader of parties and well-known player in general,
-	immorted in September 2010 and has since worked on game-balance issues,
-	minor tunes and improvements.$
-
-Grizzt;bat;;
-	One of the quiet codeslaves who work in the shadows, Grizzt's
-	work for the greater good of BatMUD has gone mostly unknown to the
-	general public.
-	[p]
-	As a notable exception to the rule, he did the recoding of ~Saruman~'s
-	popular old area "Wrebies".
-	$
-
-Tarken;;;
-	Known as a "trigger-master" and "Tarken the robot" as mortal,
-	Tarken was practically forced to wizardhood to pay for his
-	sins as a cheater. But as they say, good cheaters make the
-	best wizards...
-	[p]
-	During his wizardly career Tarken has worked on the usual
-	bugfixes, but has mainly concentrated on improving ship code.
-	He is also (as of July 2011) responsible for the Nergal subguild
-	of Lords of Chaos.
-	$
 
 Moss;;;
 	$
@@ -495,10 +507,17 @@
 	aka Foul's Creche + Guard's Gap + Seance's platform + Kevin's watch
 	+ Mithil Stonedown + Revelstone + Urvile tree/Woodhelven.$
 
+Sai;;;$
+
+Cyberman;;;$
+
+Perin;;;$
+
+Digga;;;$
+
 ####################################################################
 Arakorni;;;$
 Machaon;;;$
-Sai;;;$
 Mordac;;;$
 Darkbaron;;;$
 Lametoby;;;$
@@ -508,9 +527,7 @@
 Blitzer;;;$
 Bolo;;;$
 Brock;;;$
-Cyberman;;;$
 Deras;;;$
-Digga;;;$
 Dire;;;$
 Dragoness;;;$
 Drakken;;;$
@@ -540,7 +557,6 @@
 Orgoh;;;$
 Pahvi;;;$
 Panner;;;$
-Perin;;;$
 Pet;;;$
 Pickett;;;$