- Updates to several npc files to match AEGIS standards.

- Added Cash Hair Stylist (disabled by default).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec

14 files changed, 2619 insertions, 2292 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 1417552a2..7140477ab 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= DZeroX
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -15,27 +15,18 @@
 //= 1.2b More pregression clean up provided by Barron-Monster. [L0ne_W0lf]
 //= 1.3 Removed npc "Tourist#al" as it's a quest NPC. [L0ne_W0lf]
 //= 1.4 Removed "Fastidious Old Man" duplicate. [L0ne_W0lf]
+//= 1.5 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 alberta,97,51,0	script	Fabian	84,{
 	mes "[Fabian]";
-	mes "Man... When you travel all around";
-	mes "the world, you'll hear of some";
-	mes "crazy things.";
+	mes "Man... When you travel all around the world, you'll hear of some crazy things.";
 	next;
 	mes "[Fabian]";
-	mes "Once, I heard that there are Cards";
-	mes "which contain the power of";
-	mes "monsters. If someone happens to get";
-	mes "their hands on a card, they'll be";
-	mes "able to use that monster's power.";
+	mes "Once, I heard that there are Cards which contain the power of monsters. If someone happens to get their hands on a card, they'll be able to use that monster's power.";
 	next;
 	mes "[Fabian]";
-	mes "I'm guessing it's some sort of fad";
-	mes "or scam, where they make you";
-	mes "collect all the cards or whatever.";
-	mes "I mean, how can a card really hold";
-	mes "the power of a monster?!";
+	mes "I'm guessing it's some sort of fad or scam, where they make you collect all the cards or whatever. I mean, how can a card really hold the power of a monster?!";
 	next;
 	mes "[Fabian]";
 	mes "Seriously...";
@@ -49,32 +40,19 @@ alberta,53,39,0	script	Steiner	100,{
 	mes "young adventurer!";
 	next;
 	mes "[Steiner]";
-	mes "Pardon me if I seem distracted.";
-	mes "I'm milling about, trying to";
-	mes "make a plan.";
-	mes" You see, I hear that there is";
-	mes "a store in Geffen that sells";
-	mes "armour that is resistant to magic.";
+	mes "Pardon me if I seem distracted. I'm milling about, trying to make a plan. You see, I hear that there is a store in Geffen that sells armor that is resistant to magic.";
 	next;
 	mes "[Steiner]";
-	mes "If I buy a lot of them in bulk,";
-	mes "and then resell them here for a";
-	mes "higher price...";
+	mes "If I buy a lot of them in bulk, and then resell them here for a higher price...";
 	close;
 }
 
 alberta,20,183,0	script	Chad	49,{
 	mes "[Chad]";
-	mes "People say the legendary weapon";
-	mes "Gungnir never misses its target. I";
-	mes "wonder if it's possibly true...";
+	mes "People say the legendary weapon Gungnir never misses its target. I wonder if it's possibly true...";
 	next;
 	mes "[Chad]";
-	mes "People also say that babies are";
-	mes "assembled by the storks before";
-	mes "delivery, girls dig guys who act";
-	mes "like jerks, and that Santa Claus";
-	mes "exists! But only in Lutie.";
+	mes "People also say that babies are assembled by the storks before delivery, girls dig guys who act like jerks, and that Santa Claus exists! But only in Lutie.";
 	next;
 	mes "[Chad]";
 	mes "I wonder...";
@@ -84,109 +62,43 @@ alberta,20,183,0	script	Chad	49,{
 	close;
 }
 
-alberta,189,151,5	script	Fisk	100,{
-	mes "[Fisk]";
-	mes "Ahoy mate,";
-	mes "where'd ya";
-	mes "wanna go?";
-	next;
-	switch(select("Sunken Ship -> 250 zeny.","Izlude Marina -> 500 zeny.","Never mind.")) {
-		case 1:
-			if (Zeny < 250) {
-				mes "[Fisk]";
-				mes "Hey now, don't try to cheat me!";
-				mes "I said 250 zeny!";
-				close;
-			}
-			set Zeny,Zeny - 250;
-			warp "alb2trea",43,53;
-			end;
-		case 2:
-			if (Zeny < 500) {
-				mes "[Fisk]";
-				mes "Ain't no way yer getting there";
-				mes "without the 500 zeny first!";
-				close;
-			}
-			set Zeny,Zeny - 500;
-			warp "izlude",176,182;
-			end;
-		case 3:
-			mes "[Fisk]";
-			mes "Alright...";
-			mes "Landlubber.";
-			close;
-	}
-}
-
-alb2trea,39,50,6	script	Fisk#a2t	100,{
-	mes "[Fisk]";
-	mes "So you wanna head back to the";
-	mes "mainland in Alberta, eh?";
-	next;
-	if(select("Yes please.","I changed my mind.")==1)
-		warp "alberta",192,169;
-	close;
-}
-
 alberta,131,139,2	script	Drunken Old Man	54,{
 	mes "[Deagle]";
-	mes "*^CCCCCCHiccup^000000*";
+	mes "^666666*Hiccup*^000000";
 	mes "Wh-what are you";
 	mes "staring at? Get lost!!";
 	next;	
 	switch(select("Say nothing.","Leave him alone.")) {
 		case 1:
 			mes "[Deagle]";
-			mes "Hahahahaha *^CCCCCChiccup^000000*... You've got";
-			mes "some nerve. I may look worthless";
-			mes "now, but I used to be a sailor on";
-			mes "the 'Going Mary.'";
+			mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
 			next;
 			switch(select("Never heard of it.","Really? No kidding!")) {
 				case 1:
 					mes "[Deagle]";
-					mes "Never heard of it?! Everybody knows";
-					mes "th'notorious pirate ship 'Going";
-					mes "Mary!' *^CCCCCCHiccup~^000000*";
+					mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
 					next;
 					mes "[Deagle]";
-					mes "Ah~ The ol'days. If only... if only";
-					mes "we hadn't run into that";
-					mes "STORM... *^CCCCCChiccup^000000*";
+					mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
 					next;
 					mes "[Deagle]";
-					mes "AH~ Captain. I miss our cap'n more";
-					mes "than anything... No foe survived";
-					mes "before cap'n's sword.";
+					mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
 					close;
 				case 2:
 					mes "[Deagle]";
-					mes "That's right! NOBODY meshes with";
-					mes "the crew of the 'Going Mary!' And";
-					mes "nobody can beat our cap'n in a";
-					mes "sword fight!";
+					mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
 					next;
 					mes "[Deagle]";
-					mes "CAPTAIN~!!! *^CCCCCCHICCUP~^000000* He would";
-					mes "swing his sword like this, then";
-					mes "THEN!!";
+					mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
 					next;
 					mes "[Deagle]";
-					mes "The bastard the captain was";
-					mes "fighting, and anyone of his friends";
-					mes "near him, were surrounded in";
-					mes "flame!";
+					mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
 					next;
 					mes "[Deagle]";
-					mes "Man, that sword must have had some";
-					mes "sort of mysterious power, or the";
-					mes "captain was just that good...!";
+					mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
 					next;
 					mes "[Deagle]";
-					mes "Phew~~ *^CCCCCCSob^000000* *^CCCCCCSob...^000000* God, I miss";
-					mes "everyone! Now I'm depressed!";
-					mes "Please, go away now.";
+					mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
 					close;
 			}
 		case 2:
@@ -200,44 +112,26 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 alberta,58,80,2	script	Shakir	99,{
 	mes "[Shakir]";
 	if (rand(2)) {
-		mes "We Merchants have our own";
-		mes "negotiating skill when we sell";
-		mes "goods. This skill can get us more";
-		mes "money than when other people sell";
-		mes "goods.";
+		mes "We Merchants have our own negotiating skill when we sell goods. This skill can get us more money than when other people sell goods.";
 		next;
 		mes "[Shakir]";
-		mes "It's more than just yelling 'You'll";
-		mes "have to give more money please!'";
-		mes "You need to have charisma, and";
-		mes "master rhetoric!";
+		mes "It's more than just yelling 'You'll have to give more money please!' You need to have charisma, and master rhetoric!";
 		next;
 		mes "[Shakir]";
-		mes "We can get up to 24% more zeny";
-		mes "with this incredible skill. But";
-		mes "remember to train hard to acquire";
-		mes "it!";
+		mes "We can get up to 24 % more zeny with this incredible skill. But remember to train hard to acquire it!!";
 	} else {
 		mes "We Merchants can";
 		mes "open roadside stands";
 		mes "to do business.";
 		next;
 		mes "[Shakir]";
-		mes "With the Discount skill, we can buy";
-		mes "goods really cheap from the stores";
-		mes "in towns and load them into the";
-		mes "cart we rent.";
+		mes "With the Discount skill, we can buy goods really cheap from the stores in towns and load them into the cart we rent.";
 		next;
 		mes "[Shakir]";
-		mes "Then afterwards, we can travel";
-		mes "anywhere, and sell our goods to";
-		mes "make a profit!";
+		mes "Then afterwards, we can travel anywhere, and sells our goods to make a profit!";
 		next;
 		mes "[Shakir]";
-		mes "This way, business is more";
-		mes "convenient and safe. Don't fall";
-		mes "asleep, although it's too easy to";
-		mes "do that.";
+		mes "This way, business is more convenient and safe. Don't fall asleep, although it's too easy to do that.";
 	}
 	close;
 }
@@ -246,58 +140,34 @@ alberta,62,156,2	script	Sonya	102,{
 	mes "[Sonya]";
 	switch(rand(3)){
 	case 0:
-		mes "You know those lazy looking bears";
-		mes "that live in the forest on the way";
-		mes "to Payon?";
+		mes "Hey, you know, this one time I was walking through the forest and I saw this little green stem moving around.";
 		next;
 		mes "[Sonya]";
-		mes "Just for fun, I threw a rock at it";
-		mes "and all of a sudden it rushed at me!";
-		mes "I was soooooo scared, I started to";
-		mes "run away, then BAM!!!";
+		mes "I went to see what it was and when I went to touch it. The stem actually slapped my hand!";
 		next;
 		mes "[Sonya]";
-		mes "It ran into a low tree branch and";
-		mes "knocked itself out! I swear, I'll";
-		mes "never provoke an animal for fun";
-		mes "again!";
-		close;
-	case 1:
-		mes "Hey, you know, this one time I was";
-		mes "walking through the forest and I";
-		mes "saw this little green stem moving";
-		mes "around.";
+		mes "It startled me, so I jumped back a bit and then I realized it wasn't a stem, but a very small animal.";
 		next;
 		mes "[Sonya]";
-		mes "I went to see what it was and when";
-		mes "I went to touch it, the stem";
-		mes "actually slapped my hand!";
+		mes "I was lucky I didn't upset it. Even the smallest animal can be dangerous if angered.";
+		close;
+	case 1:
+		mes "You know those lazy looking bears that live in the forest on the way to Payon?";
 		next;
 		mes "[Sonya]";
-		mes "It startled me, so I jumped back a";
-		mes "bit and then I realised it wasn't a";
-		mes "stem, but a very small animal.";
+		mes "Just for fun, I threw a rock at it and all of sudden it rushed at me! I was sooooo scared, I started to run away, then BAM!!!";
 		next;
 		mes "[Sonya]";
-		mes "I was lucky I didn't upset it. Even";
-		mes "the smallest animal can be";
-		mes "dangerous if angered.";
+		mes "It ran into a low tree branch and knocked itself out! I swear, I'll never provoke an animal for fun again!";
 		close;
 	case 2:
-		mes "I once saw a pack of wolves take on";
-		mes "one of those huge, lazy bears!";
+		mes "I once saw a pack of wolves take on one of those huge, lazy bears!";
 		next;
 		mes "[Sonya]";
-		mes "Wolves are much more cooperative";
-		mes "than they may seem. If one of them";
-		mes "is attacked, then any nearby wolves";
-		mes "will run to help.";
+		mes "Wolves are much more cooperative than they may seem. If one of them is attacked, then any nearby wolves will run to help.";
 		next;
 		mes "[Sonya]";
-		mes "I'd think twice if you ever want to";
-		mes "fight one when others of its kind";
-		mes "are around. Be careful: don't get";
-		mes "ganged up on!";
+		mes "I'd think twice if you ever want to fight one when others of its kind are around. Be careful: don't get ganged up on!";
 		close;
 	}
 }
@@ -310,31 +180,58 @@ alberta,93,174,2	script	Grandmother Alma	103,{
 	mes "Alberta harbour.";
 	next;
 	mes "[Grandmother Alma]";
-	mes "Hoping to save any survivors, some";
-	mes "of the townspeople ventured into";
-	mes "the ship. However, they all ran out";
-	mes "terrified, saying that corpses were";
-	mes "walking around inside the ship.";
+	mes "Hoping to save any survivors, some of the townspeople ventured into the ship. However, they all ran out terrified, saying that corpses were walking around inside the ship.";
 	next;
 	mes "[Grandmother Alma]";
-	mes "The ship was also packed with";
-	mes "dangerous marine organisms, and";
-	mes "they couldn't get inside, even if";
-	mes "they wanted to.";
+	mes "The ship was also packed with dangerous marine organisms, and they couldn't get inside, even if they wanted to.";
 	next;
 	mes "[Grandmother Alma]";
-	mes "We couldn't do anything about that";
-	mes "ominous looking ship, and just left";
-	mes "it as it was. Nowadays, exploration";
-	mes "teams try to enter that ship and";
-	mes "wipe out its monsters.";
+	mes "We couldn't do anything about that ominous looking ship, and just left it as it was. Nowadays, exploration teams try to enter that ship and wipe out its monsters.";
 	next;
 	mes "[Grandmother Alma]";
-	mes "So it might be a good experience";
-	mes "for a young person like yourself to";
-	mes "be a recruit. But, it's still not";
-	mes "worth risking your life if you're";
-	mes "not strong enough.";
+	mes "So it might be a good experience for a young person like yourself to be a recruit. But, it's still not worth risking your life if you're not strong enough.";
+	close;
+}
+
+alberta,189,151,5	script	Fisk	100,{
+	mes "[Fisk]";
+	mes "Ahoy mate,";
+	mes "where'd ya";
+	mes "wanna go?";
+	next;
+	switch(select("Sunken Ship -> 250 zeny.","Izlude Marina -> 500 zeny.","Never mind.")) {
+		case 1:
+			if (Zeny < 250) {
+				mes "[Fisk]";
+				mes "Hey now, don't try to cheat me! I said 250 zeny!";
+				close;
+			}
+			set Zeny,Zeny - 250;
+			warp "alb2trea",43,53;
+			end;
+		case 2:
+			if (Zeny < 500) {
+				mes "[Fisk]";
+				mes "Ain't no way yer getting there without the 500 zeny first!";
+				close;
+			}
+			set Zeny,Zeny - 500;
+			warp "izlude",176,182;
+			end;
+		case 3:
+			mes "[Fisk]";
+			mes "Alright...";
+			mes "Landlubber.";
+			close;
+	}
+}
+
+alb2trea,39,50,6	script	Fisk#a2t	100,{
+	mes "[Fisk]";
+	mes "So you wanna head back to the mainland in Alberta, eh?";
+	next;
+	if(select("Yes please.","I changed my mind.")==1)
+		warp "alberta",192,169;
 	close;
 }
 
@@ -347,9 +244,7 @@ alberta,195,151,2	script	Paul	86,{
 	mes "of the Sunken Ship?";
 	next;
 	mes "[Paul]";
-	mes "Oh! Before you join, I must warn";
-	mes "you. If you're not that strong, you";
-	mes "may not want to go.";
+	mes "Oh! Before you join, I must warn you. If you're not that strong, you may not want to go.";
 	next;
 	mes "[Paul]";
 	mes "So, want";
@@ -362,9 +257,7 @@ alberta,195,151,2	script	Paul	86,{
 		case 1:
 			if (Zeny < 200) {
 				mes "[Paul]";
-				mes "It seems you don't have the money,";
-				mes "my friend. But please come back";
-				mes "when you're able to pay.";
+				mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
 				close;
 			} else {
 				set Zeny,Zeny - 200;
@@ -394,27 +287,18 @@ alberta,190,173,4	script	Phelix	85,{
 	}
 	if (@event_zelopy == 0) {
 		mes "The hell are you doing here?";
-		mes "There is nothing you can get for";
-		mes "free on this ship, if you want";
-		mes "somethin', work for it!!";
+		mes "There is nothing you can get for free on this ship, if you want somethin', work for it!!";
 		next;
 		mes "[Phelix]";
-		mes "Hmm, so why don't you bring me";
-		mes "10 jellopies and I will give 1";
-		mes "potion. How's that sound?";
-		mes "Or if that's too hard for your";
-		mes "pansy ass, 3 jellopies for 1";
-		mes "Carrot.";
+		mes "Hmm, so why don't you bring me 10 jellopies and I will give 1 potion. How's that sound?";
+		mes "Or if that's too hard for your pansy ass, 3 jellopies for 1 Carrot.";
 		next;
 		mes "[Phelix]";
-		mes "If you're interested in my offer,";
-		mes "get me the stuff I mentioned.";
+		mes "If you're interested in my offer, get me the stuff I mentioned.";
 		set @event_zelopy,1;
 		close;
 	} else {
-		mes "Hmm... you want to exchange";
-		mes "jellopies for Red Potions or some";
-		mes "Carrots eh? Well... which one?";
+		mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
 		next;
 		switch(select("Red Potions please.","Carrots please.")) {
 		case 1:
@@ -425,9 +309,7 @@ alberta,190,173,4	script	Phelix	85,{
 			next;
 			mes "[Phelix]";
 			if (countitem(909) < 10) {
-				mes "Hey! Weren't you listening? I said";
-				mes "10 jellopies for 1 Red Potion.. are";
-				mes "ya deaf?";
+				mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
 				close;
 			} else {
 				set .@max,countitem(909)/10;
@@ -437,20 +319,13 @@ alberta,190,173,4	script	Phelix	85,{
 				next;
 				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
-					delitem 909,.@max*10;
-					getitem 501,.@max;
-					mes "[Phelix]";
-					mes "There you go! As I promised. Don't";
-					mes "go suckin' them all down at once.";
-					close;
+					delitem 909,.@max*10;	// Jellopy
+					getitem 501,.@max;	// Red_Potion
+					break;
 				case 2:
 					mes "[Phelix]";
-					mes "I'm not giving you more than 100";
-					mes "at a time so don't bother, OK? If";
-					mes "you don't want any, just say '0'.";
-					mes "Right now, the most you can get is";
-					mes ""+.@max+" but remember, 100 at most,";
-					mes "you want to break my back?";
+					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
+					mes "Right now, the most you can get is " + gap + " but remember, 100 at most, you want to break my back?.";
 					input .@amount;
 					next;
 					mes "[Phelix]";
@@ -459,29 +334,25 @@ alberta,190,173,4	script	Phelix	85,{
 						close;
 					}
 					if (.@amount > 100) {
-						mes "Hey, what'd I say? 100 at a time at";
-						mes "most, you're trying to kill me";
-						mes "aren't you!";
+						mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
 						close;
 					}
 					if (countitem(909) < .@amount*10) {
-						mes "Hmmm, it looks like you don't have";
-						mes "enough. Go get more jellopies if";
-						mes "you want anything else from me.";
+						mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
 						close;
 					}
-					delitem 909,.@amount*10;
-					getitem 501,.@amount;
-					mes "[Phelix]";
-					mes "There you go! As I promised. Don't";
-					mes "go suckin' them all down at once.";
-					close;
+					delitem 909,.@amount*10;	// Jellopy
+					getitem 501,.@amount;	// Red_Potion
+					break;
 				case 3:
 					mes "[Phelix]";
 					mes "No problem,";
 					mes "see you next time.";
 					close;
 				}
+				mes "[Phelix]";
+				mes "There you go! As I promised. Don't go suckin' them all down at once.";
+				close;
 			}
 		case 2:
 			mes "[Phelix]";
@@ -489,8 +360,7 @@ alberta,190,173,4	script	Phelix	85,{
 			next;
 			mes "[Phelix]";
 			if (countitem(909) < 3) {
-				mes "Hmm, look pansy ass, I said 3";
-				mes "jellopies for 1 Carrot.. got it?";
+				mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
 				close;
 			} else {
 				set .@max,countitem(909)/3;
@@ -499,18 +369,12 @@ alberta,190,173,4	script	Phelix	85,{
 				next;
 				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
-					delitem 909,.@max*3;
-					getitem 515,.@max;
-					mes "[Phelix]";
-					mes "There you go~! As I promised. Try";
-					mes "not to stuff yer face.";
-					close;
+					delitem 909,.@max*3;	// Jellopy
+					getitem 515,.@max;	// Carrot
+					break;
 				case 2:
 					mes "[Phelix]";
-					mes "Right I'm not giving you more than";
-					mes "100 at a time so don't bother,";
-					mes "okay? If you don't want any, just";
-					mes "say '0'.";
+					mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
 					input .@amount;
 					next;
 					mes "[Phelix]";
@@ -519,28 +383,24 @@ alberta,190,173,4	script	Phelix	85,{
 						close;
 					}
 					if (.@amount > 100) {
-						mes "Hey pansy ass, I said 100 at most,";
-						mes "no more than that! I'm not going to";
-						mes "break my back for the likes of you!";
+						mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
 						close;
 					}
 					if (countitem(909) < .@amount*10) {
-						mes "Seems you don't have enough. Go get";
-						mes "some more if you want anything";
-						mes "else.";
+						mes "Seems you don't have enough. Go get some more if you want anything else.";
 						close;
 					}
-					delitem 909,.@amount*3;
-					getitem 515,.@amount;
-					mes "[Phelix]";
-					mes "There you go~! As I promised. Try";
-					mes "not to stuff yer face.";
-					close;
+					delitem 909,.@amount*3;	// Jellopy
+					getitem 515,.@amount;	// Carrot
+					break;
 				case 3:
 					mes "[Phelix]";
 					mes "Catch'ya later.";
 					close;
 				}
+				mes "[Phelix]";
+				mes "There you go~! As I promised. Try not to stuff yer face.";
+				close;
 			}
 		}
 	}
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 2ff6ec683..ae25f5762 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -4,9 +4,9 @@
 //= vicious_pucca, Poki#3, erKURITA, Munin, and everybody in the
 //= comments
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
 //= NPC's for the City of Hugel.
 //===== Additional Comments: =================================
@@ -26,16 +26,12 @@
 //= 1.4 Optimized the Party Supplies Shop [DZeroX]
 //= 1.5 Fixed Party Supplies Shop. [L0ne_W0lf]
 //= 1.6 Removed duplicate "Mudie". [L0ne_W0lf]
+//= 1.7 Removed whitespace and junk. [Kisuka]
 //============================================================
 
-//---------------------------------------------------------------------------
-// Hugel Town NPCs  - Outside
-//---------------------------------------------------------------------------
-
-//Young Man
-//---------------------------------------------------------------------------
+// Hugel
+//============================================================
 hugel,189,143,5	script	Young Man	898,{
-
 	mes "[Young Man]";
 	mes "Huh. So that giant";
 	mes "air pouch can make";
@@ -43,14 +39,9 @@ hugel,189,143,5	script	Young Man	898,{
 	mes "Would filling my tummy";
 	mes "with air work the same way?";
 	close;
-	
 }
 
-
-//Emily
-//---------------------------------------------------------------------------
 hugel,126,151,3	script	Emily	90,{
-
 	mes "[Emily]";
 	mes "I feel so blessed to";
 	mes "live in this quant, little";
@@ -65,13 +56,9 @@ hugel,126,151,3	script	Emily	90,{
 	mes "out by the people that live here.";
 	mes "Don't you think that sounds weird?";
 	close;
-	
 }
  
-//Kayplas
-//---------------------------------------------------------------------------
 hugel,86,165,5	script	Kayplas	896,{
-
 	mes "[Kayplas]";
 	mes "Ooh, I really want to";
 	mes "have that red bottle.";
@@ -79,13 +66,9 @@ hugel,86,165,5	script	Kayplas	896,{
 	mes "to buy me one. It doesn't";
 	mes "look too expensive, does it?";
 	close;
-	
 }
 
-//Lisa
-//---------------------------------------------------------------------------
 hugel,71,197,3	script	Lisa	90,{
-
 	mes "[Lisa]";
 	mes "Hugel is a pretty";
 	mes "small, homely village.";
@@ -100,13 +83,9 @@ hugel,71,197,3	script	Lisa	90,{
 	mes "I wanna go out and";
 	mes "live in the big city~";
 	close;
-	
 }
 
-//Old Nikki 
-//---------------------------------------------------------------------------
 hugel,169,112,5	script	Old Nikki	892,{
-
 	mes "[Old Nikki]";
 	mes "You must not be from";
 	mes "around here. Ah, you're";
@@ -121,13 +100,9 @@ hugel,169,112,5	script	Old Nikki	892,{
 	mes "as old as us. Well, have";
 	mes "a nice day, adventurer~";
 	close;
-	
 }
 
-//Bismarc
-//---------------------------------------------------------------------------
 hugel,168,183,5	script	Bismarc	118,{
-
 	mes "[Bismarc]";
 	mes "^808080*Ghyklk*";
 	mes "*Huk Hukk*^000000";
@@ -144,11 +119,9 @@ hugel,168,183,5	script	Bismarc	118,{
 	mes "antidote gonna";
 	mes "get here?!";
 	close;
-	
 }
 
 hugel,175,115,5	script	Marius	897,{
-
 	mes "[Marius]";
 	mes "Yes, I'm an old man, but";
 	mes "I can lick a whippersnapper";
@@ -164,17 +137,11 @@ hugel,175,115,5	script	Marius	897,{
 	mes "you how strong I am! Let's";
 	mes "wrestle or something, kid~";
 	close;
-	
 }
 
-//-------------------------------------------------------------------------
-// Hugel Town NPCs - Inside 
-//-------------------------------------------------------------------------
-
-//Chris
-//---------------------------------------------------------------------------
+// Inside Hugel
+//============================================================
 hu_in01,111,386,4	script	Chris	86,{
-
 	mes "[Chris]";
 	mes "You know, the people don't";
 	mes "fight harmful monsters, they";
@@ -188,15 +155,9 @@ hu_in01,111,386,4	script	Chris	86,{
 	mes "then I suggest buying";
 	mes "some in a bigger city.";
 	close;
-	
 }
 
-//--------------------------------------------------------------
-// Party Supplies/Firecracker Seller
-//--------------------------------------------------------------
-
 hu_in01,23,311,4	script	Party Supplies Shop	898,{
-
 	mes "[Shopkeeper]";
 	mes "Welcome to the party supplies";
 	mes "shop!";
@@ -215,7 +176,7 @@ hu_in01,23,311,4	script	Party Supplies Shop	898,{
 				close;
 			}
 			set Zeny,Zeny-500;
-			getitem 12018,5;
+			getitem 12018,5;	// Fire_Cracker
 			mes "[Shopkeeper]";
 			mes "Here you go!";
 			mes "Have fun with them!";
@@ -224,12 +185,10 @@ hu_in01,23,311,4	script	Party Supplies Shop	898,{
 			mes "[Shopkeeper]";
 			mes "Thank you, please come again.";
 			close;
-	}
-		
+	}	
 }
 
 hu_in01,18,94,0	script	A Part-Timer#1	49,{
-
 	mes "[Luda]";
 	mes "Welcome to the";
 	mes "Shrine Expedition Office.";
@@ -254,45 +213,12 @@ hu_in01,18,94,0	script	A Part-Timer#1	49,{
 	mes "can't really pay you, but it's";
 	mes "a great chance to explore~";
 	close;
-	
 }
 
 hu_in01,26,77,4	script	A Part-Timer#2	50,{
-
 	mes "^3355FFThis part-timer is";
 	mes "completely engrossed";
 	mes "in his task of organizing";
 	mes "files and books.^000000";
 	close;
-	
 }
-
-//Should be moved later on to Bulletin Boards.txt
-//hugel,91,152,4	script	Bulletin Board	837,{end;}
-
-
-//= New Npcs
-//hugel,71,137,5	script	Jamira	879,{end;}
-//hugel,191,172,4	script	Yanhe	895,{end;}
-//hugel,196,164,3	script	Amnot	50,{end;}
-//hugel,168,183,5	script	Thief	118,{end;}
-//hugel,126,151,4	script	Tanyee	90,{end;}
-//hugel,88,168,4	script	Zondaman	874,{end;}
-//hugel,71,198,3	script	Kampia	90,{end;}
-//= End of new npcs
-
-//hugel,100,102,3	script	Grandpa Hohi	866,{end;}
-//hugel,85,93,3	script	Grandpa Hiho	866,{end;}
-//hugel,85,165,5	script	Cudy	896,{end;}
-//hugel,107,67,3	script	Kiddy the Kid	706,{end;}
-
-//hugel,71,83,4	script	Hon Kiki	900,{end;}
-//hugel,169,112,5	script	Sani	892,{end;}
-//hu_in01,16,20,4	script	Jamie	70,{end;}
-//hu_in01,14,11,4	script	Jana	49,{end;}
-//hu_in01,19,161,2	script	Matilda	803,{end;}
-//hu_in01,18,167,4	script	Gin	86,{end;}
-//hu_in01,381,304,5	script	Soldier	105,{end;}
-//hu_in01,111,386,4	script	Jino	86,{end;}
-//hu_in01,246,107,2	script	Receptionist	53,{end;}
-//hu_in01,256,40,2	script	Garud	897,{end;}
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index ff94c2fa9..1ea621634 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -1,11 +1,11 @@
 //===== eAthena Script ======================================= 
 //= Lutie Town
 //===== By: ================================================== 
-//=
+//= eAthena dev team
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: ========================================= 
 //= Lutie - City NPCs
 //===== Additional Comments: ================================= 
@@ -16,891 +16,901 @@
 //= 1.4 Fixed exploit [Lupus]
 //= 1.5 Fixed a bug that could reset Lutie quest state [Lupus]
 //= 1.6 Heavy optimization to all the NPCs [DZeroX]
+//= 1.7 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-//=====================================================
-//		Getting To Lutie
-//=====================================================
-aldebaran,168,168,4	script	Mr. Claus	718,{
+// Teleport to Lutie
+//============================================================
+aldebaran,223,222,4	script	Mr. Claus	718,{
 	mes "[Mr. Claus]";
+	mes "Ho Ho Ho~";
 	mes "Merry Christmas!!";
-	mes "I wish you all happiness!";
+	mes "I wish all of you joy";
+	mes "and Christmas cheer!";
 	next;
-	switch (select("Where are you from?:Take me to ^5533FF'Lutie'^000000:Cancel")) {
+	switch(select("Info about Lutie:Move to 'Lutie':Cancel")) {
 		case 1:
 			mes "[Mr. Claus]";
-			mes "I come from ^3355FF'Lutie'^000000,the Fantastic Christmas Town!!";
-			mes "There it is Christmas all year round, with delicious cakes,";
-			mes "and toys as far as the eye can see.";
+			mes "^3355FFLutie^000000, the fantastic Christmas Town! Always filled with the spirit of giving, Lutie is filled with appetizing cakes, tiny toy soldiers, and all sorts of wonderful things~!";
 			next;
 			mes "[Mr. Claus]";
-			mes "Happiness and joy fills the city! It is a magical place to be!";
-			mes "Doesn't this place sound fantastic?";
+			mes "Ho Ho Ho~";
+			mes "It's an amazing land blessed with the beauty of winter, and a year round atmosphere of festivity!";
 			next;
 			mes "[Mr. Claus]";
-			mes "Then what are you waiting for?! Just say the word and I'll take";
-			mes "you to Lutie right away! You might even meet the big boss Santa";
-			mes "Claus.";
+			mes "I'm a Santa that will guide people to Lutie, the Christmas Town. Ask me at any time, and I'll magically send you there~";
 			close;
 		case 2:
 			mes "[Mr. Claus]";
-			mes "So you're ready to go to the greatest place in the world?";
+			mes "Ho Ho Ho~";
+			mes "The only way to get to Lutie is here in Al de Baran!";
+			next;
+			mes "[Mr. Claus]";
+			mes "I keep this place and personally transport people who want to visit Lutie. Please ask Santa Claus over there if you want to leave town. He will let you know the way out of Lutie.";
 			next;
 			mes "[Mr. Claus]";
-			mes "Ok then, off you go to enjoy the fun and excitement that Lutie";
-			mes "Has to offer!";
+			mes "Ho Ho Ho~";
+			mes "Well, are you ready?";
+			mes "Have a nice trip!";
+			mes "Meeeeerry Christmas!";
 			close2;
 			warp "xmas_fild01",78,68;
 			end;
 		case 3:
 			mes "[Mr. Claus]";
-			mes "Well... if you want to visit Lutie, just let me know anytime.";
-			mes "Merry Christmas!! Merry Christmas!!";
+			mes "Ho Ho Ho~";
+			mes "Whenever you want to visit Lutie, be my guest. Just let me know when you want to leave.";
+			next;
+			mes "[Mr. Claus]";
+			mes "Ho ho hooooo!!";
+			mes "Haaaaappy Holidays!";
 			close;
 	}
 }
 
 
-//=====================================================================
-//		NPCs inside
-//=====================================================================
-
-// Mima
+// Inside Lutie
 //============================================================
-xmas_in,27,103,4	script	Mima	701,{
+xmas_in,100,96,4	script	Santa Claus	718,{
+	mes "[Santa Claus]";
+	mes "Ho Ho Ho~";
+	mes "Meeeerry Christmas !!";
+	next;
+	mes "^3355FFIt's...^000000";
+	mes "^3355FFIt's the original Santa Claus!^000000";
+	next;
+	mes "[Santa Claus]";
+	mes "Ho Ho Ho~";
+	mes "I'm Santa Claus, and I bring gifts to every good boy and girl on Christmas!";
+	next;
+	mes "[Santa Claus]";
+	mes "If you want to leave Lutie, go outside town and head south to the first field that you see. You'll be able to find a magical warp that will take you to Al de Baran.";
+	next;
+	mes "[Santa Claus]";
+	mes "Ho ho ho~";
+	mes "Meeeeeeerry Christmas!";
+	close;
+}
+
+xmas_in,167,173,4	script	Duffle	711,{
+	if(xmas_npc == 1) {
+		mes "[Duffle]";
+		mes "Merry Christmas!";
+		mes "Welcome to Lutie!";
+		next;
+		mes "[Duffle]";
+		mes "You got a present";
+		mes "from Santa Claus?!";
+		mes "Ha ha, you must";
+		mes "be really excited!";
+		next;
+		mes "[Duffle]";
+		mes "Hey, have you heard that here in Lutie, we have an attraction that's equally as famous as Santa himself?";
+		next;
+		mes "[Duffle]";
+		mes "It's ^3355FFSnowysnow^000000,";
+		mes "the magical";
+		mes "talking snowman!";
+		next;
+		mes "[Duffle]";
+		mes "Before you leave, you really should meet and talk to Snowysnow, even if it's only once. He's really a nice guy and fun to talk to.";
+		next;
+		mes "[Duffle]";
+		mes "Well then...";
+		mes "Merry Christmas!!";
+		set xmas_npc,2;
+		close;
+	}
+	else if (xmas_npc > 1) {
+		mes "[Duffle]";
+		mes "Have you ever talked to the snowman in front of this town? The lonely snowman who stands in solitude...";
+		next;
+		mes "[Duffle]";
+		mes "But he's so warm hearted~! Sometimes, I talk to Snowysnow the snowman. For some weird reason, he can talk just like us!";
+		next;
+		mes "[Duffle]";
+		mes "When I talk to Snowysnow, I get to wondering how he came to be. I guess if you talk to him too, you'll feel the same way.";
+		next;
+		mes "[Duffle]";
+		mes "How he was created, and how he thinks and talks like a human is such a mystery...";
+		next;
+		mes "[Duffle]";
+		mes "Where did he come from and what kind of place was it? And how did he come to Lutie without any legs...?";
+		next;
+		mes "[Duffle]";
+		mes "Lately, it seems more and more people are coming to this town to see Snowysnow.";
+		next;
+		mes "[Duffle]";
+		mes "I guess you should talk to the other people living in Lutie if you want to learn more about the mystery of Snowysnow...";
+		close;
+	}
+	else {
+		mes "[Duffle]";
+		mes "Oh...!";
+		mes "While you're here, don't forget to visit the original Santa Claus here in Lutie.";
+		close;
+	}
+}
+
+xmas_in,27,103,4	script	Lenient Aunt	701,{
 switch (xmas_npc) {
 	case 5:
-		mes "[Mima]";
-		mes "Hmmm? Hairy Uncle Ken told you about me, didn't he? Well well, I";
-		mes "know what he's thinking... Hoo hoo! He intends to make me feel";
-		mes "happy and expects me to give him some free jars of kimchi!";
-		mes "Hoo hoo, oh well.";
-		next;
-		mes "[Mima]";
-		mes "He knows too much about me... I can't stop him from getting some";
-		mes "of my kimchi.  Yes yes. Even I know my kimchi is the best in town!";
-		mes "Whoo? The story of ^3355FF'Jack Frost'^000000? Oh... Yes yes, I see.";
-		next;
-		mes "[Mima]";
-		mes "But I can't just tell you his story.... As you know the most";
-		mes "powerful human beings are aunties! And I'm one of them! They never";
-		mes "allow others to take advantage of them.  As they say, 'There is no";
-		mes "such thing as a free lunch'.  So I have a favour to ask of you.";
-		mes "Jack Frost has been keeping something for me.....";
-		next;
-		mes "[Mima]";
-		mes "Would you please bring it back to me? ^3355FF'The roughest salt in";
-		mes "the world'^000000.  It is an essential ingredient for pickling";
-		mes "cabbages.  Just tell him I sent you and he will understand.";
-		next;
-		mes "[Mima]";
-		mes "He will give you my salt.  Now dear, hurry up.  Return Quickly.";
+		mes "[Thachentze]";
+		mes "Hmm? The Hairy guy";
+		mes "spoke well of me,";
+		mes "did he? Well well...";
+		next;
+		mes "[Thachentze]";
+		mes "I know what he thinks... Ho ho ho~! He intends to make me feel happy so that I'll give him some free jars of pickles! Oh well~!";
+		next;
+		mes "[Thachentze]";
+		mes "He knows me too well. I almost can't stop from giving that man some pickles. Yes, even I know my pickles are the best in town!";
+		next;
+		mes "[Thachentze]";
+		mes "Hmmm~?";
+		mes "You want to know";
+		mes "about ^3355FFSnowysnow^000000?";
+		mes "Oh. Yes, yes, I see...";
+		next;
+		mes "[Thachentze]";
+		mes "Well, I can't just let anyone know something so important about Snowysnow. Hmmm...";
+		next;
+		mes "[Thachentze]";
+		mes "Snowysnow has been holding something for me as a favor, the ^3355FFroughest salt in the world^000000 which I use to pickle cabbages.";
+		next;
+		mes "[Thachentze]";
+		mes "I suppose if you're really Snowysnow's friend, he will trust you enough to give it to you so you can deliver it to me. And in any case, I'll need more of it soon.";
+		next;
+		mes "[Thachentze]";
+		mes "Now be a dear";
+		mes "and hurry up.";
+		mes "Come back quickly~";
 		set xmas_npc,6;
 		close;	
 	case 6:
-		mes "[Mima]";
-		mes "Hohohoho -";
-		mes "Let's see... Huh? Didn't you yet bring it?";
-		mes "Oh my goodness, my cabbages will get sour soon!";
-		mes "( ? )";
-		mes "Hurry up, Chop Chop -!!";
-		next;
-		mes "[Mima]";
-		mes "*sigh* You are really a scatterbrained person, my dear...";
-		mes "I said BRING ME ^3355FF' THE ROUGHEST SALT IN THE WORLD '^000000";
-		mes "!!!!!!!! Leave now and hurry up!";
+		mes "[Thachentze]";
+		mes "Hohohoho~";
+		mes "You're back!";
+		next;
+		mes "[Thachentze]";
+		mes "Did you bring it?";
+		mes "Oh goodness...!";
+		mes "My cabbages will";
+		mes "get sour soon!";
+		next;
+		mes "[Thachentze]";
+		mes "You...";
+		mes "Don't have it?";
+		next;
+		mes "[Thachentze]";
+		mes "*Sigh*";
+		mes "You are really a scatter-brained person, my dear. Now hurry over to Snowysnow and bring me the ^3355FFroughest salt in the world^000000.";
+		next;
+		mes "[Thachentze]";
+		mes "Hurry now, dear,";
+		mes "Chop Chop~!";
 		close;
 	case 7:
-		mes "[Mima]";
+		mes "[Thachentze]";
 		mes "Hohohohoh hohohohoho !";
-		mes "Let's see Let's see...... Thank you my dear, Thank you!";
+		mes "Let's see, let's see...";
+		mes "Thank you dear,Thank you.";
 		next;
-		mes "-Handed ^3355FF' The roughest salt in the world'^000000 to her-";
 		set xmas_npc,8;
+		mes "^3355FFYou gave her the";
+		mes "roughest salt in the world.^000000";
 		next;
-		mes "[Mima]";
-		mes "Now I am able to pickle my cabbages properly. Thank you my dear,";
-		mes "Thank you . . . . . Hooo? Ahhh yes, sorry, I almost forgot I";
-		mes "promised you... Yes I remember you asked me about Jack Frost's";
-		mes "gift bag, didn't you?";
-		next;
-		mes "[Mima]";
-		mes "If you already met Uncle Hairy Uncle Ken you must know by now,"; 
-		mes "Jack Frost has been made out of some mysterious snow covering up";
-		mes "a thick-grass filed of magical force,";
-		next;
-		mes "[Mima]";
-		mes "I can't tell you what the reason was, but I figured out Jack Frost";
-		mes "came to possess the gift bag within, due to the strange reaction";
-		mes "between alchemy items used by Great alchemist and its original";
-		mes "structure material, the mysterious snow.";
-		next;
-		mes "[Mima]";
-		mes "Aside from it, the gift bag creates present as many as Jack Frost";
-		mes "wants.  It seems like something magical grants Jack Frost with";
-		mes "the same ability of Santa Claus.  If this power fell into bad man's";
-		mes "hands, we would probably be in trouble, but everybody knows that";
-		mes "Jack Frost is very nice and innocent creature... We've never";
-		mes "worried about his unique ability...";
-		next;	
-	case 8:
-		mes "[Mima]";
-		mes "Hohohoho . . Ah and, lately I've heard some surprising news from";
-		mes "^3355FF'Howie'^000000 the clown.  It is an interesting story... If you're";
-		mes "interested, why don't you go meet him?";
-		close;
-	default:
-		mes "[Mima]";
-		mes "Merry Christmas!";
-		mes "I can feel the spirit of Christmas surrounding me whenever I look,";
-		mes "at the young strangers out there... I wish you a merry Christmas!";
-		next;
-		mes "[Mima]";
-		mes "There is an abandoned ^5533FFToy Factory^000000 here in town.  It";
-		mes "looks quite interesting, however....";
-		next;
-		mes "[Mima]";
-		mes "Recently I've noticed that many monsters have taken residence";
-		mes "inside of the factory.  Some of them look like the monsters found";
-		mes "outside of town... I mean they look completely identical!!";
-		next;
-		mes "[Mima]";
-		mes "Even though they look similar, they actually are not the same.  For";
-		mes "some reason these monsters have different characteristics from the";
-		mes "ones found outside.  Some of them are very unique and it seems that";
-		mes "their offspring are adapting to the environment here.";
-		next;
-		mes "[Mima]";
-		mes "... Oh I almost forgot, I have to go make some";
-		mes "kimchi(spicy pickled cabbage)... mmm.. Chocolate kimchi is my";
-		mes "favorite!";
-		next;
-		mes "[Mima]";
-		mes "Between each slice of kimchi, I spread on a special chocolate which";
-		mes "melts rather easily.  The rest is a family secret.... hehe.";
-		close;
-	}
-}
-
-// Santa Claus
-//===================================================================
-xmas_in,100,96,4	script	Father Christmas::Santa1	718,{
-switch (@talkedsanta) {
-	case 1:
-		mes "[Santa]";
-		mes "I'm Santa Claus.";
-		mes "I have a present for you, let me look in my bag.";
-		next;
-		mes "[Santa]";
-		mes "Yep, I've got a present with your name on it.";
-		mes "Here you are!";
-		next;
-		switch (rand(1,5)) {
-			case 1:
-				getitem 529,5;
-				break;
-			case 2:
-				getitem 530,3;
-				break;
-			case 3:
-				getitem 528,1;
-				if (xmas_npc == 0) set xmas_npc, 1;
-				set @talkedsanta, 0;
-				mes "[Santa]";
-				mes "Hmm, you must not have been a very good";
-				mes "person this year.  Do better!";
-				close;
-			case 4:
-				getitem 539,2;
-				break;
-			case 5:
-				getitem 539,1;
-				break;
-		}
-		if (xmas_npc == 0) set xmas_npc, 1;
-		set @talkedsanta, 0;
-		mes "[Santa]";
-		mes "Hope you like your present!";
-		mes "My elves made it especially for you.";
-		close;
-	default:
-		mes "[Santa Claus]";
-		mes "Ho Ho Ho~";
-		mes "Meeerry Christmas !!";
-		next;
-		mes "[Santa Claus]";
-		mes "Ho Ho Ho~";
-		mes "I am a Santa Claus, and I bring gifts to every boy and girl on";
-		mes "Christmas!";
-		next;
-		mes "[Santa Claus]";
-		mes "Ho Ho Ho~";
-		mes "If for some reason you wish to leave the wonderful town of Lutie,";
-		mes "just head south of town.  You'll find a warp that will lead you";
-		mes "back to Al De Baran.";
-		next;
-		mes "[Santa Claus]";
-		mes "Ho Ho Ho~ Merry Christmas !!";
-		mes "Merry Christmas!!";
-		if (xmas_npc == 0) set @talkedsanta,1;
-		close;
-	}
-}
-
-// Debra
-//==================================================================
-xmas_in,165,173,4	script	Debra	711,{
-switch (xmas_npc) {
-	case 1:
-	case 2:
-		mes "[Debra]";
-		mes "Merry Christmas!";
-		mes "Welcome to Lutie!";
+		mes "[Thachentze]";
+		mes "Now I am able to pickle my cabbages properly. Thank you, my dear. Thank you...";
 		next;
-		mes "[Debra]";
-		mes "You got a present from Santa Claus?! You must be really excited!";
-		mes "Ha ha! Have you ever heard that we have a person equally as";
-		mes "famous as Santa Claus here?";
+		mes "...";
 		next;
-		mes "[Debra]";
-		mes "That person is ^3355FF'Jack Frost'^000000 the mysterious snowman,";
-		mes "who can communicate with humans.";
+		mes "...";
+		mes "......";
 		next;
-		mes "[Debra]";
-		mes "You haven't meet Jack Frost yet? I think you should try to";
-		mes "talk to him at least once...  Well then, Merry Christmas!!";
-		set xmas_npc,2;
+		mes "[Thachentze]";
+		mes "Oh yes, I'm sorry. I almost forgot what I promised you. You asked me about Snowysnow's magical gift bag, didn't you?";
+		next;
+		mes "[Thachentze]";
+		mes "If you already met Uncle Cantata, you must know by now that Snowysnow has been made out of some mysterious snow that covered a thick field of magical flowers.";
+		next;
+		mes "[Thachentze]";
+		mes "I can't tell you how, but when Snowysnow was revived, there was a reaction between the Alchemist's materials and the energies of Snowysnow's snow.";
+		next;
+		mes "[Thachentze]";
+		mes "For some reason, Snowysnow's gift bag can now create as many presents as Snowysnow wants, just like Santa Claus.";
+		next;
+		mes "[Thachentze]";
+		mes "Of course, if this power were to fall into the hands of evil, we would all be in trouble.";
+		next;
+		mes "[Thachentze]";
+		mes "However, everyone knows that Snowysnow is kind and loving towards others. So we're never worried about Snowysnow's powers.";
+		next;
+		mes "[Thachentze]";
+		mes "Oh, and I've just heard some shocking news from ^3355FFHashokii^000000 the clown. It's quite an interesting story, actually. Why don't you ask him more about it?";
 		close;
 	default:
-		mes "[Debra]";
-		mes "Merry Christmas!";
-		mes "Welcome to Lutie!";
+		mes "[Thachentze]";
+		mes "Merry Christmas~";
+		mes "Ho! Ho! Ho!";
+		next;
+		mes "[Thachentze]";
+		mes "I can feel the Christmas spirit all around me! It's even in the eyes of the young travelers who've come out here all the way to Lutie. Hoho, I wish you a Merry Christmas!";
+		next;
+		mes "[Thachentze]";
+		mes "We have a dungeon named";
+		mes "'Christmas dungeon' around here. Well, I guess I don't need to tell you much if you've heard about it already.";
+		mes "Oh well...";
+		next;
+		mes "[Thachentze]";
+		mes "I figured something out a few days ago. In the Christmas dungeon, you'll run into creatures that are similar to those outside of town.";
+		next;
+		mes "[Thachentze]";
+		mes "I'm guessing that monsters wandered here from outside of town, and were changed by the cold weather here. So monsters adapted to live in this environment.";
 		next;
-		mes "[Debra]";
-		mes "Have you ever talked to the snowman in front of this town?";
-		mes "Snowman in solitude, made of White Snow....";
-		next;
-		mes "[Debra]";
-		mes "However he got a warm heart.  Sometimes I talk to ' Jack Frost '";
-		mes "the snowman.  Without reason.. even though he is a snowman,";
-		mes "He can understand and stand to listen to us";
-		next;
-		mes "[Debra]";
-		mes ". . . . .";
-		mes "When I talk to Jack Frost, I get to wonder about many things of";
-		mes "him and feel something mysterious, I assume you will be the same";
-		mes "as me, if you try to talk to him.";
-		next;
-		mes "[Debra]";	
-		mes "like how he has been created, who granted him to posses the heart";
-		mes "of human and can talk,";
-		next;
-		mes "[Debra]";
-		mes "Where he was from, That place has a lot of snow all the time or";
-		mes "not... how he came to arrive this town without legs...";
-		next;
-		mes "[Debra]";
-		mes "Lately in this town,";
-		mes "it seems the number of curious people coming to him gets increased.";
-		mes "If you still couldn't solve his secret after talking with him";
-		next;
-		mes "[Debra]";
-		mes "I suggest you to talk to other towners...";
-		if (xmas_npc != 0) close;
-		mes "Ah!... I almost forgot you to tell... Santa Claus lives here in";
-		mes "this town....";
-		next;
-		mes "[Debra]";
-		mes "Didn't you see him yet? Why don't you go meet him then? Take";
-		mes "care now! Merry Christmas!!";
+		mes "[Thachentze]";
+		mes "...";
+		mes "Okay, now I think I better be ready to pickle some cabbages. If you didn't know already, I make the best pickles around! Why don't you visit me later and try some?";
 		close;
 	}
 }
 
-//=======================================================================
-//		NPC's Outside
-//=======================================================================
-
-// Peterson
-//=========================================================
-xmas,117,304,4	script	Peterson	713,{
-switch (xmas_npc) {
-	case 3:
-	case 4:
-		mes "[Peterson]";
-		mes "Did ^3355FF'Jack Frost'^000000 tell you about me? Oh I see... he is a";
-		mes "snowman who has no legs.  It's a shame he can't come here to see";
-		mes "me... I appreciate you to coming here for him. I will visit him";
-		mes "someday.";
-		next;
-		mes "[Peterson]";
-		mes "There is a man who knows about Jack Frost's secret.....";
-		mes "That man is ^3355FF'Hairy Uncle Ken'^000000... Yes, he definitely knows...";	
-		next;
-		mes "[Peterson]";
-		mes "One day when an apprentice of the great alchemist visited Lutie,";
-		mes "I listened to the conversation between Hairy Uncle Ken and";
-		mes "Jack Frost.";
-		next;
-		mes "[Peterson]";
-		mes "Once upon a time, a great alchemist came to Jack Frost's home";
-		mes "land and found him dying and melting away into water.  He revived";
-		mes "him with several ores of magic and some other things.....";
-		next;
-		mes "[Peterson]";
-		mes "Well, as far as the details of the story, I recommend you listen";
-		mes "to what ^3355FF'Hairy Uncle Ken'^000000 has to say.";
-		set xmas_npc,4;
-		close;
-	default:
-		mes "[Peterson]";
-		mes "Merry Christmas!";
+// Lutie
+//============================================================
+xmas,117,304,4	script	Poze	713,{
+	if(xmas_npc == 3 || xmas_npc == 4) {
+		mes "[Poze]";
+		mes "You've gone to";
+		mes "^3355FFSnowysnow^000000 and he";
+		mes "mentioned me?";
+		next;
+		mes "[Poze]";
+		mes "Oh I see...";
+		mes "He's a snowman that doesn't have any legs. No wonder he hasn't come to visit me. What a shame, what a shame. I guess I better go visit him instead.";
 		next;
-		mes "[Peterson]";
-		mes "Here in Lutie, it's always Christmas 24 hours a day and 365";
-		mes "days a year, Christmas is celebrated non stop here!  This beautiful";
-		mes "city fills your heart with the joyous spirit of Christmas...";
+		mes "[Poze]";
+		mes "Oh, there is someone who knows how Snowysnow came to be able to speak. That person would be ^3355FFUncle Hairy Cantata^000000...";
 		next;
-		mes "[Peterson]";
-		mes "Walk around town and you will see... this city has some of the";
-		mes "best facilities and attractions of any other place.";
+		mes "[Poze]";
+		mes "One day when apprentice of the great alchemist visted Lutie, I came to listen in on a conversation between him and Uncle Hairy.";
 		next;
-		mes "[Peterson]";
-		mes "Lutie is a great place for those who don't want to worry about";
-		mes "anything.  So may happiness be with you... Merry Christmas!!";
+		mes "[Poze]";
+		mes "Long ago, a great alchemist came by Snowysnow's hometown and happened to meet Snowysnow dying, melting down into water. However, Snowysnow was miraculously revived by that Alchemist.";
+		next;
+		mes "[Poze]";
+		mes "But that's pretty much all I know. For the actual details, you should ask ^3355FFUncle Hairy Cantata^000000.";
+		set xmas_npc,4;
+		close;
+	}else{
+		mes "[Poze]";
+		mes "Welcome to Lutie,";
+		mes "the town which blesses";
+		mes "all of its visitors with";
+		mes "the spirit of Christmas!";
+		mes "Merry Christmas !";
+		next;
+		mes "[Poze]";
+		mes "Here in this magical land of fun and fancy, you can enjoy the spirit of Christmas all year round~! Isn't that wonderful?";
+		next;
+		mes "[Poze]";
+		mes "Lutie isn't merely just a simple attraction. We have convenient facilities like the other towns, but in a festive environment.";
+		next;
+		mes "[Poze]";
+		mes "So if you decide to stay here for a while, you should have all the comforts that you need. Merry Christmas~";
 		close;
 	}
 }
 
-// Hairy Uncle Ken
-//==========================================================
-xmas,176,236,4	script	Hairy Uncle Ken	712,{
-switch (xmas_npc) {
-	case 4:
+xmas,176,236,4	script	Uncle Hairy	712,{
+	if(xmas_npc == 4) {
 		if(countitem(1024) > 0 && countitem(938) > 0) {
-			delitem 1024,1;
-			delitem 938,1;
-			mes "[Hairy Uncle Ken]";
-			mes "Oh ?! *Chuckles* !! You seem to be a reliable person..";
-			mes "Good! Ok, first I need something to drink....";
-			next;
-			mes "^3355FF- Handed him Squid Ink and  -^000000";
-			mes "^3355FF- Sticky Muscus. -^000000";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Burrrrpppp - Ok now ! Well now, it's the time for my story...";
-			mes "Keep in mind this is the story from what I know......";
-			mes "I am not sure how much you heard about this though . .";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "A long, long, time ago, there was a great Alchemist living in";
-			mes "the far north.  His name was ^3355FF' Philip Varsez '^000000 !!";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "He was eager to keep beyond the bounds of new alchemy,";
-			mes "and new alchemy needed rare materials to be accomplished as";
-			mes "he wanted.  So he decided to go travel all over the world to";
-			mes "look for items possessing Strong Magic Force within.";
-			mes "Eventually he arrived at a village of freezing weather,";
-			mes "somewhere up north...";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "As immediately came inside the village he encountered a grim";
-			mes "scene..... Everything was destroyed.... there was nothing left.";
-			mes "People groaned and moaned in pain, and were dying...";
-			mes "It was the worst scene he'd ever witnessed.";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Suddenly some strange force caught his attention.... That";
-			mes "strange thing was a snowman that was melting down into water";
-			mes "....^3355FF' Jack Frost '^000000! Even more astonishing was";
-			mes "the fact that it held 2 crying babies in its arms.  So the";
-			mes "great alchemist could assumed the snowman sacrificed itself to";
-			mes "protect them from great danger.";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "It touched the Alchemist to see that, and he decided to save";
-			mes "the life of snowman with his great power of alchemy.  He";
-			mes "transported the snowman to Lutie, this Christmas Town, the";
-			mes "safest place in this world.";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Some time later, rumors began to circulate that not only was";
-			mes "Jack Frost saved by the mercy of the Alchemist, but also";
-			mes "because of the snow that Jack Frost was made out of.";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "The truth is, Jack Frost was made out of snow covering up the";
-			mes "mysterious field where Magical flowers and plants grew all";
-			mes "over.";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Muhahaha -";
-			mes "Alrighty then... this is the whole story as far as I know.";
-			mes "How about you now? Did my story satisfy you? Haw Haw Haw!!";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Oh well... Now I regret to say, I have no idea about the";
-			mes "special ability that Jack Frost has that creates unlimited";
-			mes "Christmas presents...";
+			mes "[Cantata]";
+			mes "Oh? Y-y-you've got the stuff? Goooooooood. It's been so long since I've been able to have some of this... G-give it to me!";
+			next;
+			delitem 1024,1;	// Chinese_Ink
+			delitem 938,1;	// Sticky_Mucus
+			mes "^3355FFYou quickly handed him the Squid Ink and Sticky Mucus and watched with a little disgust as he relished the flavor.^000000";
+			next;
+			mes "[Cantata]";
+			mes "*Burrrrpppp~*";
+			mes "Well, now it's the time for my story. Keep in mind that this is the whole story from what I know. I'm not sure how much you've already heard though...";
+			next;
+			mes "[Cantata]";
+			mes "A long time ago,";
+			mes "there was a great";
+			mes "Alchemist living";
+			mes "in the far north.";
+			mes "His name was";
+			mes "^3355FFPhilip Varsez^000000!";
+			next;
+			mes "[Cantata]";
+			mes "He was always foremost in the research of alchemy and needed rare materials to conduct his studies. Because of that, he had to travel the world in search of materials containing magical energies...";
+			next;
+			mes "[Cantata]";
+			mes "One day, his travels brought him to a northern village known for its freezing weather. But when he arrived, he was welcomed by a smouldering town that had recently been destroyed.";
+			next;
+			mes "[Cantata]";
+			mes "It was a grim sight: People were lying at the roadside, groaning in agony. As Varsez walked by, each villager would beg, 'K-Kill me...' and plead for him to put them out of their misery.";
+			next;
+			mes "[Cantata]";
+			mes "Amidst the woeful cries of despair, the wails of two infants reached the ears of Philip Varsez. He rushed to investigate and found two babies cushioned in the bosom of a melting snowman.";
+			next;
+			mes "[Cantata]";
+			mes "That snowman...";
+			mes "was ^3355FFSnowysnow^000000.";
+			next;
+			mes "[Cantata]";
+			mes "Being the wise Alchemist that he is, Varsez deduced that Snowysnow sacrificed himself to protect those two babies from the great disaster that had destroyed the village.";
+			next;
+			mes "[Cantata]";
+			mes "Varsez was touched, and was determined to save the life of this snowman with his alchemy. He would then transport him here to Lutie, the safest place in the world.";
+			next;
+			mes "[Cantata]";
+			mes "Of course, there was another rumor that, in addition to the mercy from that Alchemist, Snowysnow was able to survive due to the special properties of his snow.";
+			next;
+			mes "[Cantata]";
+			mes "It's believed that Snowysnow's snow used to cover a mysterious field that would be filled with the bloom of magical flowers.";
+			next;
+			mes "[Cantata]";
+			mes "Muhahaha~";
+			mes "Well, that's pretty much all I know. I hope you were able to learn what you wanted from my story! Haw haw haw!";
+			next;
+			mes "[Cantata]";
+			mes "Well...";
+			mes "Now that I think about it...";
+			next;
+			mes "[Cantata]";
+			mes "Snowysnow can not only speak, but he also seems to be able to create an endless supply of Christmas presents. Or at least, that's what I hear.";
+			next;
+			mes "[Cantata]";
+			mes "^3355FFThachentze^000000, that lovely pickle maker, knows more about it. So if you're curious, you should go talk to her. Alrighty then, Merry Christmas!";
 			set xmas_npc,5;
-			next;		
-		}
-		if (xmas_npc == 4) {
-			mes "[Hairy Uncle Ken]";
-			mes "Oh yeah ? Peterson told you to come speak to me, did he?";
-			mes "Haw Haw Haw ! ! Yeah, yeah, I know him a little bit . .";
-			mes "To be honest, you can say I'm his weak point!";
-			mes "Cause I know the secret of ^3355FF'Jack Frost's birth'^000000!!";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Are you curious about it? *Chuckles* Yeah, I can tell by your face.";
-			mes "However! Don't think that I'd tell you this secret for nothing...";
-			mes "Come to think of it... I am feeling really thirsty now....";
-			mes "Bring me ^3355FF'1 Squid Ink'^000000 and ^3355FF'1 Sticky Mucus'^000000!!!";
-			next;
-			mes "[Hairy Uncle Ken]";
-			mes "Wahhahaha! Don't look at me like that! My tastes are none of your";
-			mes "business!!! Start finding a way to get me what I want, otherwise";
-			mes "...... you won't get what YOU want.... *Chuckles*";
+			close;		
+		}else{
+			mes "[Cantata]";
+			mes "Oh yeah? Heard about me from Poze, did you? Haw haw haw! Yeah, I know a little bit about Snowysnow. In fact, I may even be his weak point, since...";
+			next;
+			mes "[Cantata]";
+			mes "I know";
+			mes "the secret of";
+			mes "^3355FFSnowysnow's birth^000000!!";
+			next;
+			mes "[Cantata]";
+			mes "Are you curious?";
+			mes "Heh heh heh~ Well, don't think I'll let you know unless you give me something in return!";
+			next;
+			mes "[Cantata]";
+			mes "Living in this";
+			mes "town doesn't give me";
+			mes "much of a chance to enjoy";
+			mes "a man's drink. Hmmm, bring me...";
+			next;
+			mes "[Cantata]";
+			mes "^3355FF1 Squid Ink^000000 and";
+			mes "^3355FF1 Sticky Muscus^000000!";
+			next;
+			mes "[Cantata]";
+			mes "Wahhahaha! What the hell is that look for?! Never you mind my gourmet sense of taste! Now get to work~!";
 			close;
 		}
-		
-	case 5:
-		mes "[Hairy Uncle Ken]";
-		mes " ^3355FF' Mima '^000000 the excellent kimchi maker";
-		mes "knows about it through and through... If you're interested";
-		mes "you'd better to go visit her.  Alrighty, Merry Christmas !!";
-		close;
-		
-	default:
-		mes "[Hairy Uncle Ken]";
-		mes "Meeeerrrrrrryyyy Christmas !";
-		mes "Welcome to the Christmas Town!!";
-		mes "Your face is glowing... The weather here is really ... Cold!";
-		mes "And it's so cold that it makes you look like........";
-		next;
-		mes "[Hairy Uncle Ken]";
-		mes "A ^3355FF' Red Little Apple '^000000,";
-		mes "HarHarHarHar!";
-		mes "Try not to catch a cold.  The flu in Lutie is very strong.......";
-		next;
-		mes "[Hairy Uncle Ken]";
-		mes "... Speaking of the cold, that reminds me...";
-		next;
-		mes "[Hairy Uncle Ken]";
-		mes "My kid recently caught a serious cold.... It happened at midnight";
-		mes "and all the pharmacies were closed.  I was desperate so I went to";
-		mes "the abandoned ^5533FFToy Factory^000000 .......";
-		next;
-		mes "[Hairy Uncle Ken]";
-		mes "Little monster were running around all over... even ^5533FFIce Porings^000000!";
-		mes "People here often call them Ice Ball Porings... anyways I grabbed";
-		mes "one of them and ran back to the house.  I put it on top of my";
-		mes "childs head...";
-		next;
-		mes "[Hairy Uncle Ken]";
-		mes "And what do you know... his fever cooled down right away! Heh! This";
-		mes "is such a convenient village to live in.  I've talked too much....";
-		mes "Good luck to you!";
+	}
+	else {
+		mes "[Cantata]";
+		mes "Merry Christmas!";
+		mes "Welcome to Lutie!";
+		next;
+		mes "[Cantata]";
+		mes "It looks like the cold has brought a rosiness to your cheeks.";
+		mes "Haw haw haw!";
+		next;
+		mes "[Cantata]";
+		mes "Be careful, it wouldn't be good for you to catch the Lutie Flu.";
+		mes "...";
+		next;
+		mes "[Cantata]";
+		mes "*Sigh* That reminds me...";
+		mes "My little boy had a terrible case of the Lutie Flu a while ago.";
+		next;
+		mes "[Cantata]";
+		mes "It was during the night, and there was no place I could get any medicine. It seemed I could do nothing for my little boy.";
+		next;
+		mes "[Cantata]";
+		mes "I thought the least I could do for my son was get something cold to bring down his fever, but the snow of Lutie kept on melting after being placed on his forehead. He was burning up, and I was failing to relieve him.";
+		next;
+		mes "[Cantata]";
+		mes "It was then that";
+		mes "I knew I needed";
+		mes "some magic ice.";
+		next;
+		mes "[Cantata]";
+		mes "Eventually, I found myself in the Christmas dungeon without any goal in mind. Inside I found, thank God, a certain creature made entirely of ice!";
+		next;
+		mes "[Cantata]";
+		mes "It was an ^3355FFIceporing^000000! The local people used to call it 'Icepantzering.' Anyway, I was able to save my boy's life with it. Thank goodness something like that was around in this town.";
+		next;
+		mes "[Cantata]";
+		mes "Oops, I think I've talked a bit much. Merry Christmas~!";
 		close;
 	}
 }
 
-// Jack Frost
-//====================================================================
-xmas,134,112,4	script	Jack Frost	710,{
-	mes "[Jack Frost]";
-	switch (xmas_npc) {
-		case 2:
-			mes "Did you hear something from 'Debra'? Heh heh... the people of";
-			mes "Lutie call me a mysterious Snowman... honestly I am nothing but";
-			mes "a simple snowman... heh heh.";
-			next;
-			mes "[Jack Frost]";
-			mes "Besides I don't even know who I really am. Maybe I know as much";
-			mes "about myself as do the people here.";
-			next;
-			mes "[Jack Frost]";
-			mes "Mr.^3355FF'Peterson'^000000 gave me his name card and told me to visit";
-			mes "him whenever I wanted to.... but as you can see.....";
+xmas,134,112,4	script	Snowman	710,{
+	if (checkweight(1201,1) == 0 ) {
+		cutin "rutie_snownow01.bmp",2;
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you loose some weight. -";
+		close2;	cutin "",255;	end;
+	}
+	cutin "rutie_snownow03.bmp",2;
+	mes "[Snowysnow]";
+	mes "I'm...";
+	mes "I'm so lonely!";
+	next;
+	mes "[Snowysnow]";
+	mes "Always stuck here...";
+	mes "On the same spot...";
+	mes "Day after day after day after day after day after day after day after day after day after day...";
+	next;
+	switch(select("^3355FFSnowysnow?^000000:Info about the Christmas dungeon:Quit this conversation")) {
+	case 1:
+		if (xmas_npc < 2) {
+			cutin "rutie_snownow01.bmp",2;
+			mes "[Snowysnow]";
+			mes "I was born in an area to the north where it snowed all the time, and was much colder than Lutie, if you can believe that.";
 			next;
-			mes "[Jack Frost]";
-			mes "I don't have any legs so I can't go anywhere..... ";
-			emotion e_sob;
+			mes "[Snowysnow]";
+			mes "I was made with love by a human, and I was really happy there. Life was simple, but it was full of quiet bliss.";
 			next;
-			mes "[Jack Frost]";
-			mes "How did I get here...? Why can I communicate with humans...?";
-			mes "How can I......??";
+			mes "[Snowysnow]";
+			mes "I thought I could live the rest of my life in that kind of contentment. But... It was not to be.";
 			next;
-			mes "^3355FF- Jack Frost falls deep into his thoughts -^000000";
-			mes "^3355FF- He is looking at 'Peterson's' name card -^000000";
-			set xmas_npc,3;
-			close;
-		case 3:
-			mes ". . . . . . . . . . . . . . .";
+			cutin "rutie_snownow01.bmp",2;
+			mes "[Snowysnow]";
+			mes "One fateful day, some ugly old woman came to our town. People say her name was 'Merlophechum,' and that she was from some strange cave town where the weather was always hot.";
 			next;
-			mes "^3355FF- Jack Frost falls deep into his thoughts -^000000";
-			mes "^3355FF- He is looking at 'Peterson's' name card -^000000";
-			close;
-		case 4:
-			mes "Did you meet 'Peterson'? He is a honest and diligent guy . .";
-			mes "And I know . . He fell in love with 'Debra'....";
-			mes "hehehehehe...";
-			next;
-			mes "[Jack Frost]";
-			mes "I think 'Debra' needs to be more generous. She is very kind to";
-			mes "everyone, except Peterson.  But I know... Debra likes Peterson";
-			mes "as much as he does here...";
-			close;
-		case 5:
-			mes "You spoke with ^3355FF'Hairy Uncle Ken '^000000?";
-			mes "Hairy Uncle Ken has loud voice, and doesn't take showers.....";
-			mes "he smells kinda bad.... but he is a very funny and diligent guy.";
-			mes "Everybody likes him.";
-			next;
-			mes "[Jack Frost]";
-			mes "He enjoys drinking some strange kind of drink......";
-			mes "They say it is a miracle that he doesn't have a stomachache.";
-			mes "Heh~ . .I love this guy too . .";
-			close;
-		case 6:
-			mes "Hmmm you did you meet ^3355FF'Mima'^000000, the kimchi expert?";
-			mes "Yeah yeah.  I've been keeping this for here.  Here you go, It is";
-			mes "the salt she wants.";
-			next;
-			set xmas_npc,7;
-			mes "^3355FF' Got the roughest salt in the world'^000000.";
-			next;
-			mes "[Jack Frost]";
-			mes "I like her cooking because it is so delicious.";
-			mes "Sometimes she offers me cups of ice flakes with grape syrup...";
-			next;
-			mes "[Jack Frost]";
-		case 7:
-			mes "^3355FF' The roughest salt in the world '^000000";
-			mes "hopefully you will deliver it safely to her . .";
-			close;
-		case 8:
-			mes "Boring Clown 'Howie'... At first glance, he looks a dumb,";
-			mes "talent less clown..... But he has a pure heart and is always";
-			mes "taking care of the 2 orphans...";
-			close;
-		case 9:
-			mes "'Charlie ' the boy of optimism.";
-			mes "He will become a big shot in future . .";
-			mes "Just like me ! -";
-			mes "Hahahaha . . . . .";
-			close;
-		case 10:
-			mes ". . . . . Thank you for listening to me so far.";
-			mes "I very much appreciate you trying to understand me,";
-			mes "even though you are a stranger here.";
+			mes "[Snowysnow]";
+			mes "On the third night she was there, she set the town on fire with frightening magic. Everyone was running in panic amongst the fear and chaos. And somehow, I was knocked out.";
 			next;
-			mes "[Jack Frost]";
-			mes "I think you know more about me than anyone else in this town.";
-			mes "Hahahaha.... I want to give you a small present in return.";
+			cutin "rutie_snownow02.bmp",2;
+			mes "[Snowysnow]";
+			mes "I didn't notice how much time passed after that, but when I woke up, I was here. Well, I can say that this place, Lutie, is pretty much like heaven.";
 			next;
-			mes "[Jack Frost]";
-			mes "Tah dah!! Pick up anything you want in here - !!";
+			mes "[Snowysnow]";
+			mes "Everyone here is never worried, and I'm always hearing Christmas carols and stuff.";
 			next;
-			mes "^3355FF- Stir the gift bag -^000000";
+			cutin "rutie_snownow03.bmp",2;
+			mes "[Snowysnow]";;
+			mes "But still...";
+			mes "Sometimes all that Christmas joy somehow doesn't cure the dark loneliness that wells deep inside of me.";
 			next;
-
-			// Part of the Bard Job Quest
-			set xmas_npc,11;
-			
-			mes "[Jack Frost]";
-			mes "Wow -Congratulations!!";
-			switch (rand(1,8)) {
+			mes "[Snowysnow]";
+			mes "So will you be my friend? If you do, I'll be your friend too~";
+			close2;	cutin "",255;	end;
+		}else{
+			switch(xmas_npc) {
+			case 2:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Oh...?";
+				mes "So you've met Duffle?";
+				mes "Yeah, sometimes she";
+				mes "stops by and says 'hi...'";
+				next;
+				mes "[Snowysnow]";
+				mes "It's weird that the people of Lutie call me a mysterious, magical snowman. I mean, inside, aren't I just the same as regular people?";
+				next;
+				mes "[Snowysnow]";
+				mes "*Sniff* S-sometimes,";
+				mes "I don't even know what I am. But even so, the people of Lutie try to accept me no matter what.";
+				next;
+				mes "[Snowysnow]";
+				mes "^3355FFPoze^000000 gave me his glamour photo with his address on it, and told me to visit him whenever I'm feeling blue. I was so happy to hear that...";
+				next;
+				mes "[Snowysnow]";
+				mes "But then fate played its cruel joke on me once again, and I realized that I had no legs to visit him with.";
+				next;
+				mes "[Snowysnow]";
+				mes "How did I ever get to this town? And how in the world am I able to talk?! I-It's not natural, is it? Does... Does that make me a monster?";
+				next;
+				mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000";
+				mes "^3355FFfixated on Poze's memento.^000000";
+				set xmas_npc,3;
+				close2;	cutin "",255; end;
+			case 3:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "...";
+				next;
+				mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000";
+				mes "^3355FFfixated on Poze's memento.^000000";
+				close2;	cutin "",255;	end;
+			case 4:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Oh goody!";
+				mes "You've met Poze!";
+				next;
+				mes "[Snowysnow]";
+				mes "He's such an honest, good hearted guy. I hope he and Duffle get together someday.";
+				next;
+				mes "[Snowysnow]";
+				mes "...Oh no~!";
+				mes "Did I say that out loud? That was supposed to stay in my head! I'm soooo sorry! Boy, I can be a real dum-dum head, huh?";
+				next;
+				mes "[Snowysnow]";
+				mes "Yeah...";
+				mes "Poze is in love with Duffle. And she's kind to everybody, except for Poze.";
+				next;
+				mes "[Snowysnow]";
+				mes "But I know that's because she likes him a whole whole lot! Hee hee hee!";
+				close2;	cutin "",255;	end;
+			case 5:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Oh...?";
+				mes "You've met";
+				mes "^3355FFUncle Hairy Cantata^000000?";
+				next;
+				cutin "rutie_snownow02.bmp",2;
+				mes "[Snowysnow]";
+				mes "Sure, he has a loud voice, doesn't take showers and smells like rotting food. But he's a funny guy with a warm heart. Everybody loves him!";
+				next;
+				mes "[Snowysnow]";
+				mes "Of course, he still enjoys drinking strange things. They say it's a miracle that he doesn't have a tummyache. Hee hee~! Oh, I love that guy!";
+				close2;	cutin "",255;	end;
+			case 6:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Oh...?";
+				mes "You've met";
+				mes "^3355FFAunt Thachentze^000000?";
+				next;
+				mes "[Snowysnow]";
+				mes "Yeah, she's a pickle expert, alright. Oh right, would you give this to her? I've been keeping the roughest salt in the world for her as a bit of a favor.";
+				next;
+				set xmas_npc,7;
+				mes "^3355FFSnowysnow gave you the roughest salt in the world^000000.";
+				next;
+				mes "[Snowysnow]";
+				mes "I like her cooking because it's soooo delicious! Sometimes, she gives me grape syrup on snow flakes. Anyway, please deliver that salt for me, buddy~!";
+				close2;	cutin "",255;	end;
+			case 7:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "'^3355FFThe roughest";
+				mes "salt in the world^000000...'";
+				mes "Wow. Now, that's rough! Aunt Tachentze is always making pickles, so she sure could use it soon!";
+				close2;	cutin "",255;	end;
+			case 8:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Hashokii, the boring clown? At first, he seems kind of dumb and not really that funny. But deep inside, he cares a lot about other people.";
+				next;
+				mes "[Snowysnow]";
+				mes "He's always trying his best to make those two orphans laugh and forget their troubles...";
+				close2;	cutin "",255;	end;
+			case 9:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Ah...";
+				mes "So you've met Charu Charu? That boy is so full of optimism and always looking forward. When he grows up, he's going to be a big shot!";
+				next;
+				mes "[Snowysnow]";
+				mes "I'm sure of it!";
+				mes "Hee hee hee~!";
+				close2;	cutin "",255;	end;
+			case 10:
+				cutin "rutie_snownow01.bmp",2;
+				mes "[Snowysnow]";
+				mes "Thank you for listening to me so far. I really appreciate that you try to understand me, even though you're a stranger here.";
+				next;
+				mes "[Snowysnow]";
+				mes "Now, you know me better than anyone else in this town. So, in return, I want to give you a small present.";
+				next;
+				mes "[Snowysnow]";
+				mes "Tah dah!";
+				mes "Pick anything";
+				mes "you want in here~";
+				next;
+				mes "^3355FFYou gingerly stir";
+				mes "your hand around in";
+				mes "Snowysnow's magical gift bag^000000.";
+				set .@snownow,rand(1,8);
+				next;
+				switch(.@snownow) {
 				case 1:
-					getitem 529,5;
-					mes "^3355FF- 5 Candies -^000000!";
+					set xmas_npc,11;
+					getitem 529,5;	// Candy
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Wow~!";
+					mes "^3355FF5 Candy^000000!";
+					mes "Congratulations!";
 					break;
 				case 2:
-					getitem 529,10;
-					mes "^3355FF- 10 Candies -^000000!";
+					set xmas_npc,11;
+					getitem 529,10;	// Candy
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Ooh~!";
+					mes "^3355FF10 Candy^000000!";
 					break;
 				case 3:
-					getitem 530,5;
-					mes "^3355FF- 5 Candy Canes-^000000!";
+					set xmas_npc,11;
+					getitem 530,5;	// Candy_Striper
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Hoooraaaay~!";
+					mes "^3355FF5 Candy Cane^000000!";
 					break;
 				case 4:
-					getitem 530,10;
-					mes "^3355FF- 10 Candy Canes-^000000!";
+					set xmas_npc,11;
+					getitem 530,10;	// Candy_Striper
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Wow, that's so great!";
+					mes "^3355FF10 Candy Cane^000000!";
 					break;
 				case 5:
-					getitem 539,1;
-					mes "^3355FF- 1 Piece of Cake-^000000!";
+					set xmas_npc,11;
+					getitem 539,1;	// Piece_Of_Cake
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Aren't you lucky!";
+					mes "^3355FF1 Piece Of Cake^000000!";
 					break;
 				case 6:
-					getitem 539,2;
-					mes "^3355FF- 2 Pieces of Cake-^000000!";
+					set xmas_npc,11;
+					getitem 539,2;	// Piece_Of_Cake
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Now, isn't that nice?";
+					mes "^3355FF2 Piece Of Cake^000000!";
 					break;
 				case 7:
-					getitem 538,5;
-					mes "^3355FF- 5 Cookies-^000000!";
+					set xmas_npc,11;
+					getitem 538,5;	// Well_Baked_Cookie
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "Oh woooooow~!";
+					mes "^3355FF5 Cookie^000000!";
 					break;
 				case 8:
-					getitem 538,10;
-					mes "^3355FF- 10 Cookies-^000000!";
+					set xmas_npc,11;
+					getitem 538,10;	// Well_Baked_Cookie
+					cutin "rutie_snownow02.bmp",2;
+					mes "[Snowysnow]";
+					mes "*Gasp!* Ooh~";
+					mes "^3355FF10 Cookie^000000!";
 					break;
-			}
-			mes "My dear friend,";
-			mes "Please visit me from time to time, and take a chitchat with me.";
-			mes "See you soon -";
-			mes "Merry Christmas!!";
-			close;
-	case 11:
-		mes "Welcome dear my friend -";
-		mes "You are always welcomed in this Christmas Town.";
-		mes "Especially by me, Jack Frost !";
-		mes "Merry Christmas !!";
-		close;
-	default:
-		mes "*sob*sob*........ I'm so lonely..... I can't go anywhere! I";
-		mes "am stuck here day and night... frozen to this cold earth....";
-		emotion e_sob;
-		next;
-		switch (select("^0000FFJack Frost?^000000:A secret Toy Factory?:...............")) {
-			case 1:
-				mes "[Jack Frost]";
-				mes "I was created by a human..... A giant snow doll is what some call me.....";
-				mes "I remember being born somewhere very cold......";
+				}
 				next;
-				mes "[Jack Frost]";
-				mes "Just like Lutie, this is a chilly little town.... I used to be happy up north but.......";
+				mes "[Snowysnow]";
+				mes "My dear friend, please visit me from time to time, so that we can chitchat, okay? See you soon! And Merry Christmas!";
+				close2;	cutin "",255;	end;
+			case 11:
+				cutin "rutie_snownow02.bmp",2;
+				mes "[Snowysnow]";
+				mes "Hello hello!";
 				next;
-				mes "[Jack Frost]";
-				mes "On day a horrible old lady came to my village...... Her name was.... ^790079'Mariposum'^000000......";
-				mes "I heard she came from some place extremely hot..... Some weird village in some kind of cave.";
-				next;
-				mes "[Jack Frost]";
-				mes "On the fourth night after she arrived here, she went to central square.......";
-				mes "Without warning she started casting horrible spells....... Suddenly a huge storm emerged.....";
-				next;
-				mes "[Jack Frost]";
-				mes "Almost immediately the powerful storm knocked my friend and I unconscious........";
-				next;
-				mes "[Jack Frost]";
-				mes "I don't know how long I was out, but when I woke up I found myself right here in Lutie..........";
-				next;
-				mes "[Jack Frost]";
-				mes "But my friends were not...... I have lost all of my friends.......... I feel so lonely.......";
-				emotion e_sob;
-				close;
-			case 2:
-				mes "[Jack Frost]";
-				mes "Somewhere in Lutie there is a place that looks just like a ^5533FFToy";
-				mes "Factory^000000....... It's well decorated and looks like a lot of";
-				mes "fun but.......";
-				next;
-				mes "[Jack Frost]";
-				mes "I heard that it is overrun with possessed toy soldiers and gift";
-				mes "boxes........";
-				next;
-				mes "[Jack Frost]";
-				mes "Part of me is intrigued by this place and I would like to see it";
-				mes "just once..... But part of me is also a little frighten of the";
-				mes "possessed toys.....";
-				close;
-			case 3:
-				mes "[Jack Frost]";
-				mes "So long! Come visit me any time.  Merry Christmas!";
-				close;
+				mes "[Snowysnow]";
+				mes "You're always welcome in Lutie, especially by me, Snowysnow! Happy Kwanza, Happy Hannukah and Merry Christmas~!";
+				close2;	cutin "",255;	end;
+			}
+		}
+		case 2:
+			cutin "rutie_snownow01.bmp",2;
+			mes "[Snowysnow]";
+			mes "Around this wonderful town, eternally blessed with Christmas, there is a horrible dungeon, eternally cursed with Christmas.";
+			next;
+			mes "[Snowysnow]";
+			mes "I've heard that it's well decorated and looks just like a Toy Factory inside, where everything is so cute and pretty. They are Toy Soldiers and Gift Boxes as far as the eye can see!";
+			next;
+			cutin "rutie_snownow01.bmp",2;
+			mes "[Snowysnow]";
+			mes "Isn't that soooo exciting?! *Sigh* Even if it is a dungeon, I would like to go inside just to look. If only I was a real boy, or even had legs...";
+			close2;	cutin "",255;	end;
+		case 3:
+			cutin "rutie_snownow03.bmp",2;
+			mes "[Snowysnow]";
+			mes "Bye bye, friend~!";
+			mes "Thank you for listening me~";
+			mes "I'll see you again, someday! You'll always be in my heart~";
+			close2;	cutin "",255;	end;
 		}
-	}	
 }
 
-// Howie the Clown
-//=====================================================================
-xmas,146,136,4	script	Howie the Clown	715,{
-	mes "[Howie]";
+xmas,146,136,4	script	Hashokii	715,{
+	mes "[Hashokii]";
 	mes "Meeee~RrrrrYYYY Christmas~!";
-	mes "La La La! La La La La!~";
-	mes "Dum di Dum di Dum";
+	mes "La La La~!";
+	mes "Dum di Dum di Dum!";
 	next;
-	switch (select("Hey, Clown, what are you doing?:About the Snowman:Quit conversation")) {
-		case 1:
-			mes "[Howie]";
-			mes "La La La~ Dum di Dum di Dum........ Huh?.....";
+	switch(select("Yo Clown boy, what's up?:About Snowysnow:Quit conversation")) {
+	case 1:
+		mes "[Hashokii]";
+		mes "La La La~!";
+		mes "Dum di Dum di Dum!";
+		mes "Ooh, I'm trying to think of a good show to put on for Charu Charu and Marcell!";
+		next;
+		mes "[Hashokii]";
+		mes "They are getting smarter and wittier everyday, and now it seems that they don't laugh at my best jokes anymore. How did they get to be so clever?";
+		next;
+		mes "[Hashokii]";
+		mes "Well, if I work hard enough, they can't help but laugh at my hilarious jokes! So... I better start inventing better jokes. Like, pronto.";
+		next;
+		mes "[Hashokii]";
+		mes "La La La~!";
+		mes "Dum di Dum di Dum";
+		mes "Merry Christmas!";
+		close;
+	case 2:
+		if (xmas_npc == 8) {
+			mes "[Hashokii]";
+			mes "Dum di Dum di Dum";
+			mes "Ah ha! So you wanna learn more about Snowyshow! Let's see...";
 			next;
-			mes "[Howie]";
-			mes "Oh, I'm working on a show to entertain two lovely kids....";
-			mes "^5533FFCharlie and Marsha^000000.... and it's not easy!";
+			mes "[Hashokii]";
+			mes "Well, there are two naughty kids,";
+			mes "^3355FF' Charu Charu '^000000 and";
+			mes "^3355FF' Marcell '^000000. They attend my show regularly. I'm guessing you've heard the story from Cantata?";
 			next;
-			mes "[Howie]";
-			mes "Beleive it or not you have to be smart, talented, and of course";
-			mes "funny to be a clown.  It's getting tougher and tougher to make kids";
-			mes "laugh nowadays.... they just get bored so easily.... *sigh*";
+			mes "[Hashokii]";
+			mes "Anyway, the two babies that were protected in Snowysnow's bosom? Yup, that's them. But Charu Charu and Marcell don't seem to know that Snowysnow saved them.";
 			next;
-			mes "[Howie]";
-			mes "So I have to push myself to be more creative.... to act funnier and";
-			mes "talk funnier...... to make them laugh out loud!!";
+			mes "[Hashokii]";
+			mes "Snowysnow told me the story of how he let his body fly into the air to block the giant fire ball that was about to hit them when they were babies. For their sake, he was willing to sacrifice himself.";
 			next;
-			mes "[Howie]";
-			mes "HaHaHaHa! HeHeHeHeHe! HoHoHoHoHo! Merry Christmas!!"; 
+			mes "[Hashokii]";
+			mes "Why don't you go meet those 2 children? They might tell you the story we've never got the chance to hear. Okay then, good luck~! Bye bye!";
+			set xmas_npc,9;
 			close;
-		case 2:
-			if (xmas_npc == 8 || xmas_npc == 9) {
-				mes "[Howie]";
-				mes "Dum di Dum di Dum... Ah ha ! I assume you're here because of";
-				mes "Jack Frost? Well, after all it is nothing peculiar....";
-				next;
-				mes "[Howie]";
-				mes "It's about two naughty kids, ^3355FF'Charlie'^000000 and ^3355FF'Marsha'^000000,";
-				mes "they are regular viewers of my show.  Did you heard about the";
-				mes "incindent happened in the northland from Hairy Uncle Ken by any";
-				mes "chance?";
-				next;
-				mes "[Howie]";
-				mes ". . . . . Then hopefully you will remember the 2 babies, whom";
-				mes "Jack Frost carried in his arms...while his body melted away...";
-				next;
-				mes "[Howie]";
-				mes "You guessed it... the 2 babies were Charlie and Marsha. They";
-				mes "don't seem to know about this.  Jack Frost told me their story...";
-				mes "He used his body to block the big giant fire ball rushing towards";
-				mes "the 2 babies....";
-				next;
-				mes "[Howie]";
-				mes "Jack Frost made the ultimate sacrifice for Charlie and Marsha....";
-				mes "I can see you are quite interested in the story of Jack Frost,";
-				mes "why don't you go meet those 2 children for more information?";
-				next;
-				mes "[Howie]";
-				mes "They might tell you some story we've never got the chance to hear.";
-				mes "Ok then, good luck! Bye bye!";
-				set xmas_npc,9;
-				close;
-			}
-			mes "[Howie]";
-			mes "You mean ^5533FF' Jack Frost '^000000? Of course I know him.  Everyone";
-			mes "knows Jack Frost the Snowman.  Sometimes I go and chat with him.";
-			next;
-			mes "[Howie]";
-			mes "I even do performances for him.  But I'm not quite sure if he likes";
-			mes "them.... cause whenever I finish my act.... He doesn't seem to have";
-			mes "any kind of reaction to it.....";
-			next;
-			mes "[Howie]";
-			mes "How could he not like an amazing show like mine??";
-			emotion e_hmm;
-			next;
-			mes "[Howie]";
-			mes "There's something strange about Jack Frost.... anyways...";
-			mes "La La La~ Dum di Dum di Dum";
+		}else{
+			mes "[Hashokii]";
+			mes "Ah... ^3355FFSnowysnow^000000?";
+			mes "Of course I know him! Anyone who doesn't know Snowysnow is a total stranger around here! Sometimes, he and I share a nice chat...";
+			next;
+			mes "[Hashokii]";
+			mes "He makes such a a good audience for my show. But to be honest, I'm not sure if he really likes it or not. Most people don't seem to care for my jokes.";
+			next;
+			mes "[Hashokii]";
+			mes "It totally baffles me! How could they not like the best jokes in the world?! Sheeeeesh~";
+			next;
+			mes "[Hashokii]";
+			mes "Hmmm, sorry!";
+			mes "Anyway, Snowysnow";
+			mes "is a great guy!";
+			mes "La La La~!";
+			mes "Dum di Dum di Dum";
 			mes "Merry Christmas- !!";
 			close;
-		case 3:
-			mes "[Howie]";
-			mes "La La La... Dum di Dum di Dum";
-			mes "Merry Christmas! Have a great day!";
-			close;
+		}
+	case 3:
+		mes "[Hashokii]";
+		mes "La La La~!";
+		mes "Dum di Dum di Dum";
+		mes "Merry Christmas~!";
+		close;
 	}
 }
 
-// Charlie
-//================================================================
-xmas,206,168,4	script	Charlie	706,{
-switch (xmas_npc) {
-	case 9:
-		mes "[Charlie]";
-		mes "Errr ? Jack Frost? Hmmm - Let me see....A nice snowman...";
-		mes "You want to know about Jack Frost.... Is this what you want? Ummm";
-		mes "let me see again... Argh - I am not that smart . . . . .";
-		mes "Better ask of Marsha though !";
+xmas,206,168,4	script	Little Boy	706,{
+	if (xmas_npc == 9) {
+		mes "[Charu Charu]";
+		mes "Errrm?";
+		mes "Snowysnow?";
+		next;
+		mes "[Charu Charu]";
+		mes "Hmmm, well...";
+		mes "He's a nice snowman!";
+		mes "You want to know more about Snowysnow? Ummm, I'm not that smart! Ask Marcell!";
 		close;
-	default:
-		mes "[Charlie]";
-		mes "Merry, Merry Christmas! Did you talk to that clown, ^5533FFHowie^000000 yet? Man that";
-		mes "clown is REALLY boring......";
+	}else{
+		mes "[Charu Charu]";
+		mes "Merry Merry Christmas!";
+		mes "Heheheheheh~!";
 		next;
-		mes "[Charlie]";
-		mes "After watching his show, me and Marsha felt like we had wasted our time.....";
+		mes "[Charu Charu]";
+		mes "Did you talk to that clown guy over there? Isn't he soooooo booooring? (-.-)";
 		next;
-		mes "[Marsha]";
-		mes "How can you say that? You know he always tries his best to make us happy.....";
+		mes "[Charu Charu]";
+		mes "When Marcell and I watch his show, we feel like we're getting dumber and dumber~";
 		next;
-		mes "[Charlie]";
-		mes "Meh.... whatever.... I still think he's boring....... I'd rather talk";
-		mes "to ^3355FF' Jack Frost '^000000.  He's a LOT more fun.";
+		mes "[Marcell]";
+		mes "Charu Charu!! Watch your mouth! How dare you say that about poor Hashokii?! He's always trying hard to make us happy!";
 		next;
-		mes "[Charlie]";
-		mes "Have you met the Snowman, Jack Frost, yet...... if not go find him.";
-		mes "He's a really funny guy."; 
+		mes "[Charu Charu]";
+		mes "Yeah, yeah.";
+		mes "Whatever~";
+		mes "I already know that!";
+		mes "But he's not funny at all!";
+		mes "I'd rather stay with ^3355FFSnowysnow^000000~";
 		next;
-		mes "[Charlie]";
-		mes "Anyways, Merry Christmas! Enjoy your stay in Lutie!";
+		mes "[Charu Charu]";
+		mes "Oh well, if you didn't visit Snowysnow yet, you should see him at least once. He's funny!";
+		next;
+		mes "[Charu Charu]";
+		mes "Merry Christmas!";
+		mes "Enjoy your Holiday in Lutie~!";
 		close;
 	}
 }
 
-// Marsha
-//================================================================
-xmas,208,168,4	script	Marsha	703,{
-switch (xmas_npc) {
-	case 9:
-		mes "[Marsha]";
-		mes "You mean Jack Frost? Of course I know.. He is nice and funny guy.";
-		mes "As Charlie always insists, he is better than Howie.....";
-		mes "(But please don't tell it to Howie~)";
-		next;
-		mes "[Marsha]";
-		mes "Charlie and I are Orphans.  We don't remember our parents at all.";
-		mes "We've been brought up by the kind people of Lutie, including";
-		mes "Hairy Uncle Ken and Auntie Mima.";
-		next;
-		mes "[Marsha]";
-		mes "They are all nice and generous, and we appreciate all of them for";
-		mes "taking care of us.  By the way I heard Jack Frost doesn't have a";
-		mes "mom or dad either... and I also heard that neither we nor Jack";
-		mes "Frost were born in this Christmas Town.";
-		next;
-		mes "[Marsha]";
-		mes "There is a rumor that myself, Charlie, and Jack Frost came here";
-		mes "from somewhere else.  I am not actually sure about that but,";
-		mes "at least I know that all of us have the same types of burns on";
-		mes "our bodies.  Charlie and I have it on our backs.";
-		next;
-		mes "[Marsha]";
-		mes "Jack Frost has a dark smudge on his tummy.... It makes me feel as";
-		mes "if we are somehow connected to each other...";
-		next;
-	case 10:
-		mes "[Marsha]";
-		mes "Oh? Now I see.... You've come to know a lot about Jack Frost....";
-		mes "Maybe even more than any one person in this town.  Please try to";
-		mes "talk to Mr. Jack Frost.  He will probably be delighted that you";
-		mes "are so interested in him.  Maybe you will even be able to get a";
-		mes "present from him.";
-		next;
-		mes "[Marsha]";
-		mes "I wish you the best of luck.  Merry Christmas!!";
-		set xmas_npc,10;
-		close;
-	default:
-		mes "[Marsha]";
-		mes "Merry Christmas to you!";
-		next;
-		mes "[Marsha]";
-		mes "I don't know if this is true... but I heard that the Snowman has";
-		mes "something special that is un imaginable..... a special power of sorts..";
-		next;
-		mes "[Marsha]";
-		mes "Oh by the way..... Have you met ^5533FFSanta Claus^000000 yet? He";
-		mes "carries TONS and tons of gifts is his BIG bag! I heard that the Snowman";
-		mes "also does that.... Isn't that AMAZING!?? So exciting!!";
-		emotion e_ic;
-		next;
-		mes "[Marsha]";
-		mes "I mean he has a big bag full of gifts too.... those how have been";
-		mes "friendly to the Snowman have gotten cool gifts from him!";
-		next;
-		mes "[Marsha]";
-		mes "..... Well at least that's what people say... but still.... isn't it";
-		mes "AMAZING!!";
-		emotion e_hmm;
+xmas,208,168,4	script	Little Girl	703,{
+	if (xmas_npc == 9 || xmas_npc == 10) {
+		switch(xmas_npc) {
+		case 9:
+			mes "[Marcell]";
+			mes "You mean Snowysnow?";
+			mes "Of course I know him!";
+			next;
+			mes "[Marcell]";
+			mes "He's a nice and funny guy!";
+			mes "And as Charu Charu always insists, he's funnier than Hashokii~ (But please don't let Hashokii know!)";
+			next;
+			mes "[Marcell]";
+			mes "Well, Charu Charu and I are orphans, and don't remember our parents at all. We've been brought up by the people here in Lutie.";
+			next;
+			mes "[Marcell]";
+			mes "Uncle Cantata and Auntie Thachentze treated us like their own children, and Poze and Duffle have been like a brother and sister to us!";
+			next;
+			mes "[Marcell]";
+			mes "They're all nice and generous, and we always appreciate what they've done to take care of us.";
+			next;
+			mes "[Marcell]";
+			mes "I also heard Snowysnow doesn't have a mommy or daddy too. And I also heard Snowysnow and us weren't born here, but somewhere else.";
+			next;
+			mes "[Marcell]";
+			mes "I've heard that Snowysnow and us actually come from the same place, although I'm not sure yet. But I know that Snowysnow and me have the same kind of burns on our body.";
+			next;
+			mes "[Marcell]";
+			mes "Charu Charu and I have these old burns on our backs, and Snowysnow has a dark smudge on his tummy. So I think we got burned all at the same time...";
+			next;
+			mes "[Marcell]";
+			mes "Oh, now I see . . . . .";
+			mes "You wanna learn all about Snowysnow because you want to become his friend! He'll be so happy to know that! Ooh! Maybe he'll give you a present! Good luck!";
+			set xmas_npc,10;
+			close;
+		case 10:
+			mes "[Marcell]";
+			mes "More than anybody else, you know the most about Snowysnow! Please talk to Mr.Snowysnow, he'll be happy to know you care about him. Merry Christmas!";
+			close;
+		}
+	}else{
+		mes "[Marcell]";
+		mes "Merry Christmas~!";
+		next;
+		mes "[Marcell]";
+		mes "It's freezing out here...! And Charu Charu makes me colder with his unbearable jokes. And the wind's blowing so hard!";
+		next;
+		mes "[Marcell]";
+		mes "You know what? Snowysnow has a special power. He can make as many presents as Santa Claus! Isn't that great?";
+		next;
+		mes "[Marcell]";
+		mes "Huh? What's that look on your face for? Snowysnow has a big gift bag inside of his body, and gives gifts whenever he feels like it. What's so hard to believe about that?";
 		close;
 	}
 }
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt
index 01cf0d2bf..d9cc8344d 100644
--- a/npc/cities/veins.txt
+++ b/npc/cities/veins.txt
@@ -1,337 +1,442 @@
 //===== eAthena Script =======================================
-//= Vein Town script
+//= Veins Town script
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
-//= Any eAthena Version; RO Episode 11.2
+//= eAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Veins Town Npcs
 //===== Additional Comments: =================================
 //= 1.0 First version [L0ne_W0lf]
+//= 1.1 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
+// Veins
+//============================================================ 
 veins,162,34,5	script	Towner#ve1	943,{
 	mes "[Towner]";
-	mes "I love cacti.";
-	mes "They're the most beautiful plants in the desert.";
-	mes "Sometimes, they're the only signs of life in a barren land.";
+	mes "I love cacti. They're";
+	mes "the most beautiful plants";
+	mes "in the desert. Sometimes,";
+	mes "they're the only signs of";
+	mes "life in a barren land.";
 	next;
 	mes "[Towner]";
-	mes "If you feel a stirring in your heart when you look at a cactus,";
-	mes "you must appreciate the desert's true beauty.";
+	mes "If you feel a stirring";
+	mes "in your heart when you";
+	mes "look at a cactus, you";
+	mes "must appreciate the";
+	mes "desert's true beauty.";
 	next;
 	mes "[Towner]";
-	mes "Well, I don't know if I can find anyone that finds the desert as wonderful and enchanting as I do.";
-	mes "It's a pity, really.";
+	mes "Well, I don't know if";
+	mes "I can find anyone that";
+	mes "finds the desert as";
+	mes "wonderful and enchanting";
+	mes "as I do. It's a pity, really.";
 	close;
 }
 
 veins,148,41,3	script	Towner#ve2	940,{
 	mes "[Towner]";
-	mes "Welcome to Veins,";
-	mes "the town near the temple of Cheshrumnir.";
-	mes "You may think this is a dreary desert town,";
-	mes "but you'll find that it's as lively as any other place.";
+	mes "Welcome to Veins, the";
+	mes "town near the Temple of";
+	mes "Cheshrumnir. You may think";
+	mes "this is a dreary desert town,";
+	mes "but you'll find that it's as";
+	mes "lively as any other place.";
 	next;
 	mes "[Towner]";
-	mes "Sure, there are a few characters in town,";
-	mes "like that cactus loving loony over there,";
-	mes "but not everyone's like him.";
-	mes "There's lots of nice, kind people that you can meet.";
+	mes "Sure, there are a few";
+	mes "characters in town, like";
+	mes "that cactus loving loony";
+	mes "over there, but not everyone's";
+	mes "like him. There's lots of nice,";
+	mes "kind people that you can meet.";
 	next;
 	mes "[Towner]";
-	mes "Well then, I hope that you enjoy your stay~";
+	mes "Well then, I hope that";
+	mes "you enjoy your stay~";
 	close;
 }
 
 veins,137,179,5	script	Towner#ve3	943,{
 	mes "[Towner]";
-	mes "Geez, why is our weapon shop so boring?";
-	mes "Nothing there but the same ol' regular junk.";
-	mes "Sad to say, there's nothing special.";
+	mes "Geez, why is our weapon";
+	mes "shop so boring? Nothing";
+	mes "there but the same ol'";
+	mes "regular junk. Sad to say,";
+	mes "there's nothing special.";
 	next;
 	mes "[Towner]";
-	mes "Wouldn't it be great if there was a shop that sold the legendary godly weapons?";
-	mes "Of course, that's asking a bit too much.";
+	mes "Wouldn't it be great";
+	mes "if there was a shop that";
+	mes "sold the legendary godly";
+	mes "weapons? Of course, that's";
+	mes "asking a bit too much.";
 	close;
 }
 
 veins,166,91,5	script	Towner#ve4	946,{
 	mes "[Towner]";
-	mes "Though we're in the middle of the desert,";
-	mes "our enemies continue to threaten us.";
-	mes "Fools! Goddess Freya will always protect us!";
+	mes "Though we're in the";
+	mes "middle of the desert,";
+	mes "our enemies continue";
+	mes "to threaten us. Fools!";
+	mes "Goddess Freya will";
+	mes "always protect us!";
 	next;
 	mes "[Towner]";
-	mes "As long as we continue to train,";
-	mes "Freya will watch over us and bless us with victory over our foes.";
-	mes "That, friend, is the power of faith.";
+	mes "So long as we continue to";
+	mes "train, Freya will watch over";
+	mes "us and bless us with victory";
+	mes "over our foes. That, friend,";
+	mes "is the power of faith.";
 	close;
 }
 
 veins,138,71,5	script	Kid#ve1	941,{
 	mes "[Kid]";
 	mes "Whoa, get out of here!";
-	mes "Can't you see that I'm playing hide and go seek?!";
+	mes "Can't you see that I'm";
+	mes "playing hide and go seek?!";
 	mes "Move before they find me!";
 	close;
 }
 
 veins,253,133,3	script	Kid#ve2	944,{
 	mes "[Kid]";
-	mes "Gosh, where could she be hiding?";
-	mes "I hate being it...";
-	mes "There's so many places to hide around here.";
-	mes "There must be someplace I haven't checked yet...";
-	mes "Let's see...";
+	mes "Gosh, where could she";
+	mes "be hiding? I hate being";
+	mes "it... There's so many places";
+	mes "to hide around here. There";
+	mes "must be someplace I haven't";
+	mes "checked yet... Let's see...";
 	close;
 }
 
 veins,270,164,5	script	Old Man#ve1	945,{
 	mes "[Old Man]";
-	mes "Praise be to Freya for blessing me with long life,";
-	mes "but I wonder if I've fully lived life.";
+	mes "Praise be to Freya";
+	mes "for blessing me with";
+	mes "long life, but I wonder";
+	mes "if I've fully lived life.";
 	next;
 	mes "[Old Man]";
-	mes "I don't have any regrets or doubts,";
-	mes "but maybe there are a few things I missed out on.";
-	mes "I guess and old man can't help but think about";
+	mes "I don't have any regrets";
+	mes "or doubts, but maybe there";
+	mes "are a few things I missed";
+	mes "out on. I guess an old man";
+	mes "can't help but think about";
 	mes "these sorts of things...";
 	close;
 }
 
 veins,310,195,1	script	Towner#ve5	946,{
 	mes "[Towner]";
-	mes "Cacti are wonderful, they're the most beautiful plants in the desert.";
-	mes "Yes, we must cherish and nurture them~";
+	mes "Cacti are wonderful,";
+	mes "they're the most beautiful";
+	mes "plants in the desert. Yes, we";
+	mes "must cherish and nurture them~";
 	next;
 	mes "[Towner]";
-	mes "Regular cacti are pretty uncommon,";
-	mes "but I hear there's a kind of cactus that roams the desert and makes loud, obnoxious noises.";
-	mes "How can that be true?";
+	mes "Regular cacti are ";
+	mes "pretty uncommon, but";
+	mes "I hear there's a kind of";
+	mes "cactus that roams the desert";
+	mes "and makes loud, obnoxious";
+	mes "noises. How can that be true?";
 	close;
 }
 
 veins,320,254,5	script	Towner#ve6	943,{
 	mes "[Towner]";
-	mes "................";
-	next;
-	mes "[Towner]";
-	mes "................";
-	next;
-	mes "[Towner]";
 	mes "What do you want?";
-	mes "Sorry, but I'm just a normal guy with normal problems.";
-	mes "Nothing that I can't solve on my own.";
+	mes "Sorry, but I'm just";
+	mes "a normal guy with normal";
+	mes "problems. Nothing that";
+	mes "I can't solve on my own.";
 	next;
 	mes "[Towner]";
-	mes "Unless... You can do my taxes?";
-	mes "Pay of my mortgage?";
-	mes "Heh. Didn't think so.";
+	mes "Unless... You can do my";
+	mes "taxes? Pay off my mortgage?";
+	mes "No? Heh. Didn't think so.";
 	close;
 }
 
 veins,333,318,3	script	Towner#ve7	940,{
 	mes "[Towner]";
-	mes "What's and adventurer doing here in such an isolated, dreary town?";
-	mes "Shouldn't you be looking for adventures?";
-	mes "Take it from me, this place is bo-ring.";
+	mes "What's an adventurer";
+	mes "doing here in such an";
+	mes "isolated, dreary town?";
+	mes "Shouldn't you be looking";
+	mes "for adventures? Take it from";
+	mes "me, this place if bo-ring.";
 	close;
 }
 
 veins,218,323,1	script	Towner#ve8	945,{
 	mes "[Towner]";
-	mes "Whoa, it's been a while since I've seen tourists in town.";
-	mes "You might think there's nothing here, but take a closer look.";
-	mes "You might learn something.";
+	mes "Whoa, it's been a while";
+	mes "seen I've seen tourists";
+	mes "in town. You might think";
+	mes "there's nothing here, but";
+	mes "take a closer look. You";
+	mes "might learn something.";
 	next;
 	mes "[Towner]";
-	mes "Just like people, you can't know everything about a place with only a glance.";
-	mes "If you give it a chance, I'm sure you'll find something to like about this town.";
+	mes "Just like people, you";
+	mes "can't know everything about";
+	mes "a place with only a glance.";
+	mes "If you give it a chance, I'm";
+	mes "sure you'll find something";
+	mes "to like about this town.";
+	mes "and try to find things that mind interest you?";
 	next;
 	mes "[Towner]";
-	mes "What do I mean by \"a closer look\"?";
-	mes "Heh, you'll see... Maybe.";
-	mes "It's not that important anyway.";
+	mes "What do I mean by ''a";
+	mes "closer look?'' Heh, you'll";
+	mes "see... Maybe. Hahahaha!";
+	mes "Oh, forget it, it's not";
+	mes "that important anyway.";
 	mes "May Freya bless you~";
 	close;
 }
 
 veins,206,275,3	script	Kid#ve3	941,{
 	mes "[Kid]";
-	mes "I really want to look inside the temple,";
-	mes "but it looks so scary from the outside!";
-	mes "I wonder why it's like that?";
+	mes "I really want to look";
+	mes "inside the temple, but";
+	mes "it looks so scary from";
+	mes "the outside! I wonder";
+	mes "why it's like that?";
 	close;
 }
 
 veins,171,256,3	script	Towner#ve9	943,{
 	mes "[Towner]";
-	mes "Don't get me wrong: I'd give my life in Freya's name,";
-	mes "but that so-called temple just looks so strange and suspicious.";
-	mes "How can it be a place of worship?";
+	mes "Don't get me wrong:";
+	mes "I'd give my life in Freya's";
+	mes "name, but that so-called";
+	mes "temple just looks so strange";
+	mes "and suspicious. How can it";
+	mes "be a place of worship?";
 	close;
 }
 
 veins,197,219,5	script	Towner#ve10	943,{
 	mes "[Towner]";
-	mes "I guess you can tell from this withered tree that our town is short on water.";
-	mes "I guess that's a natural consequence of living here in the desert...";
+	mes "I guess you can tell";
+	mes "from this withered tree";
+	mes "that our town is short";
+	mes "on water. I guess that's";
+	mes "a natural consequence of";
+	mes "living here in the desert...";
 	close;
 }
 
 veins,232,169,5	script	Old lady#ve1	942,{
 	mes "[Old Lady]";
-	mes "...........";
-	mes "When I look down on Veins from here,";
-	mes "I've come to realize many things.";
-	mes "I don't think you'd understand no matter how much I explained.";
+	mes "When I look down on";
+	mes "Veins from here, I've";
+	mes "come to realize many things.";
+	mes "I don't think you'd understand";
+	mes "no matter how much I explained.";
 	next;
 	mes "[Old Lady]";
-	mes "I suppose it's one of those things that you learn with age.";
-	mes "yes, there's no substitute for experience when it comes to some things";
-	mes "You'll see.";
+	mes "I suppose it's one of those";
+	mes "things that you learn with age.";
+	mes "Yes, there's no substitute for";
+	mes "experience when it comes to";
+	mes "some things. You'll see.";
+	mes "^FFFFFFYes, like secret knowledge.^000000";
 	close;
 }
 
 veins,121,199,3	script	Old Man#ve2	945,{
 	mes "[Old Man]";
 	mes "This isn't good.";
-	mes "The elderly outnumber the youth here in Veins.";
-	mes "We're too close to becoming something of a retirement community.";
-	mes "You see it, right?";
+	mes "The elderly outnumber";
+	mes "the youth here in Veins.";
+	mes "We're too close to becoming";
+	mes "something of a retirement";
+	mes "community. You see it, right?";
 	next;
 	mes "[Old Man]";
-	mes "I guess the young people aren't content living here since we lack a lot of the material excitement of other towns.";
-	mes "They can't appreciate what's really special here...";
+	mes "I guess the young people";
+	mes "aren't content living here";
+	mes "since we lack a lot of the";
+	mes "material excitement of other";
+	mes "towns. They can't appreciate";
+	mes "what's really special here...";
 	close;
 }
 
 veins,111,50,3	script	Towner#ve11	943,{
 	mes "[Towner]";
-	mes "People cherish water around here,";
-	mes "but I have something even more precious to me.";
-	mes "yes, even more precious then water...";
+	mes "People cherish water";
+	mes "around here, but I've";
+	mes "something even more";
+	mes "precious to me. Yes, even";
+	mes "more precious than water...";
 	mes "You guessed it--true love.";
 	next;
 	mes "[Towner]";
-	mes "We actually started dating here,";
-	mes "so this place really means a lot to me.";
-	mes "It's my favourite spot for spending time with my girl.";
-	mes "Hahaha~";
+	mes "We actually started dating";
+	mes "here, so this place really";
+	mes "means a lot to me. It's my";
+	mes "favorite spot for spending";
+	mes "time with my girl. Hahaha~";
 	close;
 }
 
 veins,112,51,3	script	Towner#ve12	940,{
 	mes "[Towner]";
-	mes "Well, I'm actually a little tired of coming here all the time.";
-	mes "I kind of want to try someplace else,";
-	mes "but I also know he really loves coming here.";
+	mes "Well, I'm actually";
+	mes "a little tired of coming";
+	mes "here all the time. I kind";
+	mes "of want to try someplace";
+	mes "else, but I also know he";
+	mes "really loves coming here.";
 	next;
 	mes "[Towner]";
-	mes "It would be actually kind of sad if we stopped coming here altogether.";
-	mes "I'm just happy so long as he's with me~";
-	mes "Hoho~";
+	mes "It would actually be";
+	mes "kind of sad if we stopped";
+	mes "coming here altogether.";
+	mes "I'm just happy so long";
+	mes "as he's with me~ Hoho~";
 	close;
 }
 
 veins,191,134,3	script	Old Man#ve3	945,{
 	mes "[Old Man]";
-	mes "Why don't you take a look at my goods?";
-	mes "I've got many things that might interest you~";
+	mes "Why don't you take";
+	mes "a look at my goods?";
+	mes "I've got many things";
+	mes "that might interest you~";
 	next;
 	mes "[Old Man]";
-	mes "praise be to Freya, who watches over us,";
-	mes "and blesses us with food and drink.";
-	mes "Don't you think that's great,";
+	mes "Praise be to Freya,";
+	mes "who watches over us,";
+	mes "and blesses us with";
+	mes "food and drink. Don't";
+	mes "you think that's great,";
 	mes "young adventurer?";
 	close;
 }
 
 veins,177,147,3	script	Old Lady#ve2	942,{
-	mes "[Old lady]";
-	mes "Owning a lot of stuff might seem great,";
-	mes "but many things aren't that valuable when you think of them in terms of real emotional value.";
+	mes "[Old Lady]";
+	mes "Owning a lot of stuff";
+	mes "might seem great, but";
+	mes "many things aren't that";
+	mes "valuable when you think";
+	mes "of them in terms of";
+	mes "real emotional value.";
 	next;
-	mes "[Old lady]";
-	mes "Well, that might have been a dangerous remark when I'm trying to sell things to customers.";
-	mes "Still, I wish I could carry a wider selection of goods.";
+	mes "[Old Lady]";
+	mes "Well, that might have been";
+	mes "a dangerous remark when";
+	mes "I'm trying to sell things to";
+	mes "customers. Still, I wish";
+	mes "I could carry a wider";
+	mes "selection of goods.";
 	next;
-	mes "[Old lady]";
-	mes "Of course, we're here in the middle of the desert,";
+	mes "[Old Lady]";
+	mes "Of course, we're here";
+	mes "in the middle of the desert,";
 	mes "so maybe I'm asking too much.";
 	close;
 }
 
 veins,223,165,5	script	Kid#ve4	944,{
 	mes "[Kid]";
-	mes "Hey, Do you think I can reach the bridge";
-	mes "over there if I jump from over here?";
-	mes "Do you think you can try it?";
+	mes "Hey! Do you think";
+	mes "I can reach the bridge";
+	mes "over there if I jump";
+	mes "from over here? Do";
+	mes "you think you can try it?";
 	next;
 	mes "[Kid]";
-	mes "What? You can't do it?";
-	mes "Well, I'm gonna be different when I grow up!";
-	mes "I'm gonna be the world's best jumper!";
-	mes "I'm gonna be able to jump all the way to the mooooon!";
+	mes "What?! You can't do it?";
+	mes "Well, I'm gonna be different";
+	mes "when I grow up! I'm gonna";
+	mes "be the world's best jumper!";
+	mes "I'm gonna be able to jump";
+	mes "all the way to the mooooon!";
 	close;
 }
 
 veins,263,153,5	script	Towner#ve13	943,{
 	mes "[Towner]";
-	mes "The clothes we make here are high,";
-	mes "airy, and sewn with quality fabric.";
-	mes "Of course, we need to wear stuff like this since the weather is unbearably hot.";
+	mes "The clothes we make here";
+	mes "are high, airy, and sewn";
+	mes "with high quality fabric.";
+	mes "Of course, we need to wear";
+	mes "stuff like this since the";
+	mes "weather is unbearably hot.";
 	next;
 	mes "[Towner]";
-	mes "The fabric? Well, I'll give you a hint.";
-	mes "It's made of something related to camels.";
-	mes "Heh! I'll leave you to figure it out on your own. Haha!";
+	mes "The fabric? Well,";
+	mes "I'll give you a hint.";
+	mes "It's made of something";
+	mes "related to camels. Heh!";
+	mes "I'll leave you to figure it";
+	mes "out on your own. Haha!";
 	close;
 }
 
 veins,296,184,3	script	Towner#ve14	940,{
 	mes "[Towner]";
 	mes "Let me tell you a secret.";
-	mes "But promise not to tell anyone else about it, okay?";
+	mes "But promise not to tell";
+	mes "anyone else about it, okay?";
 	next;
 	mes "[Towner]";
 	mes "When the time comes,";
-	mes "the Temple of Cheshrumnir will open up and the giant Freya robot will launch!";
-	mes "It will destroy every country except Arunafeltz";
+	mes "the Temple of Cheshrumnir";
+	mes "will open up and the giant";
+	mes "Freya robot will launch!";
+	mes "It'll destroy every country";
+	mes "except Arunafeltz!";
 	next;
 	mes "[Towner]";
-	mes "That robot can blow hurricanes from it's mouth,";
-	mes "and shoot lightning from its horns,";
-	mes "and it can fire its fists away,";
-	mes "and it's chest is a flamethrower.";
-	next;
-	mes "[Towner]";
-	mes "...........";
+	mes "That robot can blow";
+	mes "hurricanes from its mouth,";
+	mes "and shoot lightning from";
+	mes "its horns, and it can fire";
+	mes "its fists away, and its";
+	mes "chest is a flame thrower!";
 	next;
 	mes "[Towner]";
+	mes "..............................";
 	mes "You don't believe me, either.";
-	mes "What did you say? Zinger?";
+	mes "What did you just say? Zinger?";
 	mes "Amazing Z? The hell's that?";
 	close;
 }
 
 veins,291,205,3	script	Kid#ve5	944,{
 	mes "[Kid]";
-	mes "Argh! I'm a war god protecting Goddess Freya and Arunafeltz!";
-	mes "Ahhhhh! Death to all our enemies!";
+	mes "Argh! I'm a war god";
+	mes "protecting Goddess Freya";
+	mes "and Arunafeltz! Ahhhhh!";
+	mes "Death to all our enemies!";
 	next;
 	mes "[Kid]";
 	mes "Burn, heretics, buuurn!";
-	mes "Destroy your homes, your families,";
-	mes "and build a new perfect world for Freya!";
+	mes "Destroy your homes, your";
+	mes "families, and build a new";
+	mes "perfect world for Freya!";
 	next;
 	mes "[Kid]";
-	mes "Hee hee! Doesn't that sound wonderful!";
-	mes "When I grow up, I wanna be that kind of hero!";
+	mes "Hee hee! Doesn't that";
+	mes "sound wonderful! When";
+	mes "I grow up, I wanna be";
+	mes "that kind of hero!";
 	close;
 }
 
@@ -343,22 +448,30 @@ veins,291,259,3	script	Old Man#ve4	945,{
 	mes "Fr...";
 	next;
 	mes "[Old Man]";
-	mes "Praise Freya! *Keck*";
-	mes "*Cough cough* Fre...";
-	mes "*Cough* Praise Freya!";
-	mes "Freya! Conquer those that blaspheme you!";
-	mes "Let me see it before I die!";
+	mes "Praise Freya! ^333333*Keck*^000000";
+	mes "^333333*Cough cough*^000000 Fre...";
+	mes "^333333*Cough*^000000 Praise Freya!";
+	mes "Freya! Conquer those";
+	mes "that blaspheme you! Let";
+	mes "me see it before I die!";
 	next;
 	mes "[Old Man]";
-	mes "I have never regretted *Cough* my faith in you, my goddess!";
-	mes "*Keck* May the suffering of all our enemies drive them to madness before death!";
+	mes "I have never regretted";
+	mes "^333333*Cough*^000000 my faith in you,";
+	mes "my goddess! ^333333*Keck*^000000 May";
+	mes "the suffering of all our";
+	mes "enemies drive them to";
+	mes "madness before death!";
 	close;
 }
 
 veins,291,284,3	script	Old Lady#ve3	942,{
 	mes "[Old Lady]";
-	mes "I wonder what my standing with Freya is like.";
-	mes "Hopefully, she will take my mercy upon me when I leave this world.";
+	mes "I wonder what my";
+	mes "standing with Freya";
+	mes "is like. Hopefully, she";
+	mes "will take mercy upon me";
+	mes "when I leave this world.";
 	mes "My days here are numbered...";
 	close;
 }
@@ -367,93 +480,116 @@ veins,248,301,3	script	Kid#ve6	944,{
 	mes "[Kid]";
 	mes "Huh? You don't live here.";
 	mes "Are you... Are you a traveler?";
-	mes "You must been to so many places, huh?";
-	mes "What do they look like?";
-	mes "I want to travel too when I grow up~";
+	mes "You musta been to so many";
+	mes "other places, huh? What";
+	mes "do they look like? I want to";
+	mes "travel too when I grow up~";
 	next;
 	mes "[Kid]";
-	mes "I like this town, but I want to see how other people live.";
-	mes "The grown-ups think it's a bad idea, though.";
-	mes "They say Freya hates it.";
-	mes "Is it that bad that I can't stop wondering?";
+	mes "I like this town, but I want";
+	mes "to see how other people live.";
+	mes "The grown-ups think it's a bad";
+	mes "idea, though. They say Freya";
+	mes "hates it. Is it that bad that";
+	mes "I can't stop wondering?";
 	close;
 }
 
 veins,161,63,3	script	Old Man#ve5	945,{
 	mes "[Old Man]";
-	mes "Oh. You must be sightseeing.";
-	mes "Um, Veins is a small town,";
-	mes "Maybe pay a visit to Cheshrumnir Temple?";
+	mes "Oh. You must be";
+	mes "sightseeing. Um,";
+	mes "Veins is a small town,";
+	mes "visit Cheshrumnir Temple?";
 	next;
 	mes "[Old Man]";
-	mes "I hope you enjoy your stay.";
-	mes "Now if you'll excuse me,";
-	mes "I'd like to continue with my prayers to Freya.";
+	mes "I hope you enjoy";
+	mes "your stay. Now if";
+	mes "you'll excuse me, I'd";
+	mes "like to continue with";
+	mes "my prayers to Freya.";
 	next;
 	mes "[Old Man]";
-	mes "Oh, gracious Freya, your servant.";
-	mes "humbly beseeches you on bended knee...";
+	mes "Oh, gracious Freya, your";
+	mes "servant humbly beseeches";
+	mes "you on bended knee...";
 	mes "Heal me of this infirmity!";
 	mes "The body is droopingly limp,";
-	mes "but the spirit is willingly...!";
-	mes "Must be... Cheshrumnir Temple.";
+	mes "but the spirit is willing...!";
+	mes "must be... Cheshrumnir Temple.";
 	close;
 }
 
 veins,157,123,3	script	Towner#ve15	946,{
 	mes "[Towner]";
-	mes "You know what's good about the desert?";
-	mes "No?";
+	mes "You know what's good";
+	mes "about the desert? No?";
 	next;
 	mes "[Towner]";
-	mes "The desert makes you stronger.";
-	mes "Understand what I mean?";
-	mes "Heh, you'll know as you spend more time here in the desert.";
+	mes "The desert makes you";
+	mes "stronger. Understand";
+	mes "what I mean? Heh, you'll";
+	mes "know as you spend more";
+	mes "time here in the desert.";
 	close;
 }
 
+// Inside Veins
+//============================================================ 
 ve_in,119,386,3	script	Prisoner#ve1	946,{
 	mes "[Prisoner]";
 	mes "Unbelievable!";
-	mes "What kind of country is this?!";
-	mes "How can you lock me up just because I don't believe in Freya?!";
+	mes "What kind of country";
+	mes "is this?! How can you";
+	mes "lock me up just because";
+	mes "I don't believe in Freya?!";
 	next;
 	mes "[Prisoner]";
-	mes "This isn't civilised!";
-	mes "You're a bunch of savages if you can't respect my beliefs,";
-	mes "you know that?";
+	mes "This isn't civilized!";
+	mes "You're a bunch of savages";
+	mes "if you can't respect my";
+	mes "beliefs, you know that?";
 	mes "Someone, someone help!";
 	close;
 }
 
 ve_in,111,379,8	script	Ward#ve1	946,{
 	mes "[Ward]";
-	mes "This place ensures that dangerous criminals aren't threatening the publi--";
-	mes "Wait. Why are you even here?!";
-	mes "This place isn't safe for you!";
-	mes "Leave!";
+	mes "This place ensures that";
+	mes "dangerous criminals aren't";
+	mes "threatening the publi--";
+	mes "Wait. Why are you even";
+	mes "here?! This place isn't";
+	mes "safe for you! Leave!";
 	close;
 }
 
 ve_in,126,378,3	script	Ward#ve2	946,{
 	mes "[Ward]";
-	mes "I'm grateful that our town is relatively peaceful.";
+	mes "I'm grateful that our";
+	mes "town is relatively peaceful.";
 	mes "If it were any other place,";
-	mes "that tiny cell would be full of criminals.";
+	mes "that tiny cell would be";
+	mes "crammed full of criminals.";
 	next;
 	mes "[Ward]";
-	mes "Thank Freya that I've been assigned to such a peaceful,";
-	mes "quiet place.";
+	mes "Thank Freya that I've";
+	mes "been assigned to such";
+	mes "a peaceful, quiet place.";
 	close;
 }
 
 ve_in,101,314,1	script	Towner#ve16	943,{
 	mes "[Towner]";
-	mes "*Pant Pant*";
-	mes "I must study as hard as I can for the grace of Goddess Freya.";
+	mes "^333333*Pant Pant*^000000";
+	mes "I must study as hard as I can";
+	mes "for the grace of Goddess Freya.";
 	next;
 	mes "[Towner]";
-	mes "I really believe that I can serve Freya one of these days if I can just expand my knowledge.";
+	mes "I really believe that";
+	mes "I can serve Freya one of";
+	mes "these days if I can just";
+	mes "expand my knowledge.";
 	close;
 }
 
@@ -469,97 +605,132 @@ ve_in,90,298,3	script	Towner#ve17	849,{
 ve_in,361,243,5	script	Towner#ve18	849,{
 	mes "[Towner]";
 	mes "...............";
+	mes "...............";
+	mes "...............";
 	next;
 	mes "[Towner]";
 	mes "...............";
+	mes "...............";
+	mes "...............";
 	next;
 	mes "[Towner]";
 	mes "Tricked you!";
-	mes "Thought I was dead, didn't you?";
-	mes "Hahaha~";
+	mes "Thought I was dead,";
+	mes "didn't you? Hahaha~";
 	close;
 }
 
 ve_in,242,124,3	script	Towner#ve19	849,{
 	mes "[Towner]";
-	mes "The drinks in this town are so... They're...";
+	mes "The drinks in this";
+	mes "town are so... They're...";
 	mes "They're so damn strong!";
 	next;
 	mes "[Towner]";
 	mes "Why...";
-	mes "Why does the ground keep wobbling?!";
-	mes "It's...";
-	mes "It's like it's trying to betray me!";
-	mes "Every time!";
+	mes "Why does the ground";
+	mes "keep wobbling?! It's...";
+	mes "It's like it's trying to";
+	mes "betray me! Every time!";
 	next;
 	mes "[Towner]";
-	mes "*Hiccup*";
+	mes "^333333*Hiccup*^000000";
 	close;
 }
 
 ve_in,180,232,5	script	Towner#ve20	946,{
 	mes "[Towner]";
-	mes "It's nice when a town is peaceful and quiet.";
-	mes "But it's lame when a tavern is dead like this.";
+	mes "It's nice when a town";
+	mes "is peaceful and quiet...";
+	mes "But it's lame when a";
+	mes "tavern is dead like this.";
 	next;
 	mes "[Towner]";
-	mes "Well, there's good and bad points to everything.";
-	mes "Hopefully things will pick up around here as more of you adventurers come visit.";
+	mes "Well, there's good";
+	mes "and bad points to";
+	mes "everything. Hopefully";
+	mes "things will pick up";
+	mes "around here as more of";
+	mes "you adventurers come visit.";
 	close;
 }
 
 ve_in,163,212,3	script	Towner#ve21	940,{
 	mes "[Towner]";
-	mes "There's nothing but old people and children in this town.";
-	mes "Where's a decent man worth marrying?";
-	mes "There's a few bachelors that are my age, but... Well...";
+	mes "There's nothing but";
+	mes "old people and children";
+	mes "in this town. Where's a";
+	mes "decent man worth marrying?";
+	mes "There's a few bachelors that";
+	mes "are my age, but... Well...";
 	next;
 	mes "[Towner]";
-	mes "They're all too hairy or too muscular.";
-	mes "I don't think I'll be able to get married anytime soon!";
-	mes "Oh, the misery!";
+	mes "They're all too hairy or";
+	mes "too muscular. I don't think";
+	mes "I'll be able to get married";
+	mes "anytime soon! Oh, the misery!";
 	close;
 }
 
 ve_in,190,215,3	script	Towner#ve22	946,{
 	mes "[Towner]";
-	mes "Well, our town doesn't have a choice but to defend itself in dangerous times.";
-	mes "The young men we have here are all buff and tough to protect us.";
+	mes "Well, our town doesn't";
+	mes "have a choice but to";
+	mes "defend itself in dangerous";
+	mes "times. The young men we";
+	mes "have here are all buff and";
+	mes "tough to protect us.";
 	next;
-	mes "[Towner]";
-	mes "They may not be beautiful, but they have kind and gentle hearts.";
-	mes "It's a pity that the women here are more concerned with appearances.";
+	mes "[Town]";
+	mes "They may not be beautiful,";
+	mes "but they have kind and";
+	mes "gentle hearts. It's a pity";
+	mes "that the women here";
+	mes "are more concerned";
+	mes "with appearances.";
 	next;
 	mes "[Towner]";
-	mes "Don't judge a book by it's cover, but by its contents.";
+	mes "Don't judge a book";
+	mes "by its cover, but";
+	mes "by its contents.";
 	close;
 }
 
 ve_in,318,121,3	script	Towner#ve23	943,{
 	mes "[Towner]";
-	mes "This storage solely exists for serious drinkers.";
-	mes "If it's ever shutdown, I think everyone in town will riot.";
-	mes "Crazy, huh?";
+	mes "This storage solely";
+	mes "exists for serious drinkers.";
+	mes "If it's ever shut down,";
+	mes "I think everyone in town";
+	mes "will riot. Crazy, huh?";
 	next;
 	mes "[Towner]";
-	mes "Veins is famous for its wide variety of delicious, irresistible liquor.";
-	mes "Just one sip's enough to hook you.";
+	mes "Veins is famous for its";
+	mes "wide variety of delicious,";
+	mes "irresistable liquor. Just one";
+	mes "sip's enough to hook you.";
 	next;
 	mes "[Towner]";
-	mes "Praise Freya for blessing us with the gift of awesome liquor.";
-	mes "Her graciousness, her compassion, here liquor is limitless.";
-	mes "Let us pray.";
+	mes "Praise Freya for";
+	mes "blessing us with the";
+	mes "gift of awesome liquor.";
+	mes "Her graciousness, her";
+	mes "compassion, her liquor";
+	mes "is limitless. Let us pray.";
 	close;
 }
 
 ve_in,222,125,5	script	Towner#ve24	943,{
 	mes "[Towner]";
-	mes "I really want to ask out the woman right in front of me.";
+	mes "I really want to";
+	mes "ask out the woman";
+	mes "right in front of me.";
 	mes "Do you think she'll...?";
 	next;
 	mes "[Towner]";
-	mes "Crap! Did I say that out loud?";
-	mes "I-I-I really didn't want her to hear!";
+	mes "Crap! Did I say that";
+	mes "out loud? I-I-I really";
+	mes "didn't want her to hear!";
 	close;
 }
 
@@ -567,59 +738,72 @@ ve_in,222,122,1	script	Towner#ve25	940,{
 	mes "[Towner]";
 	mes "I heard all that...";
 	mes "Gosh, he's so clueless.";
-	mes "I don't hate him, but he should show a bit more backbone if he wants to impress me.";
-	mes "Hmmm...";
+	mes "I don't hate him, but he";
+	mes "should show a bit more";
+	mes "backbone if he wants";
+	mes "to impress me. Hmmm...";
 	close;
 }
 
 ve_in,232,135,5	script	Towner#ve26	946,{
 	mes "[Towner]";
-	mes "If you enjoy a good, stiff drink,";
-	mes "then you have to stop by at Veins Tavern~";
+	mes "If you enjoy a good,";
+	mes "stiff drink, then you have";
+	mes "to stop by Veins Tavern~";
 	next;
 	mes "[Towner]";
-	mes ".If you don't love drinking,";
-	mes "then Veins Tavern is the perfect place to learn!";
-	mes "...To love... drinking...";
+	mes "If you don't love";
+	mes "drinking, then Veins";
+	mes "Tavern is the perfect";
+	mes "place to learn! ...To";
+	mes "love... drinking...";
 	close;
 }
 
 ve_in,239,135,5	script	Towner#ve27	946,{
 	mes "[Towner]";
 	mes "Isn't the sun so hot?";
-	mes "Doesn't it make you feel so thirsty?";
-	mes "Well, you may want to consider quenching that nasty thirst with liquor!";
+	mes "Doesn't it make you feel";
+	mes "so thirsty? Well, you may";
+	mes "want to consider quenching";
+	mes "that nasty thirst with liquor!";
 	next;
 	mes "[Towner]";
-	mes "My job is to serve delicious,";
-	mes "life giving liquors to my customers to relieve their parched throats.";
-	mes "Seeing their drunken smiles really makes my day~";
+	mes "My job is to serve";
+	mes "delicious, life giving";
+	mes "liquor to my customers to";
+	mes "relieve their parched throats.";
+	mes "Seeing their drunken smiles";
+	mes "really makes my day~";
 	close;
 }
 
 ve_in,232,124,5	script	Towner#ve28	943,{
 	mes "[Towner]";
-	mes "A lone wolf on the desert.";
-	mes "That's me.";
-	mes "Well, that's why I'm drinking here alone.";
+	mes "A lone wolf of the desert.";
+	mes "That's me. Well, that's why";
+	mes "I'm drinking here alone.";
 	next;
 	mes "[Towner]";
-	mes "Sweet Freya, these drinks are so good.";
+	mes "Sweet Freya, these";
+	mes "drinks are so good.";
 	mes "I could drink all day.";
 	close;
 }
 
 ve_in,234,105,3	script	Towner#ve29	946,{
 	mes "[Towner]";
-	mes "Man the world is jsut...";
+	mes "Man, the world is just...";
 	mes "It's just desires...!";
-	mes "Faith? It helps, you know?";
-	mes "Cuz-cuz desires are all just nothing!";
+	mes "Faith? It helps, you";
+	mes "know? Cuz-cuz desires";
+	mes "are all just nothing!";
 	mes "They're nooooooothing!";
 	next;
 	mes "[Towner]";
 	mes "Argh! What is life?!";
-	mes "I don't know what to believe anymore! Freya!";
+	mes "I don't know what to";
+	mes "believe anymore! Freya!";
 	mes "Freya looooves you!";
 	close;
 }
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 0bd1cfdcc..828569b46 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,125 +3,133 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0+
+//= eAthena SVN
 //===== Description: =========================================
-//= Turns bullets/spheres into packs/casings.
+//= Turns bullets into magazines/packs.
 //===== Additional Comments: =================================
 //= 1.0 First version. [SinSloth]
 //= 1.1 Optimized version - Reduced to only one function [SinSloth]
 //= 1.2 Optimized^2, corrected npc's name [ultramage]
 //= 1.2a Optimized. Please, ommit extra NPC names [Lupus]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,187,149,3	script	Magazine Dealer Kenny	83,{
-
-	mes "[Kenny]";	
-	mes "I am the Casing Dealer, Kenny!";
-	if(BaseJob != Job_Gunslinger) {
-		mes "I'm here to package the Shells";
-		mes "and Bullets for Gunslingers.";
-		next;
+	if(BaseJob == Job_Gunslinger) {
 		mes "[Kenny]";
-		mes "But you don't look like a";
-		mes "Gunslinger to me. I'm afraid";
-		mes "that I must ask you to leave";
-		mes "after you're done looking around.";
-		close;
+		mes "Welcome to my Magazine Shop.";
+		mes "As you may know, large numbers";
+		mes "of bullets can be carried more";
+		mes "easily when they're in Magazines. Now, can I interest you in";
+		mes "anything in particular?";
+		next;
+		switch(select("Wind Sphere Pack:Shadow Sphere Pack:Poison Sphere Pack:Water Sphere Pack:Fire Sphere Pack:Cartridge:Blood Cartridge:Silver Cartridge:Cancel")) {
+		case 1: callfunc "Func_Casing",13204,12144; break;
+		case 2: callfunc "Func_Casing",13206,12145; break;
+		case 3: callfunc "Func_Casing",13205,12146; break;
+		case 4: callfunc "Func_Casing",13207,12147; break;
+		case 5: callfunc "Func_Casing",13203,12148; break;
+		case 6: callfunc "Func_Casing",13200,12149; break;
+		case 7: callfunc "Func_Casing",13202,12150; break;
+		case 8: callfunc "Func_Casing",13201,12151; break;
+		case 9:
+			mes "[Kenny]";
+			mes "Well, if you ever find";
+			mes "that you have too many";
+			mes "bullets, come and see me.";
+			mes "It's a smart idea to store";
+			mes "bullets with my Magazines.";
+			close;
+		}
 	}
-	mes "If your bullets are getting";
-	mes "too heavy, come to me!";
-	next;
 	mes "[Kenny]";
-	mes "I can make you Casings and Packs,";
-	mes "which will let you carry the";
-	mes "Spheres at a lower weight!";
-	mes "Come on! Take a look!";
+	mes "Welcome to my shop.";
+	mes "Here, I provide Magazines";
+	mes "and Cartridges for Gunslingers.";
+	mes "Sorry, but it doesn't look like";
+	mes "my services would be of any";
+	mes "use to you, adventurer.";
 	next;
-	switch(select("Lightning Sphere Pack","Blind Sphere Pack","Poison Sphere Pack","Freezing Sphere Pack","Flare Sphere Pack","Bullet Casing","Shell of Blood Casing","Silver Bullet Casing","Cancel")) {
-	case 1: callfunc "Func_Casing",13204,12144; break;
-	case 2: callfunc "Func_Casing",13206,12145; break;
-	case 3: callfunc "Func_Casing",13205,12146; break;
-	case 4: callfunc "Func_Casing",13207,12147; break;
-	case 5: callfunc "Func_Casing",13203,12148; break;
-	case 6: callfunc "Func_Casing",13200,12149; break;
-	case 7: callfunc "Func_Casing",13202,12150; break;
-	case 8: callfunc "Func_Casing",13201,12151; break;
-	default:
-		mes "[Kenny]";
-		mes "Alright. If there's";
-		mes "something else I can help";
-		mes "you with, please tell me.";
-		close;
-	}
+	mes "[Kenny]";
+	mes "Eh, but if you happen to";
+	mes "know any Gunslingers, send";
+	mes "them my way. You can never";
+	mes "have too many bullets.";
 	close;
 }
 
 function	script	Func_Casing	{
-
 	mes "[Kenny]";
-	mes "Please input the amount you want.";
+	mes "Now, you can trade";
+	mes "500 "+getitemname(getarg(1))+"s";
+	mes "and 500 zeny for 1 "+getitemname(getarg(0))+", so make sure";
+	mes "you have sufficient bullets";
+	mes "and zeny for this exchange.";
 	next;
 	mes "[Kenny]";
-	mes "" +getitemname(getarg(1))+ " will";
-	if(getarg(0) == 13202) 
-		mes "cost 500 Shells of Blood";
-	else
-		mes "cost 500 " +getitemname(getarg(0))+ "s";
-	mes "and 500 zeny each.";
+	mes "You can exchange 500 "+getitemname(getarg(1))+"s and 500 zeny";
+	mes "with 1 "+getitemname(getarg(0))+".";
 	next;
 	mes "[Kenny]";
-	mes "You can trade a maximum of 50.";
-	mes "Input 0 if you want to cancel.";
+	mes "Remember that I can't give";
+	mes "you more than 50 Magazines";
+	mes "at a time. Now please enter";
+	mes "the number of Magazines you";
+	mes "want to receive. If you want to cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	mes "[Kenny]";
-	if(.@amount < 1) {
-		mes "Alright. If there's";
-		mes "something else I can help";
-		mes "you with, please tell me.";
-		close;
-	}
-	if(.@amount > 50)	{
-		mes "You've exceeded the limit!";
-		mes "Try again next time?";
-		close;
-	}
-	//Weight checking
-	if(checkweight(getarg(1), .@amount) != 1)	{
-		mes "You are overweight.";
-		mes "Please clear your inventory.";
-		close;
-	}
-	
-	//Materials checking
-	if(countitem(getarg(0)) < .@amount * 500) {
-		mes "Huh......";
-		mes "You don't have enough";
-		mes "materials to trade for";
-		mes "the number of items you";
-		mes "want. Please come with the";
-		mes "correct amount of items.";
+	if(.@amount > 50 || .@amount == 0) {
+		mes "[Kenny]";
+		mes "Hey, I can't give you";
+		mes "that many Magazines.";
+		mes "Please try again, and";
+		mes "enter a number no";
+		mes "greater than 50.";
 		close;
 	}
-	
-	//Zeny checking
-	if(Zeny < .@amount * 500) {
-		mes "Erm... You don't have enough money.";
-		mes "The fee is 500 zeny";
-		mes "Check your zeny and come again.";
+	if (countitem(getarg(1)) >= (500*.@amount)) {
+		if (Zeny >= (500*.@amount)) {
+			if (checkweight(getarg(1),.@amount) == 0) {
+				mes "[Kenny]";
+				mes "Hey, you've got a lot";
+				mes "of junk crammed in your";
+				mes "Inventory. Free up some";
+				mes "space, and then come back";
+				mes "and trade your bullets for";
+				mes "some Magazines later, okay?";
+				close;
+			}else{
+				mes "[Kenny]";
+				mes "Alright, here are";
+				mes "your Magazines. Thanks";
+				mes "for visiting my shop, and";
+				mes "I hope that you use all";
+				mes "of your ammo wisely.";
+				set Zeny,Zeny-500*.@amount;
+				delitem getarg(0),500*.@amount;
+				getitem getarg(1),.@amount;
+				close;
+			}
+		}else{
+			mes "[Kenny]";
+			mes "Sorry, but you don't";
+			mes "have enough zeny for";
+			mes "this Magazine exchange.";
+			mes "Come back to my shop";
+			mes "after you've saved up";
+			mes "some more money.";
+			close;
+		}
+	}else{
+		mes "[Kenny]";
+		mes "Sorry, but you don't";
+		mes "have enough bullets for";
+		mes "this Magazine exchange.";
+		mes "Maybe you should double";
+		mes "check your Inventory, and";
+		mes "then come back to me later.";
 		close;
 	}
-
-	mes "Ah very well!";
-	mes "The number is confirmed!";
-	if(getarg(1) < 12149)
-		mes "I'll get you the Packs right away.";
-	else
-		mes "I'll get you the Casings right away.";
-	set Zeny, Zeny - .@amount * 500;
-	delitem getarg(0), .@amount * 500;
-	getitem getarg(1), .@amount;
-	close;
-}
+}
\ No newline at end of file
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 6742b6022..3163b3d43 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,9 +3,9 @@
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
-//= 1.3
+//= 1.4
 //===== Compatible With ======================================
-//= eAthena SVN with jAthena scripting engine and . variables
+//= eAthena SVN
 //===== Description ==========================================
 //= Bullet trader.
 //===== Comments =============================================
@@ -14,21 +14,17 @@
 //= 1.2 More optimized conversion [Legionaire]
 //= 1.2a Removed .GATs [Lupus]
 //= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus]
+//= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,187,156,3	script	Bullet Dealer Tony	86,{
-
-	mes "[Tony]";
 	if (BaseJob == Job_Gunslinger) {
-		mes "I'm Bullet-tooth Tony!";
-		mes "Whenever your out of bullets,";
-		mes "Visit me!!!";
-		next;
 		mes "[Tony]";
-		mes "Now~! Friend~Companion~ Buddy~";
-		mes "What do you need?!";
-		mes "Choose anything~!";
-		mes "And pay money~!";
+		mes "I'm Tony, the Bullet Dealer.";
+		mes "Come to me whenever you're";
+		mes "short on ammo. Just bring me";
+		mes "the materials, and I'll make";
+		mes "you the bullets you need.";
 		next;
 		switch(select("Poison Sphere:Flare Sphere:Lighting Sphere:Blind Sphere:Freezing Sphere:Cancel")) {
 		case 1: callfunc "Bullet_Trade",937,10,13205; break;
@@ -36,66 +32,92 @@ que_ng,187,156,3	script	Bullet Dealer Tony	86,{
 		case 3: callfunc "Bullet_Trade",7053,3,13204; break;
 		case 4: callfunc "Bullet_Trade",1024,5,13206; break;
 		case 5: callfunc "Bullet_Trade",7054,2,13207; break;
-		default:
+		case 6:
 			mes "[Tony]";
-			mes "Mmm~ Okay~";
-			mes "Please visit again~";
-			mes "I, Bullet-tooth Tony,";
-			mes "Will always be here~!!!";
+			mes "Changed your mind?";
+			mes "Well, if you ever need";
+			mes "any bullets, I'll be right";
+			mes "here. Come back whenever";
+			mes "you think you'll need more";
+			mes "ammunition, Gunslinger.";
 			close;
 		}
 	}
-	mes "I'm a trader who supplies";
-	mes "Gunslingers with trade items.";
-	mes "I am called Bullet-tooth Tony.";
+	mes "[Tony]";
+	mes "Hey, I'm Tony. I'm in";
+	mes "charge of distributing";
+	mes "and making bullets for";
+	mes "Gunslingers. It's just";
+	mes "how our guild likes";
+	mes "to do things.";
 	next;
 	mes "[Tony]";
-	mes "I don't think you are a Gunslinger";
-	mes "So just look around";
-	mes "and go.";
+	mes "I'm sorry if you came";
+	mes "here to buy some bullets.";
+	mes "I can only do business with";
+	mes "fully fledged Gunslingers.";
 	close;
 }
 
 function	script	Bullet_Trade	{
 	mes "[Tony]";
-	mes "Input the amount you wish to purchase.";
-	next;
-	mes "[Tony]";
-	mes "We trade 30 "+getitemname(getarg(2))+"s for";
-	mes "1 Phracon,";
+	mes "For every set of";
+	mes "30 "+getitemname(getarg(2))+"s,";
+	mes "you must give me";
 	mes "1 Emveretarcon,";
-	mes "and "+getarg(1)+" "+getitemname(getarg(0))+".";
+	mes "1 Phracon, and";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+".";
 	next;
 	mes "[Tony]";
-	mes "The maximum number you can trade is 500.";
-	mes "If you want to cancel, input 0.";
+	mes "Remember that I can give";
+	mes "a maximum of 500 sets of";
+	mes "30 bullets at a time. Please";
+	mes "enter the number of bullet sets";
+	mes "that you'd like. If you want to";
+	mes "cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	mes "[Tony]";
 	if (.@amount < 1 || .@amount > 500) {
-		mes "Invalid Amount!";
-		mes "Enter again~!";
+		mes "[Tony]";
+		mes "Hey, I can't give you";
+		mes "that many bullets. Don't";
+		mes "forget to enter a number";
+		mes "that's no higher than 500";
+		mes "if you want to trade your";
+		mes "items for some bullets.";
 		close;
-	} else if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
+	}
+	if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
 		if (checkweight(getarg(2),.@amount * 30) == 0) {
-			mes "I cannot give it to you because your inventory is full. Come back after your inventory has more space.";
+			mes "[Tony]";
+			mes "Eh? Your Inventory doesn't";
+			mes "have enough space for this";
+			mes "many bullets. Come back later";
+			mes "after you make more space";
+			mes "available. Try putting some of";
+			mes "your things into Kafra Storage.";
 			close;
-		} else {
-			mes "Oh~ Good!";
-			mes "Trade number checked!";
-			mes "I'll trade immediately.";
+		}else{
+			mes "[Tony]";
+			mes "Great, everything seems";
+			mes "to be in order. Let me take";
+			mes "these materials, and here are";
+			mes "your bullets. It's a pleasure";
+			mes "to do business with you~";
 			delitem 1010,.@amount;
 			delitem 1011,.@amount;
 			delitem getarg(0),.@amount * getarg(1);
 			getitem getarg(2),.@amount * 30;
 			close;
 		}
-	} else {
-		mes "Tsk Tsk~";
-		mes "You do not have";
-		mes "enough items for the";
-		mes "items you want to trade.";
-		mes "Prepare again and come back.";
+	}else{
+		mes "[Tony]";
+		mes "Huh. It looks like you";
+		mes "don't have enough materials";
+		mes "for that many bullets. Well,";
+		mes "it's no problem. Just come";
+		mes "back after gathering everything";
+		mes "that you need, okay?";
 		close;
 	}
 }
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
new file mode 100644
index 000000000..aea26e5ec
--- /dev/null
+++ b/npc/merchants/cash_hair.txt
@@ -0,0 +1,125 @@
+//===== eAthena Script ======================================= 

+//= Cash Hair Stylist

+//===== By: ================================================== 

+//= Kisuka

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= eAthena SVN

+//===== Description: ========================================= 

+//= Exchange cash item, New_Style_Coupon, for new hair styles.

+//===== Additional Comments: ================================= 

+//= 1.0 First Version. [Kisuka]

+//============================================================

+

+itemmall,19,74,5	script	Stylist#cash	91,{

+	mes "[Stylist]";

+	mes "Hey, I'm Kaniki.";

+	mes "I'm here to start a new";

+	mes "trend by introducing my";

+	mes "special new hairstyles!";

+	mes "Give me a ^FF0000New Style Coupon^000000,";

+	mes "and I'll change your hair~";

+	next;

+	if (Sex == 1) {

+		mes "[Kaniki]";

+		mes "I have two special";

+		mes "hairstyles for men, the";

+		mes "Emergency Heal Perm";

+		mes "and the Aura Blade Cut.";

+		mes "and aura blade cut.";

+		next;

+		cutin "hair_m_24.bmp",4;

+		mes "[Kaniki]";

+		mes "This is the Emergency";

+		mes "Heal Perm. It's a brand";

+		mes "new style I invented recently.";

+		mes "What do you think? Cool, huh?";

+		next;

+		cutin "",255;

+		cutin "hair_m_25.bmp",4;

+		mes "[Kaniki]";

+		mes "Now this is the Aura";

+		mes "Blade Cut. You haven't";

+		mes "seen anything like it";

+		mes "before, haven't you?";

+		next;

+		cutin "",255;

+	}else{

+		mes "[Kaniki]";

+		mes "I have two new hairstyles for";

+		mes "women, the Assumptio Perm";

+		mes "and the Soul Changer Cut.";

+		mes "Do you want to see how";

+		mes "these styles look?";

+		next;

+		cutin "hair_f_24.bmp",4;

+		mes "[Kaniki]";

+		mes "This is the Assumptio";

+		mes "Perm. It'd really good";

+		mes "on you, wouldn't it?";

+		next;

+		cutin "",255;

+		cutin "hair_f_25.bmp",4;

+		mes "[Kaniki]";

+		mes "Next is the Soul";

+		mes "Changer Cut. What do";

+		mes "you think? Isn't it nice?";

+		next;

+		cutin "",255;

+	}

+	mes "[Kaniki]";

+	mes "Have you decided";

+	mes "if you'd like me to";

+	mes "change your hairstyle?";

+	next;

+	if(select("Change Hairstyle:Don't Change") == 1) {

+		if (countitem(7622) > 0) {

+			mes "[Kaniki]";

+			mes "Great, you brought";

+			mes "a New Style Coupon!";

+			mes "Alright, which hairstyle";

+			mes "did you want to have?";

+			next;

+			if (Sex == 1) {

+				if(select("Emergency Heal Perm:Aura Blade Cut") == 1) {

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,24;

+				}else{

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,25;

+				}

+			}else{

+				if(select("Assumptio Perm:Soul Changer Cut") == 1) {

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,24;

+				}else{

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,25;

+				}

+			}

+			mes "[Kaniki]";

+			mes "There--! It's done!";

+			mes "How do you like your";

+			mes "new hair? Well, I hope";

+			mes "to see you again. Take care!";

+			close;

+		}else{

+			mes "[Kaniki]";

+			mes "I'm sorry, but I can";

+			mes "only provide my hairstyling";

+			mes "service if you bring a New";

+			mes "Style Coupon. Please come";

+			mes "back to me after you manage to";

+			mes "get one of those coupons, okay?";

+			close;

+		}

+	}

+	mes "[Kaniki]";

+	mes "Really? Oh, that's too bad.";

+	mes "Well, if you ever change your";

+	mes "mind about updating your";

+	mes "hairstyle, come back";

+	mes "and let me know, okay?";

+	close;

+}
\ No newline at end of file
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 334f423c5..94ffc2a8b 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -1,9 +1,9 @@
 //===== eAthena Script =======================================
 //= Hair Dresser
 //===== By: ==================================================
-//= [Muad_Dib] 1.0 (The Prometheus Project) & Samuray22
+//= Muad_Dib, Samuray22, Kisuka
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -11,393 +11,500 @@
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-// Stylist - alberta_in 55 142
-alberta_in,55,142,1	script	Stylist	91,{
+// Hair Dresser Veronica
+// ============================================================
+alberta_in,55,142,7	script	Hair Dresser	91,{
 	mes "[Veronica]";
-	mes "Welcome~~ Welcome~~";
-	mes "Welcome to the one of the best Hair shop, Veronika Beauty Saloon!! HoHoHo";
-	mes "Come here for new hair, right? ^^ How may I help you?";
+	mes "Welcome to Veronica's hair salon.";
+	mes "How can I help you?";
 	next;
-	switch(select("Look through Hair Styles.","Change Hair Styles.","Stop talking.")) {
-		case 1:
+	switch(select("See available hair styles.:Change hair style.:End conversation.")) {
+	case 1:
+		mes "[Veronica]";
+		mes "We have a total of 19 styles, available from no.1 to no.19.";
+		mes "Which one do you want to see?";
+		mes "If you wish to cancel,";
+		mes "please enter 0.";
+		next;
+		input .@style;
+		if(.@style > 19) {
 			mes "[Veronica]";
-			mes "There are 19 Hair Styles, 1 ~ 19!!!";
-			mes "Which number do you want to look at first?";
-			mes "If you want to stop looking, please choose 0.";
+			mes "Oops, I'm sorry, but that";
+			mes "style is not available.";
+			mes "Remember to enter a number";
+			mes "from 1 to 19.";
 			next;
-			input .@style;
-			if(.@style > 19) {
-				mes "[Veronica]";
-				mes "Sorry, there aren't any hair styles with that number.";
-				mes "Please choose number from 1 to 19.";
-				next;
-			} else if(.@style == 0) {
-				mes "[Veronica]";
-				mes "How was it?";
-				mes "Did you find any styles you like?";
-				mes "If you want to chage your hair style at anytime, I will do my best!!";
-				close;
+		} else if(.@style == 0) {
+			mes "[Veronica]";
+			mes "So, how do you like the style?";
+			mes "Feel free to ask me about any";
+			mes "available hairstyle. It will";
+			mes "be my pleasure to style your";
+			mes "hair.";
+			close;
+		}
+		else {
+			callsub L_cutin,.@style;
+			mes "[Veronica]";
+			switch(.@style) {
+			case 1:
+				if(Sex == 1) {
+					mes "Oh, that's 'Play Dead' style!";
+					mes "It's a nice, basic haircut.";
+					mes "I notice that usually the";
+					mes "cute, conversative types seem";
+					mes "to prefer this style.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'First Aid' style!";
+					mes "The shoulder length tresses";
+					mes "are straightened for those";
+					mes "no nonsense adventurers. It";
+					mes "seems to be the style of";
+					mes "choice for Novices.";
+					close2; cutin "",255; end;
+			case 2:
+				if(Sex == 1) {
+					mes "Oh, that's the 'Two Handed Sword";
+					mes "Mastery' style! It's perfect for";
+					mes "for Swordmen who might muss their";
+					mes "hair while swinging their swords";
+					mes "all day long.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Bash' style!";
+					mes "For the powerful woman that's";
+					mes "not afraid to get a little";
+					mes "blood on her hands, but knows";
+					mes "how great her hair will look";
+					mes "while wildly flailing a sword.";
+					close2; cutin "",255; end;
+			case 3:
+				if(Sex == 1) {
+					mes "Oh, that's 'Napalm Beat' style!";
+					mes "It's a unique look with a hint";
+					mes "of eccentricity that's offset";
+					mes "with a helping of elegance.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Frost Diver' style!";
+					mes "The pigtails lend an innocent,";
+					mes "demure look for those Mages";
+					mes "and Wizards that usually scare";
+					mes "off the boys with their spells.";
+					close2; cutin "",255; end;
+			case 4:
+				if(Sex == 1) {
+					mes "Oh, that's the 'Double Strafe'";
+					mes "style! The arrangement of the";
+					mes "hair conducts ambient static";
+					mes "electricity, naturally clearing";
+					mes "the mind. At least, that's what";
+					mes "I was taught in fashion school.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Arrow Shower' style!";
+					mes "For the Bowswoman who doesn't";
+					mes "want fashion to interfere with";
+					mes "her depth perception. Much more";
+					mes "attractive than those horrid";
+					mes "granny-style hairbuns.";
+					close2; cutin "",255; end;
+			case 5:
+				if(Sex == 1) {
+					mes "Oh, that's 'Angelus' style!";
+					mes "It's for calm and devout people,";
+					mes "as well as those bashful,";
+					mes "mild-mannered types.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Heal' style!";
+					mes "This is in trend among";
+					mes "Priests and Acolytes since";
+					mes "this style is appropriate";
+					mes "for formal situations, but";
+					mes "is also practical in battle.";
+					close2; cutin "",255; end;
+			case 6:
+				if(Sex == 1) {
+					mes "Oh, that's 'Push Cart' style!";
+					mes "It was based on the design of a";
+					mes "cart...at least, that's what";
+					mes "I learned in beautician school.";
+					close2; cutin "",255; end;
+				}
+					mes "Ooh, that's 'Vending' style!";
+					mes "It's the hairdo of money";
+					mes "makers...and if I may say so,";
+					mes "it's also economical.";
+					close2; cutin "",255; end;
+			case 7:
+				if(Sex == 1) {
+					mes "Ooh, that's 'Envenom' style!";
+					mes "It looks great on Thieves and";
+					mes "and Assassins when they're";
+					mes "out poisoning people and animals.";
+					mes "It's fashion for the aggressive";
+					mes "and eclectic~!";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Double Attack' style!";
+					mes "The adorable pigtail, paired with";
+					mes "those provacative bangs are sure";
+					mes "to help you steal the heart of";
+					mes "some cute guy.";
+					close2; cutin "",255; end;
+			case 8:
+				if(Sex == 1) {
+					mes "Oh, that's 'Bowling Bash' style!";
+					mes "A popular style for Knights, its";
+					mes "manly, rugged look tends to";
+					mes "attract all of the ladies,";
+					mes "and looks great on men with";
+					mes "strong chins.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Gloria' style!";
+					mes "It's very elegant and looks";
+					mes "great on holy Priests. This";
+					mes "style is most attractive to";
+					mes "ladies who aren't that used";
+					mes "to fighting with their hands.";
+					close2; cutin "",255; end;
+			case 9:
+				if(Sex == 1) {
+					mes "Oh, that's 'Venom Dust' style!";
+					mes "Definitely a look for rebels,";
+					mes "the sweeping, yet decidedly";
+					mes "luxorious locks seems to enchant";
+					mes "girls with a fatal attraction.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'SP Recovery' style!";
+					mes "To add more body to the special";
+					mes "style of these bangs, I use a";
+					mes "special conditioner that makes";
+					mes "you feel like you're regaining SP";
+					mes "...Although, it acutally doesn't.";
+					close2; cutin "",255; end;
+			case 10:
+				if(Sex == 1) {
+					mes "Oh, that's 'Turn Undead' style!";
+					mes "This is popular among Priests";
+					mes "that want a serious, yet a bit";
+					mes "of a wild, agressive look.";
+					mes "Definitely more attractive";
+					mes "than the 'Holy Light' mullet.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Prepare Potion' style!";
+					mes "The flared out tresses are chosen";
+					mes "by beginning Alchemists, since";
+					mes "early, explosive experiments would";
+					mes "make their hair to stick out anyway.";
+					close2; cutin "",255; end;
+			case 11:
+				if(Sex == 1) {
+					mes "Oh, that's 'Dragonology' style!";
+					mes "It's neat and clean cut, perfect";
+					mes "for studious people and looks";
+					mes "great with eyeglasses. This";
+					mes "is a fashion well suited to";
+					mes "intellectual types.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Grand Cross' style!";
+					mes "It's in style among those pious";
+					mes "Crusaders that need hair that";
+					mes "won't muss during fighting, yet";
+					mes "is respectable enough to attend";
+					mes "religious services.";
+					close2; cutin "",255; end;
+			case 12:
+				if(Sex == 1) {
+					mes "Oh, that's 'Mace Mastery' style!";
+					mes "A lot of care goes into making";
+					mes "that tussled hair say, 'I don't";
+					mes "care how I look at all.'";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Intimidate' style!"";
+					mes "The Rogue women seem to like";
+					mes "this style...although I imagine";
+					mes "that more of them would prefer";
+					mes "something wilder to match those";
+					mes "stockings...";
+					close2; cutin "",255; end;
+			case 13:
+				if(Sex == 1) {
+					mes "Oh, that's 'Thunder Storm' style!";
+					mes "This hot, flamboyant hairstyle";
+					mes "flares out wildly like thunder.";
+					mes "...And you will too with this new look.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Spiritual Sphere";
+					mes "Absorption' style! There's a";
+					mes "charismatic quality to this";
+					mes "fashion: it's tough, slightly";
+					mes "tomboyish, but not so much";
+					mes "that it can't be cute.";
+					close2; cutin "",255; end;
+			case 14:
+				if(Sex == 1) {
+					mes "Oh, that's 'Encore' style!";
+					mes "The elegant, flowing locks";
+					mes "fit well with Bards, or men who";
+					mes "appreciate the value of male";
+					mes "beauty.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Gypsy's Kiss' style!";
+					mes "Dancers seem to like this style,";
+					mes "although personally, I think";
+					mes "this fashion fits very well";
+					mes "with glasses.";
+					close2; cutin "",255; end;
+			case 15:
+				if(Sex == 1) {
+					mes "Oh, that's 'Grimtooth' style!";
+					mes "Spiky and unkempt, this style";
+					mes "is a popular counterculture";
+					mes "street fashion. You might";
+					mes "not want to wear your hair";
+					mes "this way at a wedding, though.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Counter Attack' style!";
+					mes "This is an intimidating look for";
+					mes "girls that want to say 'You hit";
+					mes "me, I'll hit you back!' It really";
+					mes "emphasizes strong looking";
+					mes "foreheads and cheekbones.";
+					close2; cutin "",255; end;
+			case 16:
+				if(Sex == 1) {
+					mes "Oh, that's 'Blitz Beat' style!";
+					mes "A funky and lively fashion,";
+					mes "this style was developed for a";
+					mes "Hunter who liked really long";
+					mes "bangs and wanted to see";
+					mes "through them at the same time.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Anke Snare' style!";
+					mes "The style style is specially";
+					mes "made for Hunters that don't like";
+					mes "to get their hair tangled...";
+					mes "After all, what kind of Hunter";
+					mes "lets their hair get trapped?";
+					close2; cutin "",255; end;
+			case 17:
+				if(Sex == 1) {
+					mes "Oh, that's 'Find Ore' style!";
+					mes "It's a practical, economical look";
+					mes "that is popular among Blacksmiths.";
+					mes "Some swear that this fashion helps";
+					mes "them in finding ores, but where's";
+					mes "the science in that??";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Hammer Fall' style!";
+					mes "For the woman that doesn't want";
+					mes "her hair to get in the way when";
+					mes "she's savagely swinging heavy";
+					mes "objects. Of course, this is a";
+					mes "Blacksmith favorite.";
+					close2; cutin "",255; end;
+			case 18:
+				if(Sex == 1) {
+					mes "Oh, that's 'Fire Pillar' style!";
+					mes "It's a trendy look, in which";
+					mes "you cover one eye for that";
+					mes "intrigue effect. The element";
+					mes "of mystery is always in";
+					mes "fashion, don't you think?";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Jupitel Thunder'";
+					mes "style! A look that strikes";
+					mes "like lightening, without";
+					mes "any of that annoying static";
+					mes "cling or muss. This fashion";
+					mes "looks great with Mage Hats.";
+					close2; cutin "",255; end;
+			case 19:
+				if(Sex == 1) {
+					mes "Oh, that's 'Guillotine Fist'";
+					mes "style! The smooth, slicked back";
+					mes "pompadour shows that you're";
+					mes "serious about your passion";
+					mes "for brawling... or just your passion.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Whirlwind' style!";
+					mes "A favorite among the studious";
+					mes "Sages, the hair is tied back";
+					mes "in a stylish braid so that";
+					mes "it doesn't fly around after";
+					mes "casting those windy spells.";
+					close2; cutin "",255; end;
 			}
-				callsub L_cutin,.@style;
-				mes "[Veronica]";
-				switch(.@style) {
+	case 2:
+		if(BaseLevel < 60) {
+			mes "[Veronica]";
+			mes "Oh, dear, you're looking fabulous with";
+			mes "your current hairstyle. Why don't you";
+			mes "try a new hair accessory rather than changing your look?";
+			close;
+		} else if((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) || (Zeny < 99800)) {
+			mes "[Veronica]";
+			mes "If you wish to change your";
+			mes "hairstyle, you should meet some";
+			mes "requirements. I suggest that you";
+			mes "write down all the items that";
+			mes "you will need.";
+			next;
+			mes "[Veronica]";
+			mes "3 Counteragent,";
+			mes "3 Mixture,";
+			mes "100 Danggie,";
+			mes "100 Short Danggie,";
+			mes "100 Black Hair,";
+			mes "100 Golden Hair,";
+			mes "100 Glossy Hair, and lastly...";
+			next;
+			mes "[Veronica]";
+			mes "You will need 99,800 zeny.";
+			mes "Please come back when you're";
+			mes "ready. I will make you look";
+			mes "fabulous. Hohohohoho~";
+			close;
+		}
+		mes "[Veronica]";
+		mes "Okay now, please choose the style";
+		mes "you desire from styles no.1 to";
+		mes "no.19.  I will do my best to";
+		mes "make you look your very best.";
+		next;
+		input .@style;
+		if(.@style > 19) {
+			mes "[Veronica]";
+			mes "I am sorry, you chose an unavailable style.";
+			mes "Make sure you enter the correct number.";
+			close;
+		} else if(.@style == 0) {
+			mes "[Veronica]";
+			mes "You have canceled your request.";
+			close;
+		} else if(getlook(1) == .@style) {
+			mes "[Veronica]";
+			mes "I am sorry, but you are already";
+			mes "wearing the style you have";
+			mes "requested. Would you please";
+			mes "choose a different style?";
+			close;
+		}
+			callsub L_cutin,.@style;
+			mes "[Veronica]";
+			mes "You have chosen style no. (" + input + ").";
+			mes "I shall proceed with your request.";
+			mes "Would you mind?";
+			next;
+			if(select("No, I don't mind.:Yes, let me choose another one.") == 1) {
+				if(getlook(6) == 0) {
+					mes "[Veronica]";
+					mes "Oh, my, you haven't dyed your hair";
+					mes "at all. You would look even more";
+					mes "fabulous if you dyed your hair...";
+					mes "Oh well, I will do it for free.";
+					mes "So what kind of color would you like?";
+					next;
+					switch(select("Red.:Yellow.:Purple.:Orange.:Green.:Blue.:White.:Dark Brown.:Cancel.")) {
 					case 1:
-						if(Sex == 1) {
-							mes "Oh~ 'Trickdead' style'!";
-							mes "It is very neat feature and comfortable.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
-						}
-							mes "Oh~ 'First Aid' style'!";
-							mes "It is the style people wants to stroke your hair^^.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
+						set .@pallete,8;
+						break;
 					case 2:
-						if(Sex == 1) {
-							mes "Oh~ 'Two-Handed Sword Mastery' style!";
-							mes "Its style is very similar to one of the famous Swordman.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
-						}
-							mes "Oh~ 'Bash' style!";
-							mes "It feels unrevealed strong power is hidden inside of....";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,1;
+						break;
 					case 3:
-						if(Sex == 1) {
-							mes "Oh~ 'Napalm Beat' style!";
-							mes "It makes feeling there is unknown power...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Frost Diver' style!";
-							mes "It feels cold but also warm...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,2;
+						break;
 					case 4:
-						if(Sex == 1) {
-							mes "Oh~ 'Double Strafe' style!";
-							mes "It will make you feel your mind is very clear.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Arrow Shower' style!";
-							mes "It feels very refreshed~";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,3;
+						break;
 					case 5:
-						if(Sex == 1) {
-							mes "Oh~ 'Angelus' style!";
-							mes "It feels calm and reverence.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Heal' style!";
-							mes "It feels mind is cured.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,4;
+						break;
 					case 6:
-						if(Sex == 1) {
-							mes "Oh~ 'Pushcart' style!";
-							mes "This is the style based on motive of string cart..";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Vending' style!";
-							mes "It seems like making lots of money.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,5;
+						break;
 					case 7:
-						if(Sex == 1) {
-							mes "Oh~ 'Envenom' style!";
-							mes "It makes feel addicting into something..";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Double Strafe' style!";
-							mes "It makes whomever dash twice.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,6;
+						break;
 					case 8:
-						if(Sex == 1) {
-							mes "Oh~ 'Bowling Bash' style!";
-							mes "Once people sees it, they will fall for it!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Gloria' style!";
-							mes "Its nobleness and holiness moods are great.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,7;
+						break;
 					case 9:
-						if(Sex == 1) {
-							mes "Oh~ 'Venom Dust' style!";
-							mes "It is the style gives feeling deadly charm.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Increase SP Recovery' style!";
-							mes "It makes feel like recovering spirit fully.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 10:
-						if(Sex == 1) {
-							mes "Oh~ 'Turn Undead' style!";
-							mes "It gives feeling one attack can make Devils disappear!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Prepare Potion' style!";
-							mes "It feels a wound is healed already!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 11:
-						if(Sex == 1) {
-							mes "Oh~ 'Dragonology' style!";
-							mes "This is the style based on motive of mysterious Dragon...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Grand Cross' style!";
-							mes "It feels a firm faith...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 12:
-						if(Sex == 1) {
-							mes "Oh~ 'Mace Mastery' style!";
-							mes "It looks very hard and attractive!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Intimidate' style!";
-							mes "It seems you saw this style somewhere...?";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 13:
-						if(Sex == 1) {
-							mes "Oh~ 'Thunderstorm' style!";
-							mes "It feels hit by thunder storm!!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Spiritual Sphere Absorption' style!";
-							mes "It catches people's spirits^^";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 14:
-						if(Sex == 1) {
-							mes "Oh~ 'Encore' style!";
-							mes "It is the style makes people feels like asking you to sing~^^";
-							mes "How do you think? Do you like it??";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Gypsy's Kiss' style!";
-							mes "It makes people think you are very kind to all...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 15:
-						if(Sex == 1) {
-							mes "Oh~ 'Grimtooth' style!";
-							mes "It feels like you will be pricked by hair!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Counter Attack' style!";
-							mes "It feels it will kick when someone is near!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 16:
-						if(Sex == 1) {
-							mes "Oh~ 'Blitz Beat' style!";
-							mes "It feels it will attack 5 times...?";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Ankle Snare' style!";
-							mes "This is the style hardly move.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 17:
-						if(Sex == 1) {
-							mes "Oh~ 'Ore Discovery' style!";
-							mes "It feels like picking up things while walking.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Hammer Fall' style!";
-							mes "It will make feeling dizzy!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 18:
-						if(Sex == 1) {
-							mes "Oh~ 'Fire Pillar' style!";
-							mes "It has been a great style over the one generation...!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Jupitel Thunder' style!";
-							mes "It feels very neat.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 19:
-						if(Sex == 1) {
-							mes "Oh~ 'Guillotine Fist' style!";
-							mes "It feels like betting all at once!!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Whirlwind' style!";
-							mes "It feels very refresh like wind.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
+						mes "[Veronica]";
+						mes "Oh, I was gonna do it for free.";
+						mes "Well, if you change your mind, please come again.";
+						mes "The color of your hair enhances your look.";
+						close;
+					}
 				}
-		case 2:
-			if(BaseLevel < 60) {
+				nude;
 				mes "[Veronica]";
-				mes "Wow~, Dear, this style looks good on you~";
-				mes "Don't change strangely.";
-				mes "Why don't you decorate hair with accessories~";
-				close;
-			} else if((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) || (Zeny < 99800)) {
-				mes "[Veronica]";
-				mes "If you want to change your hair style, you need several items";
-				mes "Since you need many items....";
-				mes "I think you should write those down.";
+				mes "Now, let's get started. Try to";
+				mes "stay still, dear. If you move,";
+				mes "it might ruin the perfect look";
+				mes "I intend to give you. Trust me,";
+				mes "I will make you look fabulous~";
 				next;
 				mes "[Veronica]";
-				mes "3 Counteragent,";
-				mes "3 Mixture,";
-				mes "100 Daenggies,";
-				mes "100 Short Daenggies,";
-				mes "100 Black Hairs,";
-				mes "100 Golden Hairs,";
-				mes "100 Glossy Hair.";
+				mes "- *snip snip snip snip* -";
+				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
+				mes "- *snip snip snip snip* -";
+				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
 				next;
+				set Zeny,Zeny-99800;
+				delitem 973,3;	// Counteragent
+				delitem 974,3;	// Mixture
+				delitem 901,100;	// Danggie
+				delitem 1094,100;	// Short_Daenggie
+				delitem 1020,100;	// Long_Hair
+				delitem 1060,100;	// Golden_Hair
+				delitem 7152,100;	// Glossy_Hair
+				setlook 1,.@style;
+				setlook 6,.@pallete;
+				cutin "",255;
 				mes "[Veronica]";
-				mes "And also you need 99,800 zeny.";
-				mes "If you gather them all...";
-				mes "I will show you what I can do~!! ^^ HoHoHo.";
-				close;
-			}
-			mes "[Veronica]";
-			mes "Well, then... Please choose Hair Style you like the most.";
-			mes "I will do my best ^^";
-			mes "There are 19 different Hair Styles.";
-			mes "Numbers from 1 to 19~";
-			next;
-			input .@style;
-			if(.@style > 19) {
-				mes "[Veronica]";
-				mes "There are no such numbers like that!";
-				mes "Please check your number~";
-				close;
-			} else if(.@style == 0) {
-				mes "[Veronica]";
-				mes "It's been canceled.";
-				close;
-			} else if(getlook(1) == .@style) {
-				mes "[Veronica]";
-				mes "You already have this style!!";
-				mes "I think you should look through Hair Styles again";
+				mes "Alright, it's done~";
+				mes "I hope you like";
+				mes "this style no.(" + input + ").";
+				mes "Feel free to come back anytime";
+				mes "when you want a new hairstyle. Hohohohohoho~";
+				setlook 1,.@style;
+				setlook 6,.@pallete;
 				close;
 			}
-				callsub L_cutin,.@style;
-				mes "[Veronica]";
-				mes "This is (" + .@style + ") style.";
-				mes "I will change your hair with this again.";
-				mes "Is that OK with you??";
-				next;
-				if(select("Yeah~ I'd love to.","No..I don't like it...") == 1) {
-						if(getlook(6) == 0) {
-							mes "[Veronica]";
-							mes "You haven't dyeing your hair~ Not even once!!";
-							mes "I think dyeing your hair makes you much better...";
-							mes "I can do it for you as a service... for FREE ^^";
-							mes "Which color do you want?";
-							next;
-							switch(select("Red","Yellow","Purple","Orange","Green","Blue","White","Black","Cancel")) {
-								case 1:
-									set .@pallete,8;
-									goto L_style;
-								case 2:
-									set .@pallete,1;
-									goto L_style;
-								case 3:
-									set .@pallete,2;
-									goto L_style;
-								case 4:
-									set .@pallete,3;
-									goto L_style;
-								case 5:
-									set .@pallete,4;
-									goto L_style;
-								case 6:
-									set .@pallete,5;
-									goto L_style;
-								case 7:
-									set .@pallete,6;
-									goto L_style;
-								case 8:
-									set .@pallete,7;
-									goto L_style;
-								case 9:
-									mes "[Veronica]";
-									mes "Well.. then think it over..";
-									mes "and come visit me again.";
-									mes "Not only type of hair style but also color of it is very important.";
-									close;
-							}
-						}
-				L_style:
-						mes "[Veronica]";
-						mes "Now, It begins~. Hold still~";
-						mes "If you move, you will have very bad style^^";
-						mes "Just trust me on this!!";
-						next;
-						mes "[Veronica]";
-						mes "- Clip clip Clip clip -";
-						mes "- Klit klit Klit klit -";
-						mes "- Snip snip Snip snip -";
-						next;
-						delitem 973,3;
-						delitem 974,3;
-						delitem 901,100;
-						delitem 1094,100;
-						delitem 1020,100;
-						delitem 1060,100;
-						delitem 7152,100;
-						setlook 1,.@style;
-						setlook 6,.@pallete;
-						cutin "",255;
-						mes "[Veronica]";
-						mes "Wow~ it came out very well~~~ ";
-						mes "I hope you like this (" + .@style + ") style. ^^";
-						mes "If you'd like to have other hair style,";
-						mes "you are welcome to visit me anytime~ HoHoHo";
-						setlook 1,.@style;
-						setlook 6,.@pallete;
-						close;
-				}
-						mes "[Veronica]";
-						mes "Well~ choose again please~";
-						mes "There shold be a style you like.";
-						mes "Just remember the number you like the most abd tell me.";
-						close;
-		case 3:
 			mes "[Veronica]";
-			mes "Everyone has rights to become beautiful...";
-			mes "I wish you can find your hair style which fits on you well~";
-			mes "I really do~ ^^";
+			mes "Okay then, please choose one";
+			mes "a hairstyle again. I believe";
+			mes "you will find the look that's best for you.";
 			close;
+	case 3:
+		mes "[Veronica]";
+		mes "Everybody deserves the right to";
+		mes "pursue beauty. I hope that you";
+		mes "will find the right hairstyle";
+		mes "one of these days.";
+		close;
 	}
+
 L_cutin:
 	if(Sex == 1) {
 		if(getarg(0) < 10)
@@ -413,99 +520,164 @@ L_cutin:
 	return;
 }
 
-// Gypsy Hairdresser - alberta 33 141
-alberta,33,141,1	script	Gypsy Hairdresser	87,{
-	mes "[Bisharm]";
-	mes "Omg! Kidding me she is a desinger!!";
-	mes "One of the best?? Yeah..whatever...";
-	mes "I'm the only one who knows what's the true dudism and value of hair!";
-	mes "I am a CREATOR of BEAUTY!";
+// Roving Hair Dresser
+// ============================================================
+alberta,33,141,7	script	Roving Hair Dresser	87,{
+	mes "[Rui Vishop]";
+	mes "That Veronica...";
+	mes "Hah! Best hair dresser my ass.";
+	mes "She's not the best hair dresser...";
+	mes "...";
+	mes "I am!";
+	next;
+	mes "[Rui Vishop]";
+	mes "I, Rui Vishop, the man to whom";
+	mes "all scalps are canvases";
+	mes "waiting to be transformed into";
+	mes "works of magnificent art~!";
 	next;
-	switch(select("What do you do?","Please bless me also!!",".....")) {
-		case 1:
-			mes "[Bisharm]";
-			mes "ME? I am a hairdresser.";
-			mes "I am drifting from place to place...and";
-			mes "giving people beauty of hair.";
-			mes "I heard there is....";
-			mes "there is a novice who is calling oneself a hair designer in this town...";
+	switch(select("What are you?:Do my hair, please!:.....")) {
+	case 1:
+		mes "[Rui Vishop]";
+		mes "Do you not know that I, Rui";
+		mes "Vishop, maestro of the shears";
+		mes "and sculptor of hair, am an";
+		mes "artist far ahead of his time?!";
+		mes "Well, I suppose an adventurer";
+		mes "like yourself wouldn't know...";
+		next;
+		mes "[Rui Vishop]";
+		mes "As a hair sculptor, I find joy";
+		mes "in bestowing upon others the";
+		mes "supreme favour of doing their";
+		mes "hairstyle at a reasonable price.";
+		next;
+		mes "[Rui Vishop]";
+		mes "Recently, however, I happened to";
+		mes "overhear that some tyro has had";
+		mes "the audacity to call herself a";
+		mes "hair dresser.";
+		next;
+		mes "[Rui Vishop]";
+		mes "So one day I went there,";
+		mes "pretending to be a customer.";
+		mes "I was apalled to see the boring,";
+		mes "lifeless hairstyles that she was";
+		mes "giving all of her clients...";
+		next;
+		mes "[Rui Vishop]";
+		mes "It wasn't hard to notice that her";
+		mes "skills, or lack thereof, are a";
+		mes "joke. She brings shame to the";
+		mes "great and honorable";
+		mes "profession of hair dressing.";
+		mes "A complete and utter disgrace!";
+		next;
+		mes "[Rui Vishop]";
+		mes "But the worst part was...";
+		mes "she forced her customers to";
+		mes "choose a hairstyle before she";
+		mes "styled their hair!";
+		next;
+		mes "[Rui Vishop]";
+		mes "That's not how talented hair";
+		mes "dressers do their job! She";
+		mes "should know what hair style will";
+		mes "fit a customer without ever";
+		mes "asking them!";
+		next;
+		mes "[Rui Vishop]";
+		mes "If by any chance you decide to";
+		mes "do your hair, don't even think";
+		mes "about giving her patronage.";
+		mes "Instead, you may ask for my";
+		mes "services. I assure you, I am";
+		mes "faaaar better than her.";
+		next;
+		mes "[Rui Vishop]";
+		mes "Do you understand? I mean, don't";
+		mes "let her ruin your hair needlessly!";
+		mes "You could get a Swordman to hack";
+		mes "away at your hair if you want a";
+		mes "hairstyle that horrible~!";
+		close;
+	case 2:
+		if(BaseLevel < 60) {
+			mes "[Rui Vishop]";
+			mes "Hmm, I must say, your current";
+			mes "style fits you best. Trust me, I know what I am saying.";
+			close;
+		} else if(Zeny < 199800) {
+			mes "[Rui Vishop]";
+			mes "Ah, I see that that you can";
+			mes "recognize genius when it is";
+			mes "right before you. In light";
+			mes "of your good taste, I will";
+			mes "only require money for my";
+			mes "services.";
 			next;
-			mes "[Bisharm]";
-			mes "That's why I came to this town.";
-			mes "I was watching and I find out everyone asks what they want from the menu...";
-			mes "That is not the way!!";
-			mes "There are some cases..";
-			mes "hairs don't look good on people when listening to them!";
+			mes "[Rui Vishop]";
+			mes "Simply pay me the small";
+			mes "fee of 199,800 zeny. You must";
+			mes "know that I am doing you a";
+			mes "huge favor by charging you";
+			mes "such a small amount. My";
+			mes "art is priceless, after all.";
+			close;
+		}
+		mes "[Rui Vishop]";
+		mes "Alright, I will be taking my";
+		mes "199,800 zeny service charge now.";
+		next;
+		mes "[Rui Vishop]";
+		mes "If you don't wish to do";
+		mes "this right now, though I can't";
+		mes "imagine why, you may ask that";
+		mes "stupid hair dresser to";
+		mes "do her clumsy work on you...";
+		next;
+		if(select("No, please do my hair.:Umm, I changed my mind.") ==1 ) {
+			mes "[Rui Vishop]";
+			mes "O~k~a~y!";
+			mes "Now, let us begin~!";
 			next;
-			mes "[Bisharm]";
-			mes "Also very amateur skill...";
-			mes "Very very...amateur...";
-			mes "You can't call it a beauty designer!";
-			mes "Waisting too mush hairs!";
-			mes "In short I don't like it very well!!";
+			mes "[Rui Vishop]";
+			mes "Wooooo~oooohhhh!! Toohhhhh~oooohhhh!!";
 			next;
-			mes "[Bisharm]";
-			mes "If you want me to touch your hair,";
-			mes "please ask me anytime.";
-			mes "I'll specially do my best for you.";
-			mes "Got it?";
-			mes "Don't ever let novice touch your hair!";
-			close;
-		case 2:
-			if(BaseLevel < 60) {
-				mes "[Bisharm]";
-				mes "Hmm, From my artistic perspective,";
-				mes "the hair style you have looks very good on you!";
-				mes "You should stay with it!";
-				mes "Trust me!";
-				close;
-			} else if(Zeny < 199800) {
-				mes "[Bisharm]";
-				mes "Yeah? You don't need anything else. You only need ZENY!";
-				mes "You just need 199,800 zeny.";
-				mes "Just let you know.... ";
-				mes "that you should feel an honor about me touching your hair with only this price...";
-				close;
-			}
-				mes "[Bisharm]";
-				mes "Good, I will take 199,800 zeny for my fee.";
-				mes "OK?";
-				mes "You still have chance to go to that novice and do your hair....";
-				mes "It's up to you...";
-				next;
-				if(select("I will ask you a favor","Well..I will pass..") ==1 ) {
-					mes "[Bisharm]";
-					mes "Alright!----- Here goes!!!";
-					mes "Watch yourself!!";
-					next;
-					mes "[Bisharm]";
-					mes "Wooohhhhhhhhh!!!!";
-					next;
-					mes "[Bisharm]";
-					mes "Yipe!! Yeah!! Yeah~~~~~!!";
-					next;
-					mes "[Bisharm]";
-					mes "Finished...!! great...GREAT!!";
-					mes "The style no one can't creat!!!!";
-					mes "Phu..Hahahahahaha!!";
-					setlook 1,rand(1,19);
-					setlook 6,rand(1,6);
-					set Zeny,Zeny-199800;
-					close;
-				}
-					mes "[Bisharm]";
-					mes "Hmm! Whatever...!! You'll regret this!!";
-					mes "You'll relize only great artisan can...";
-					mes "can creat real beauty.....";
-					mes "You will relize it...someday...";
-					close;
-		case 3:
-			mes "[Bisharm]";
-			mes "I feel so sorry for people";
-			mes "who let their hairs to be touched by a NOVICE";
-			mes "who doesn't know anything about beauty!!";
-			mes "I feel really really sorry for them!!";
+			mes "[Rui Vishop]";
+			mes "Woooooo~aaaaaaahhhhh!!";
+			next;
+			mes "[Rui Vishop]";
+			mes "Voila!";
+			next;
+			mes "[Rui Vishop]";
+			mes "Oh, great~ it's awesome!";
+			mes "Another Vishop masterpiece~";
+			mes "Once more I've outdone myself.";
+			mes "It's such a unique and talented";
+			mes "style! Yes, I am the best! Wooohahahahahaha!";
+			set Zeny,Zeny-199800;
+			setlook 1,rand(1,19);
+			setlook 6,rand(1,8);
 			close;
+		}
+		mes "[Rui Vishop]";
+		mes "Bah! Alright! It's your decision.";
+		mes "But don't blame me later!";
+		mes "One day you'll wake up, realize";
+		mes "you're ugly and regret not";
+		mes "having my genius shape every lock";
+		mes "of hair on your head.";
+		close;
+	case 3:
+		mes "[Rui Vishop]";
+		mes "What? What a shame!";
+		mes "Will you let that...that";
+		mes "charlatan of a hair dresser ruin";
+		mes "your hairstyle!? I'm sure the";
+		mes "heavens are crying tears of";
+		mes "pity at mankind's ignorance...";
+		close;
 	}
 }
 
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eec7b0171..eb1dd0c63 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -1,61 +1,82 @@
 //===== eAthena Script =======================================
 //= Ice Cream Maker
 //===== By: ==================================================
-//= KOOK SWU
+//= KOOK SWU, Kisuka
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
 //= A man makes you ice-cream
 //===== Additional Comments: =================================
 //= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
 //= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
+//= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
 //============================================================
 
-//ALBERTA
+// Alberta
 alberta,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
 	mes "[Ice Cream Maker]";
 	mes "Fresh Ice Cream made with snow from Lutie!";
 	mes "Enjoy it now, it won't be on sale for long!";
-	mes "^0000FF100 Zeny^000000 Ice Cream,";
+	mes "^3355FF100 Zeny^000000 Ice Cream,";
 	mes "Ice Cream!";
 	next;
-	menu "Gimme Ice Cream!",-,"Cancel Trade",L_End;
-	
-		mes "[Ice Cream Maker]";
-		mes "Fresh Ice Cream made with snow from Lutie!";
-		mes "Everyone wants our delicious ice cream, but we have limited amount,";
-		mes "so you can only purchase 5 at a time!!";
-		next;
-		input @input;
-		mes "[Ice Cream Maker]";
-		if(@input<1) goto L_inpC;
-		if(@input>5) goto L_inpM;
-		if(Zeny< @input*100) goto L_NoZ;
-		set Zeny,Zeny-100*@input;
-		getitem 536,@input;
-		mes "Here you go  " +@input+ "  Ice Cream for you.";
+	if(select("Gimme Ice Cream!:Cancel Trade") == 2) {
+		mes "Are you sure you don't want any?";
+		mes "I won't be selling it for long,";
+		mes "and once I run out,";
+		mes "there won't be any more!!!";
 		close;
-		
-		L_inpC:
-			mes "Deal is canceled.";
-			close;
-		L_inpM:
-			mes "Sorry, but you can only buy 5 at a time.";
-			close;
-		L_NoZ:
-			mes "Sorry, but you need more money.";
+	}
+	mes "[Ice Cream Maker]";
+	mes "Fresh Ice Cream made with snow from Lutie!";
+	mes "Everyone wants our delicious ice cream, ";
+	mes "but we have a limited amount,";
+	mes "so you can only purchase 5 at a time!!";
+	next;
+	while(1) {
+		input .@input;
+		if(.@input < 1) {
+			mes "[Ice Cream Maker]";
+			mes "If you don't want to buy any,";
+			mes "could you please let the next customer";
+			mes "make a purchase?";
+			mes "Thank you.";
 			close;
-	L_End:
+		}
+		if(.@input > 5) {
+			mes "[Ice Cream Maker]";
+			mes "Ouch";
+			mes "You expect too much.";
+			mes "Dear customer,";
+			mes "If you eat more than 5 Ice creams,";
+			mes "If you might haveto make a lot of trips";
+			mes "to the bathroom tonight.";
+			next;		
+		}
+	}
+	if(Zeny<.@input*100) {
 		mes "[Ice Cream Maker]";
-		mes "Are you sure you don't want any?";
-		mes "I won't be selling it for long, and once I run out, there won't be anymore!!!";
+		mes "Dear customer, your wallet seems to be light.";
+		mes "Price is ^3355FF100 Zeny^000000 per ice cream.";
+		close;	
+	}
+	if(checkweight(536,.@amount) == 0) {
+		mes "[Ice Cream Maker]";
+		mes "Dear customer,you look like you're carrying a lot.";
+		mes "Ice Cream is fine,";
+		mes "but you must consider your weight";
+		mes "before making a purchase.";
 		close;
+	}
+	set Zeny,Zeny-100*.@input;
+	getitem 536,.@input;	// Ice_Cream
+	close;
 }
 
-//MORROC FIELD
+// Morroc Field
 moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	85
 
-//MORROC
+// Morroc
 //morocc,160,144,4	duplicate(IceCreamer)	Ice Cream Maker#3	85
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 6b645aed6..51c77d4bc 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -43,6 +43,7 @@
 //= 2.6 Updated Alberta inn to official. [L0ne_W0lf]
 //= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
 //= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
+//= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka]
 //============================================================ 
 
 
@@ -113,7 +114,6 @@ ra_in01,376,69,4	script	Inn Keeper#Annie	931,{
 
 //====================== Lighthalzen =================================
 lhz_in02,230,284,4	script	Hotel Employee#01	86,{
-
 	mes "[Hotel Employee]";
 	mes "Welcome to";
 	mes "the Royal Dragon,";
@@ -121,43 +121,41 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 	mes "finest accomodations";
 	mes "and the best service.";
 	next;
-	menu "Save Point",s_Save,"Rest - 5,000 zeny",s_Rest,"Cancel",-;
-
-	mes "[Hotel Employee]";
-	mes "Thank you and";
-	mes "have a nice day.";
-	close;
-
-s_Save:
-	savepoint "lhz_in02",209,275;
-	mes "[Hotel Employee]";
-	mes "Thank you, your";
-	mes "Respawn Point has";
-	mes "been saved here in";
-	mes "the Royal Dragon.";
-	close;
-
-s_Rest:
-	if(Zeny < 5000)goto s_NEnoughZ;
-	set Zeny,Zeny - 5000;
-	mes "[Hotel Employee]";
-	mes "Thank you~";
-	mes "I hope you enjoy";
-	mes "your stay in the";
-	mes "Royal Dragon.";
-	close2;
-	warp "lhz_in02",219,150;
-	percentheal 100,100;
-	sc_start SC_BLESSING,240000,10;
-	skilleffect AL_BLESSING,0;
-	end;
-
-s_NEnoughZ:
-	mes "[Hotel Employee]";
-	mes "I'm sorry but you do not";
-	mes "have enough zeny, please";
-	mes "come back when you do!";
-	close;
+	switch(select("Save Point:Rest - 5,000 zeny:Cancel")) {
+	case 1:
+		savepoint "lhz_in02",209,275;
+		mes "[Hotel Employee]";
+		mes "Thank you, your";
+		mes "Respawn Point has";
+		mes "been saved here in";
+		mes "the Royal Dragon.";
+		close;
+	case 2:
+		if(Zeny < 5000) {
+			mes "[Hotel Employee]";
+			mes "I'm sorry, but";
+			mes "you need 5,000 zeny";
+			mes "in order to check in.";
+			close;
+		}
+		set Zeny,Zeny - 5000;
+		mes "[Hotel Employee]";
+		mes "Thank you~";
+		mes "I hope you enjoy";
+		mes "your stay in the";
+		mes "Royal Dragon.";
+		close2;
+		warp "lhz_in02",219,150;
+		percentheal 100,100;
+		sc_start SC_BLESSING,240000,10;
+		skilleffect AL_BLESSING,0;
+		end;
+	case 3:
+		mes "[Hotel Employee]";
+		mes "Thank you and";
+		mes "have a nice day.";
+		close;
+	}
 }
 
 //======================== Hugel ====================================
@@ -175,20 +173,21 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	mes "most comfortable";
 	mes "inn here in Veins~";
 	next;
-	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
-
-	Msave:
+	switch(select("Save:Take a Rest -> 5000 zeny:Quit")) {
+	case 1:
 		mes "[Inn Master]";
-		mes "Your respawn point";
+		mes "Your Respawn Point";
 		mes "has been saved in Veins.";
 		mes "Enjoy your stay in town~";
 		savepoint "ve_in",157,209;
 		close;
-	Mrent:
+	case 2:
 		mes "[Inn Master]";
 		if(Zeny < 5000){
-			mes "I'm sorry, but you don't have enough money to check in.";
-			mes "The service charge is 5,000 zeny.";
+			mes "I'm sorry, but I don't";
+			mes "think you have enough";
+			mes "money to check in. The";
+			mes "service charge is 5,000 zeny.";
 			close;
 		}
 		mes "Enjoy your stay~";
@@ -196,9 +195,11 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 		set Zeny,Zeny - 5000;
 		percentheal 100,100;
 		warp "ve_in",184,228;
-
-	Mend:
+	case 3:
+		mes "[Inn Master]";
+		mes "Please come again.";
 		close;
+	}
 }
 
 //======================= Inn Function ==============================
@@ -208,9 +209,8 @@ function	script	F_InnMaid	{
 	mes getarg(1) + ".";
 	mes "How may I help you?";
 	next;
-	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
-
-	Msave:
+	switch(select("Save:Take a Rest -> 5000 zeny:Cancel")) {
+	case 1:
 		mes getarg(0);
 		mes "Your respawn point";
 		mes "has been saved.";
@@ -218,13 +218,10 @@ function	script	F_InnMaid	{
 		mes "please come again.";
 		savepoint getarg(2),getarg(3),getarg(4);
 		close;
-	Mrent:
+	case 2:
 		mes getarg(0);
 		if(Zeny < 5000){
-			mes "I'm sorry, but the service charge";
-			mes "is 5,000 zeny. Please make sure";
-			mes "that you have enough money to check";
-			mes "in next time, okay?";
+			mes "I'm sorry, but the service charge is 5,000 zeny. Please make sure that you have enough money to check in next time, okay?";
 			close;
 		}
 		mes "Thank you.";
@@ -234,7 +231,7 @@ function	script	F_InnMaid	{
 		set Zeny,Zeny - 5000;
 		percentheal 100,100;
 		return;
-
-	Mend:
+	case 3:
 		close;
+	}
 }
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index ad2adaddd..196405ff0 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,93 +1,101 @@
 //===== eAthena Script =======================================
-//= Kunai "Trader" @ que_ng
+//= Kunai Merchant Kashin
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
-//= NPC that trades you a few shurikens + ninja stones for 
-//= elemental kunais.
+//= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
 //= 1.0 Added the npc. It uses a function that sends the item 
 //=	  id of the 2 required items plus the amount. Can trade
 //= 	  up to 500 units (5,000 kunais) at once. [erKURITA]
 //= 1.1 Officialized script [Playtester]
 //= 1.2a Optimized/cleaned up a bit [ultramage]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,72,29,3	script	Kunai Merchant Kashin	83,{
-
-	mes "[Kashin]";	
-	if(BaseJob != Job_Ninja) {
-		mes "I am Kashin of the Wind. I distribute trade items to the shadows.";
-		next;
+	if(BaseJob == Job_Ninja) {
 		mes "[Kashin]";
-		mes "It doesn't seem like you are a Ninja... Just take a good look around and be on your way.";
-		close;
+		mes "I am Kashin, distributor";
+		mes "of Kunai for Ninjas. Take";
+		mes "a look around and let me";
+		mes "know if you're interested";
+		mes "in any of my wares.";
+		next;
+		switch(select("10 Fell Poison Kunai:10 Icicle Kunai:10 High Wind Kunai:10 Black Earth Kunai:10 Heat Wave Kunai:Cancel")) {
+		case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
+		case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
+		case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
+		case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
+		case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
+		case 6:
+			mes "[Kashin]";
+			mes "Well then, thank you";
+			mes "for visiting my shop.";
+			mes "Please come to me when";
+			mes "you need to buy some";
+			mes "Kunais. Goodbye for now~";
+			close;
+		}
 	}
-	mes "I'm Kashin!";
-	mes "If you're ever short on Shurikens, come and see me.";
-	next;
 	mes "[Kashin]";
-	mes "What will it be?";
-	mes "Choose what you want.";
-	next;
-
-	switch(select("Poison Kunais:Frost Kunais:Wind Kunais:Earth Kunais:Fire Kunais:Cancel")) {
-	//usage: callfunc "Kunai_Trade",itemreqid1,itemreqct1,itemreqid2,itemreqct2,itemidtrade;
-	case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
-	case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
-	case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
-	case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
-	case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
-	default:
-		mes "[Kashin]";
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
+	mes "I am Kashin, distributor";
+	mes "of Kunai for Ninjas. If you";
+	mes "have any friends that are";
+	mes "Ninjas, then you might";
+	mes "want to tell them about me.";
 	close;
 }
 
 function	script	Kunai_Trade	{
-	
 	mes "[Kashin]";
-	mes "If you give me "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+", I'll give you a pack of 10 "+getitemname(getarg(4))+".";
+	mes "You can exchange";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+" and";
+	mes ""+getarg(3)+" "+getitemname(getarg(2))+" for every";
+	mes "set of 10 "+getitemname(getarg(4))+".";
 	next;
 	mes "[Kashin]";
-	mes "You can trade up to 500 packs at a time.";
-	mes "If you don't want to trade, just enter 0 as the amount.";
+	mes "I can only give you a maximum of 500 sets of Kunais at a time.";
+	mes "If you want to cancel the trade, then please enter ''0.'' How many";
+	mes "Kunai sets would you like?";
 	next;
 	input .@amount;
-
-	mes "[Kashin]";
-	if(.@amount < 1) {
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
-	if(.@amount > 500) {
-		mes "You've exceeded the input amount!";
-		mes "Enter a valid number next time~!";
+	if(.@amount < 1 || .@amount > 500) {
+		mes "[Kashin]";
+		mes "Eh? I'm sorry, but";
+		mes "I can't give you that";
+		mes "many Kunai sets. Please";
+		mes "enter a value less than 500.";
 		close;
 	}
 	if(countitem(getarg(0)) < .@amount*getarg(1) || countitem(getarg(2)) < .@amount*getarg(3)) {
-		mes "Hmm... this is no good~";
-		mes "You don't have enough materials to trade in for the amount of Kunai's that you want.";
-		mes "Bring some more if you want this amount.";
+		mes "[Kashin]";
+		mes "Hmm, you don't have";
+		mes "enough items for this";
+		mes "Kunai exchange. Please";
+		mes "check your items again.";
 		close;
  	}
 	if(checkweight(getarg(4), .@amount*10) == 0) {
-		mes "Your bag is too full to carry the trade items. Come back after you made room for the traded items.";
+		mes "[Kashin]";
+		mes "Hmm, it seems like your";
+		mes "Inventory doesn't have";
+		mes "enough space to store";
+		mes "more items. You better";
+		mes "free up some space first.";
 		close;
 	}
-	mes "Ok~ Very well!";
-	mes "Amount verified!";
-	mes "Here are your traded items.";
+	mes "[Kashin]";
+	mes "Great, everything is in";
+	mes "order, so let's go ahead";
+	mes "and complete this trade.";
+	mes "I'm sure that you'll be";
+	mes "quite satisfied with";
+	mes "these Kunais.";
 	delitem getarg(0),getarg(1)*.@amount;
 	delitem getarg(2),getarg(3)*.@amount;
 	getitem getarg(4),10*.@amount;
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 27d23b865..8690a9dee 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= DZeroX
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena SVN Trunk
 //===== Description: =========================================
@@ -22,9 +22,10 @@
 //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf]
 //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf]
 //= 1.3 Fixed minor condition check bug. (bugreport:597) [L0ne_W0lf]
+//= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-alberta_in,16,28,4	script	Old Pharmacist	61,{
+alberta_in,16,28,4	script	Pharmacist	61,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -34,12 +35,13 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 		close;
 	}
 	mes "[Old Pharmacist]";
-	mes "Err....Are you a customer...?";
-	switch(select("Make Potion","Talk.","Instruction of making potions","Cancel")) {
+	mes "Ummmm...";
+	mes "What brings you here...?";
+	switch(select("Make Potion","Talk.","Mixing Information","Cancel")) {
 		case 1:
 			next;
 			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 10000) {
+			if ((.@weight) < 5000) {
 				mes "[Old Pharmacist]";
 				mes "Why are you carrying these so many!";
 				mes "Don't be greedy, carry only as much you need!";
@@ -86,14 +88,11 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 									close;
 								}
 								set Zeny,Zeny-(.@max*5);
-								delitem 507,.@max;
-								delitem 508,.@max;
-								delitem 713,.@max;
-								getitem 502,.@max; 
-								mes "[Old Pharmacist]";
-								mes "Here. Take them.";
-								mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-								close;
+								delitem 507,.@max;	// Red_Herb
+								delitem 508,.@max;	// Yellow_Herb
+								delitem 713,.@max;	// Empty_Bottle
+								getitem 502,.@max;	// Orange_Potion
+								break;
 							case 2:
 								next;
 								mes "[Old Pharmacist]";
@@ -119,13 +118,11 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 								}
 								next;
 								set Zeny,Zeny-(.@amount*5);
-								delitem 507,.@amount;
-								delitem 508,.@amount;
-								delitem 713,.@amount;
-								getitem 502,.@amount; 
-								mes "[Old Pharmacist]";
-								mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-								close;
+								delitem 507,.@amount;	// Red_Herb
+								delitem 508,.@amount;	// Yellow_Herb
+								delitem 713,.@amount;	// Empty_Bottle
+								getitem 502,.@amount; 	// Orange_Potion
+								break;
 							case 3:
 								next;
 								mes "[Old Pharmacist]";
@@ -135,6 +132,9 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 								mes "Get lost!";
 								close;
 						}
+							mes "[Old Pharmacist]";
+							mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+							close;
 					case 3:
 						callsub L_making,508,10,503;
 					case 4:
@@ -150,8 +150,8 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 						mes "Bleh!";
 						mes "Get lost!";
 						close;
-					}
 				}
+			}
 		case 2:
 			mes "[Old Pharmacist]";
 			mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
@@ -215,12 +215,9 @@ L_making:
 			}
 			set Zeny,Zeny-(.@max*getarg(1));
 			delitem getarg(0),.@max*2;
-			delitem 713,.@max;
+			delitem 713,.@max;	// Empty_Bottle
 			getitem getarg(2),.@max; 
-			mes "[Old Pharmacist]";
-			mes "Here. Take them.";
-			mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-			close;
+			break;
 		case 2:
 			next;
 			mes "[Old Pharmacist]";
@@ -247,11 +244,9 @@ L_making:
 			next;
 			set Zeny,Zeny-(.@amount*getarg(1));
 			delitem getarg(0),.@amount*2;
-			delitem 713,.@amount;
+			delitem 713,.@amount;	// Empty_Bottle
 			getitem getarg(2),.@amount; 
-			mes "[Old Pharmacist]";
-			mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-			close;
+			break;
 		case 3:
 			next;
 			mes "[Old Pharmacist]";
@@ -261,4 +256,7 @@ L_making:
 			mes "Get lost!";
 			close;
 	}
+		mes "[Old Pharmacist]";
+		mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+		close;
 }
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 4f24dec2b..da36af092 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.3
+//= 2.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -30,6 +30,7 @@
 //= 2.1 Added missing close. [L0ne_W0lf]
 //= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf]
 //= 2.3 Updated heardgear Quest NPCs. [L0ne_W0lf]
+//= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //============================================================ 
 
 
@@ -38,48 +39,38 @@
 //						Doll Quest
 //=======================================================================================================//
 alberta,117,135,0	script	Elin	96,{
-	set .@weight,MaxWeight-Weight;
-	if ((.@weight) < 10000) {
+	if (checkweight(1201,1) == 0) {
 		mes "[Elin]";
-		mes "Wait a moment!!";
-		mes "You have brought too many things!";
-		mes "You cannot accept any more items!";
-		mes "Please reduce the amount of items,";
-		mes "then come see me again";
+		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
 	mes "[Elin]";
 	if (Sex == 1) {
 		mes "Hello~!";
-		mes "Heh heh, you're a boy, so you";
-		mes "probably don't like dolls, right?";
-		mes "Well, I like dolls very very much!";
+		mes "Heh heh, you're a boy, so you probably don't like dolls, right? Well, I like dolls very very much!";
 	} else {
-		mes "Hi hi~! Oh, oh, do you like dolls?";
-		mes "I really really like dolls... Hee";
-		mes "Hee~!";
+		mes "Hi hi~! Oh, oh, do you like dolls? I really really like dolls... Hee Hee~!";
 	}
 	next;
 	mes "[Elin]";
-	mes "You know, I really really want a";
-	mes "new doll! I hope my daddy will give";
-	mes "me one on my birthday...!";
+	mes "You know, I really really want a new doll! I hope my daddy will give me one on my birthday...!";
+	next;
 	switch(select("Um, I hope your daddy gives you one too.","How about I give you one now?")) {
 		case 1:
-			next;
 			mes "[Elin]";
 			mes "Yeah, I'm hoping";
 			mes "he gives me a Yoyo";
 			mes "doll. They're so cute!";
 			close;
 		case 2:
-			next;
 			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 10000) {
+			if ((.@weight) < 1000) {
 				mes "[Elin]";
-				mes "Your weight is too heavy!";
-				mes "I will accept your doll if";
-				mes "you lighten your load.";
+				if (Sex == 1) {
+					mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+				} else {
+					mes "Do you always carry so much with you? Put some of your things away first, okay?";
+				}
 				close;
 			}
 			mes "[Elin]";
@@ -94,20 +85,39 @@ alberta,117,135,0	script	Elin	96,{
 			}
 			next;
 			mes "[Elin]";
-			mes "What kind of doll are you going to";
-			mes "give me? Are you really gonna give";
-			mes "me one?";
-			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Racoon Doll","YoYo Doll","I'm as adorable as a doll.")) {
+			mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+			next;
+			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Raccoon Doll","Yoyo Doll","I'm as adorable as a doll.")) {
 				case 1:
-					next;
 					if (countitem(741) >= 1) {
+						delitem 741,1;	// Poring_Doll
+						mes "[Elin]";
+						mes "Aww...";
+						mes "I have a lot";
+						mes "of Poring dolls...";
+						next;
+						mes "[Elin]";
+						if (Sex == 1) {
+							mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";	
+						} else {
+							mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
+						}
+						next;
 						mes "[Elin]";
-						mes "Yay, it's a poring doll!";
+						mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
+						next;
+						getitem 529,1;	// Candy
+						mes "[Elin]";
+						if (Sex == 1) {
+							mes "I don't know if you're too old to like candy, but I guess it's okay.";
+						} else {
+							mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
+						}
 						next;
-						delitem 741,1;
-						getitem 529,1;
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "Thank you";
+						mes "so much for";
+						mes "the Poring doll!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -116,8 +126,7 @@ alberta,117,135,0	script	Elin	96,{
 							mes "Were you only teasing me?";
 						} else {
 							mes "Aww...";
-							mes "You're not making fun of me are";
-							mes "you?";
+							mes "You're not making fun of me are you?";
 						}
 						next;
 						mes "[Elin]";
@@ -125,100 +134,87 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 2:
-					next;
 					if (countitem(742) >= 1) {
+						delitem 742,1;	// Chonchon_Doll
 						mes "[Elin]";
-						mes "Eh .... Chonchon ... doll ...";
-						next;
-						mes "[Elin]";
-						mes "Oh well, since you're giving it to me, I have to treasure it ....";
+						mes "Agh--!";
+						mes "A Ch-Ch, Chonchon doll?!";
 						next;
-						delitem 742,1;
-						getitem 530,1;
 						mes "[Elin]";
-						mes "If I ate too much of it, I'll get cavities anyway.";
 						if (Sex == 1) {
-							mes "You too, mister.";
+							mes "But since... You're... Such a nice guy... I better take it...!";
 						} else {
-							mes "You too, lady.";
+							mes "But since... Since it's a gift... I guess I'll take it...";
 						}
-						mes "Don't eat too much, ok?";
-						mes "And thanks, by the way ...";
 						next;
 						mes "[Elin]";
-						mes "(Chonchon ... *mumble mumble*)";
+						mes "Mmm~";
+						mes "Let me give you";
+						mes "something in return..."	;
+						next;
+						getitem 530,1;	// Candy_Striper
+						mes "[Elin]";
+						mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
+						next;
+						mes "[Elin]";
+						mes "And..";
+						mes "Uh...";
+						mes "Thank you";
+						mes "for the doll?";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Chonchon dolls are ugly anyways,";
-						mes "but you still lied to me! How can";
-						mes "you be so mean?!";
+						mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
 						next;
 						mes "[Elin]";
-						mes "Waaaaaaaaaaaaaaaaah~~";
+						mes "Waaaaaaaaah~~";
 						close;
 					}
 				case 3:
-					next;
 					if (countitem(740) >= 1) {
+						delitem 740,1;	// Stuffed_Doll
 						mes "[Elin]";
-						mes "Wow--! It's a rabbit!";
-						mes "It's so cute!!";
-						if (Sex == 1) {
-							mes "Thank you so much, mister!";
-						} else {
-							mes "Thank you so much, lady!";
-						}
+						mes "Wow...!";
+						mes "It looks like a bunny!";
 						next;
 						mes "[Elin]";
-						mes "So fluffy~";
-						mes "Oh yeah! Let me give you a present too!";
-						mes "Ummm ... found it!";
-						mes "Take this!";
+						mes "I really like this Puppet~ Heh hehe! Thank you so much~";
 						next;
-						delitem 740,1;
-						getitem 530,1;
 						mes "[Elin]";
-						mes "I got this from Santa. It's a candy cane~";
-						if (Sex == 1) {
-							mes "Eat it too, mister.";
-						} else {
-							mes "Eat it too, lady.";
-						}
-						mes "Thank you for the rabbit doll!";
-						mes "I'm gonna hug this to sleep every night~";
+						mes "Ooh ooh!";
+						mes "I have something";
+						mes "for you too!";
+						mes "Um, where";
+						mes "did it... Ah!";
+						next;
+						getitem 530,1;	// Candy_Striper
+						mes "[Elin]";
+						mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Awww, you were only kidding?";
-						mes "W-W-Why are you teasing me like";
-						mes "that?";
+						mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
 						next;
 						mes "[Elin]";
-						mes "*^CCCCCCSniff...^000000*";
+						mes "^666666*Sniff...*^000000";
 						next;
 						mes "[Elin]";
-						mes "Waaaaaaaaaaaaaaaaah~~";
+						mes "Waaaaaaaaah~~";
 						close;
 					}
 				case 4:
-					next;
 					if (countitem(752) >= 1) {
+						delitem 752,1;	// Grasshopper_Doll
 						mes "[Elin]";
-						mes "Ah, a Rocker doll.";
-						mes "I hate hopping things but the doll's kinda cute.";
+						mes "Ooh! Rocker Doll!";
+						mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
 						next;
 						mes "[Elin]";
-						mes "Thank you~";
-						mes "I'll have to give you something too.";
-						mes "Hmm, didn't I get some stuff from my uncle ...";
+						mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
 						next;
-						delitem 752,1;
-						getitem 532,7;
+						getitem 532,7;	// Banana_Juice
 						mes "[Elin]";
-						mes "We've got tons of them at home.";
-						mes "So I'll share some with you~";
-						mes "Thank you for the doll!";
+						mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -231,30 +227,25 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 5:
-					next;
 					if (countitem(743) >= 1) {
+						delitem 743,1;	// Spore_Doll
 						mes "[Elin]";
-						mes "Blehh ....";
-						mes "It's a mushroom...";
-						mes "Mom's always scolding me for not eating mushrooms ...";
+						mes "It's a mushroom?";
+						mes "Ewwwwwwwww, yucky!";
+						mes "Mommy made me eat";
+						mes "mushrooms today, too...";
 						next;
 						mes "[Elin]";
-						mes "I'll take it anyway, since the doll looks cute.";
-						mes "But I still won't eat mushrooms though ...";
-						mes "Hmm, I'll need to give you a present too.";
+						mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
 						next;
-						delitem 743,1;
-						getitem 538,5;
+						getitem 538,5;	// Well_Baked_Cookie
 						mes "[Elin]";
-						mes "Mom made this.";
-						if (Sex == 1) {
-							mes "Take it, mister!";
-						} else {
-							mes "Take it, lady!";
-						}
+						mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
 						next;
-						mes "[Litte Kid]";
-						mes "Thank you for the doll~";
+						mes "[Elin]";
+						mes "Thanks for";
+						mes "the doll! I'll";
+						mes "take good care of it!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -266,19 +257,31 @@ alberta,117,135,0	script	Elin	96,{
 						mes "Awww...";
 						mes "It's not nice";
 						mes "to tease people";
-						mes "like that. *^CCCCCCSniff, sniff^000000*";
+						mes "like that. ^666666*Sniff, sniff*^000000";
 						close;
 					}
 				case 6:
-					next;
 					if (countitem(751) >= 1) {
+						delitem 751,1;	// Osiris_Doll
+						mes "[Elin]";
+						mes "Ahhhhh!";
+						mes "What is this";
+						mes "thing?! It's so scary!";
+						next;
+						mes "[Elin]";
+						mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
+						next;
 						mes "[Elin]";
-						mes "Yay! It's an Osiris doll!";
+						mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
 						next;
-						delitem 751,1;
-						getitem 522,2;
+						getitem 522,2;	// Fruit_Of_Mastela
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
+						if (Sex == 1) {
+							mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
+						} else {
+							mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
+						}
 						close;
 					} else {
 						mes "[Elin]";
@@ -288,90 +291,82 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 7:
-					next;
 					if (countitem(750) >= 1) {
+						delitem 750,1;	// Baphomet_Doll
+						mes "[Elin]";
+						mes "Huh?";
+						mes "It's a little goat...";
+						next;
+						mes "[Elin]";
+						mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
+						next;
+						getitem 525,5;	// Panacea
 						mes "[Elin]";
-						mes "Yay! It's a Baphomet doll!";
+						mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
 						next;
-						delitem 750,1;
-						getitem 525,5;
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "Hee hee~";
+						mes "Thank you for";
+						mes "the doll. I won't lose it!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "You big liar! Why are you";
-						mes "pretending to be nice?!";
+						mes "You big liar! Why are you pretending to be nice?!";
 						close;
 					}
 				case 8:
-					next;
 					if (countitem(754) >= 1) {
+						delitem 754,1;	// Raccoondog_Doll
 						mes "[Elin]";
-						mes "Ah, it's a racoon doll~";
-						mes "I hate Smokies, but the doll's really cute!";
+						mes "Hehe, it's a";
+						mes "raccoon doll.";
+						mes "It's very very cute~";
 						next;
 						mes "[Elin]";
-						mes "It's really cute~";
-						if (Sex == 1) {
-							mes "Thank you very much, mister!";
-						} else {
-							mes "Thank you very much, lady!";
-						}
+						mes "I don't like";
+						mes "Smokies in real life,";
+						mes "but this doll is nice!";
 						next;
-						delitem 754,1;
-						getitem 539,3;
+						getitem 539,3;	// Piece_Of_Cake
 						mes "[Elin]";
-						mes "Let me give you some of Grandma's home-made cakes!";
-						if (Sex == 1) {
-							mes "Do you like sweet things, mister?";
-						} else {
-							mes "Do you like sweet things, lady?";
-						}
-						mes "This is really good, so eat it~";
+						mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
 						next;
 						mes "[Elin]";
-						mes "Thank you for this cute doll!";
+						mes "Hee hee~";
+						mes "Thanks for the doll.";
+						mes "I'm gonna keep it";
+						mes "in my room!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Hey! How come you have to say";
-						mes "things like that? Are you making";
-						mes "fun of me?!";
+						mes "Hey! How come you have to say things like that? Are you making fun of me?!";
 						close;
 					}
 				case 9:
-					next;
 					if (countitem(753) >= 1) {
+						delitem 753,1;	// Monkey_Doll
 						mes "[Elin]";
-						mes "Wow--!!!";
-						mes "It's a monkey! So cute~";
-						if (Sex == 1) {
-							mes "Thank you very much, mister!";
-						} else {
-							mes "Thank you very much, lady!";
-						}
-						mes "I really wanted it~";
+						mes "Woooooooow~!";
 						next;
 						mes "[Elin]";
-						mes "It's so cute~";
-						mes "That's right!";
-						mes "As a thank you, I'll give you this.";
+						mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
 						next;
-						delitem 753,1;
-						getitem 608,1;
 						mes "[Elin]";
-						mes "Dad picked them up during his travels.";
-						mes "It's a seed of some kind.";
-						mes "We tried planting them at home, but it doesn't seem to grow.";
-						if (Sex == 1) {
-							mes "I'll give it to you, mister!";
-						} else {
-							mes "I'll give it to you, lady!";
-						}
+						mes "Since you gave";
+						mes "me such a pretty doll,";
+						mes "I wanna give you";
+						mes "something, too!";
+						next;
+						getitem 608,1;	// Seed_Of_Yggdrasil
+						mes "[Elin]";
+						mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
 						next;
 						mes "[Elin]";
-						mes "Thank you so much for the doll!";
+						mes "Hehe~";
+						mes "Thanks for";
+						mes "the doll. I'll hug";
+						mes "it before I go";
+						mes "to sleep!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -380,12 +375,11 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 10:
-					next;
 					mes "["+strcharinfo(0)+"]";
 					mes "I'm as adorable as a doll...";
 					next;
 					mes "[Elin]";
-					mes "Whaaaaaaaaaaaaaaaaaaaaat...?";
+					mes "Whaaaaaaaaaaat...?";
 					next;
 					mes "[Elin]";
 					mes "^3355FFWhat did^000000";
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 85619be26..b77afbf7d 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -55,6 +55,8 @@ npc: npc/merchants/elemental_trader.txt
 // See file before enabling, as you may wish to change the
 // point value of items to suit your own needs.
 //npc: npc/merchants/cash_trader.txt
+// Cash Item Hair Styles
+//npc: npc/merchants/cash_hair.txt
 // --------------------------------------------------------------
 // -------------------------- Airport ---------------------------
 npc: npc/airports/airships.txt