* Rather large Kafra update. (May need further testing)

- Updated a good portion of the kafra functions.
- Added proper dialog for most functions.
- Updated guild Kafras and some o f their locations. 
* Updated all Guide NPCs. They are now mostly 100% official.
- Renamed some of the old files to make them look better, IE: yun to juno.
- Added Kunlun and Ayotaya guides.
* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
* Updated Dye Maker and Hair Dyer to official. 

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

47 files changed, 3887 insertions, 3264 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e5875e51d..8f366d5b3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,16 @@
 Date		Added
 ======
-2004/06/22
+2007/06/25
+	* Rev. 10810 Rather large Kafra update. (May need further testing) [L0ne_W0lf]
+	- Updated a good portion of the kafra functions.
+	- Added proper dialog for most functions.
+	- Updated guild Kafras and some o f their locations. 
+	* Updated all Guide NPCs. They are now mostly 100% official.
+	- Renamed some of the old files to make them look better, IE: yun to juno.
+	- Added Kunlun and Ayotaya guides.
+	* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
+	* Updated Dye Maker and Hair Dyer to official. 
+2007/06/22
 	* Fixed some typos to Kiel Hyre and Curse of Gaebolg quest. [SinSloth]
 	* Fixed a bug in Bruspetti quest. [SinSloth]
 2007/06/21
diff --git a/npc/guides/guides_alb.txt b/npc/guides/guides_alb.txt
index f48371e20..c88372a37 100644
--- a/npc/guides/guides_alb.txt
+++ b/npc/guides/guides_alb.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Alberta Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the city of Alberta
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 Fixed Armory coords, thanks to Freya team
@@ -15,97 +16,140 @@
 //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
 //=     to Muad_Dib
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-//North
-alberta,23,238,4	script	Guide::Alb_Guide	105,{
+alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
 	cutin "prt_soldier",2;
 	mes "[Alberta Guide]";
-	mes "Welcome to Alberta, the Port City.";
-	mes "Feel free to ask me if you're having trouble finding anything in town, or if you just need guidance around the city.";
-L_MENU:
-	next;
-	menu "City Guide",L_CITY,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-L_CITY:
-	mes "[Alberta Guide]";
-  	mes "Please select a location from the following menu.";
-  	mes "Would you like me to mark locations on your Mini-Map?";
-  	next;
-  	menu "Yes.",L_YES,"No.",L_NO;
-L_NO:
-  		set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  		set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "^FF0000Merchant Guild^000000",L_MERCHANT,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Inn",L_INN,"Forge",L_FORGE,"Cancel",-;
-	mes "[Alberta Guide]";
- 	mes "Please ask me to Remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
- 	goto L_MENU;
-L_MERCHANT:
-	mes "[Alberta Guide]";
-	mes "The Merchant Guild, handles Job Changes to the Merchant Class, and is located in the southwest corner of Alberta.";
-	viewpoint 1,33,41,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Alberta Guide]";
-	mes "The Weapon Shop can be found in the southern end of Alberta.";
-	viewpoint 1,117,37,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Alberta Guide]";
-	mes "The Tool Shop is kind of close to the center of Alberta. It shouldn't be too hard to find.";
-	viewpoint 1,98,154,3,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_INN:
-	mes "[Alberta Guide]";
-	mes "There's and Inn at the northern end of Alberta where you can rest.";
-	viewpoint 1,65,233,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_FORGE:
-	mes "[Alberta Guide]";
-	mes "The Forge in Alberta is in the same building as the Merchant Guild. It's to the southwest.";
-	viewpoint 1,33,41,5,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_WIPE:
- 		if(@COMPASS_CHECK == 1)goto L_MENU_2;
-		viewpoint 2,33,41,1,0xFF0000;
-		viewpoint 2,117,37,2,0xFF00FF;
-		viewpoint 2,98,154,3,0xFF00FF;
-		viewpoint 2,65,233,4,0xFF00FF;
-		viewpoint 2,33,41,5,0xFF00FF;
-	goto L_MENU_2;
-L_REMOVE:
-		viewpoint 2,33,41,1,0xFF0000;
-		viewpoint 2,117,37,2,0xFF00FF;
-		viewpoint 2,98,154,3,0xFF00FF;
-		viewpoint 2,65,233,4,0xFF00FF;
-		viewpoint 2,33,41,5,0xFF00FF;
-  	goto L_MENU;
-L_NOTICE:
- 	mes "[Alberta Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Alberta Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Alberta Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Alberta.";
- 	goto L_MENU;
-L_END:
- 	mes "[Alberta Guide]";
- 	mes "Be safe when you travel and don't hesitate to ask me if you have any questions about Alberta.";
-	cutin "prt_soldier",255; 
- 	close;
+	mes "Welcome to Alberta,";
+	mes "the Port City. Feel free";
+	mes "to ask me if you're having";
+	mes "trouble finding anything in";
+	mes "town, or if you just need";
+	mes "guidance around the city.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Alberta Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				next;
+				switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) {
+				case 1:
+					mes "[Alberta Guide]";
+					mes "The Merchant Guild";
+					mes "handles Job Changes";
+					mes "to the Merchant Class,";
+					mes "and is located in the";
+					mes "southwest corner";
+					mes "of Alberta.";
+					if (.@compass_check)
+						viewpoint 1,33,41,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Alberta Guide]";
+					mes "The Weapon Shop";
+					mes "can be found in the";
+					mes "southern end of Alberta.";
+					if (.@compass_check)
+						viewpoint 1,117,37,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Alberta Guide]";
+					mes "The Tool Shop";
+					mes "is kind of close";
+					mes "to the center of";
+					mes "Alberta. It shouldn't";
+					mes "be too hard to find.";
+					if (.@compass_check)
+						viewpoint 1,98,154,4,0xFFFF00FF;
+					break;
+				case 4:
+					mes "[Alberta Guide]";
+					mes "There's an Inn";
+					mes "at the northern";
+					mes "end of Alberta";
+					mes "where you can rest.";
+					if (.@compass_check)
+						viewpoint 1,65,233,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Alberta Guide]";
+					mes "The Forge in Alberta";
+					mes "is in the same building";
+					mes "as the Merchant Guild.";
+					mes "It's to the southwest.";
+					if (.@compass_check)
+						viewpoint 1,35,41,6,0xFF00FF;
+					break;
+				case 6:
+					mes "[Alberta Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,2,0xFF0000;
+			viewpoint 2,237,41,3,0xFF00FF;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF00FF;
+			viewpoint 2,175,220,6,0xFF00FF;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Alberta Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Alberta Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Alberta Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Alberta.";
+			break;
+		case 4:
+			mes "[Alberta Guide]";
+			mes "Be safe when you";
+			mes "travel and don't hesitate";
+			mes "to ask me if you have any";
+			mes "questions about Alberta.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "prt_soldier",255;
+	end;
 }
 
-// South --------------------------------------------------------
-alberta,120,60,3	duplicate(Alb_Guide)	Guide#2	105
+alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
\ No newline at end of file
diff --git a/npc/guides/guides_alde.txt b/npc/guides/guides_alde.txt
index cd9bd2afb..8fd200650 100644
--- a/npc/guides/guides_alde.txt
+++ b/npc/guides/guides_alde.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Al De Baran Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
-//=
+//= [Aegis conversion]
+//= Guides for the City of Al De Baran
 //===== Additional Comments: ================================= 
 //= Corrected building locations and descriptions
 //= 1.2 Optimized, updated common guide names [Lupus]
@@ -15,39 +16,92 @@
 //=     to Muad_Dib
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-aldebaran,139,63,4	script	Soldier::Alde_Guide	105,{
+aldebaran,139,63,4	script	Soldier#alde	105,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guard]";
-	mes "I'm just an ordinary guard that you could find in any other city.";
-	mes "I don't think I even have a name...";
+	mes "I'm just an ordinary guard";
+	mes "that you could find in any other city. I don't think I even have a name...";
 	next;
 	mes "[Al De Baran Guard]";
-	mes "I am in charge of the Service Guides from the Al De Baran Garrison.";
-	mes "Let me guide you through our town!";
+	mes "I am in charge of the Service Guides from the Al De Baran Garrison. Let me guide you";
+	mes "through our town!";
 	next;
-	menu "Get location Guide.",-,"End conversation.",L_End;
-		viewpoint 1,57,222,1,0xFF6633;
-		viewpoint 1,73,196,2,0x0000FF;
-		viewpoint 1,224,224,3,0x00FFFF;
-		viewpoint 1,233,106,4,0x515151;
-		viewpoint 1,197,71,5,0x3355FF;
-		viewpoint 1,60,60,6,0xFF5555;
-		mes "^FF6633+^000000 -> Kafra Main Office";
-		mes "^0000FF+^000000 -> Weapon Shop";
+	if (select("Get Location Guide.:End conversation.") == 1) {
+		viewpoint 1,30,210,0,0xFF6633;
+		viewpoint 1,52,180,1,0x0000FF;
+		viewpoint 1,210,210,2,0x00FFFF;
+		viewpoint 1,218,84,3,0x515151;
+		viewpoint 1,178,54,4,0x3355FF;
+		viewpoint 1,36,36,5,0xFF5555;
+		mes "^FF6633+^000000 -> Kafra Main Office ";
+		mes "^0000FF+^000000 -> Weapon Shop ";
 		mes "^00FFFF+^000000 -> Sorcerer Guild (Closed)";
 		mes "^515151+^000000 -> Pub";
 		mes "^3355FF+^000000 -> Item Shop";
-		mes "^FF5555+^000000 -> Chemical Academy";
+		mes "^FF5555+^000000 -> Alchemist Guild";
+		close;
 		cutin "prt_soldier",255;
-	close;
-L_End:
+		end;
+	}
 	mes "[Al De Baran Guard]";
-	mes "We are sworn to protect Al De Baran! May the forces of evil always be crushed by the righteous fist of good!";
-	cutin "prt_soldier",255;
+	mes "We are sworn to protect Al De Baran! May the forces of evil always be crushed by the";
+	mes "righteous fist of good!";
 	close;
+	cutin "prt_soldier",255;
+	end;
 }
 
-aldebaran,241,136,4	duplicate(Alde_Guide)	Soldier#Alde02	105
+aldebaran,133,108,4	script	Soldier#2alde	105,{
+	cutin "prt_soldier",2;
+	mes "[Al De Baran Guard]";
+	mes "I'm just an";
+	mes "ordinary guard,";
+	mes "the kind you can";
+	mes "find in any other city.";
+	next;
+	mes "[Al De Baran Guard]";
+	mes "When I'm not too busy";
+	mes "protecting the Al De Baran";
+	mes "populace, I'm here giving directions to adventurers";
+	mes "like yourself.";
+	next;
+	switch(select("Kafra Main Office :Weapon Shop :Sorcerer Guild :Pub :Item Shop :Alchemist Guild :End Conversation ")) {
+	case 1:
+		viewpoint 1,30,210,0,0xFF66;
+		mes "^FF6633+^000000 -> Kafra Main Office ";
+		break;
+	case 2:
+		viewpoint 1,52,180,1,0x0000FF;
+		mes "^0000FF+^000000 -> Weapon Shop ";
+		break;
+	case 3:
+		viewpoint 1,210,210,2,0x00FFFF;
+		mes "^00FFFF+^000000 -> Sorcerer Guild (Closed)";
+		break;
+	case 4:
+		viewpoint 1,218,84,3,0x515151;
+		mes "^515151+^000000 -> Pub ";
+		break;
+	case 5:
+		viewpoint 1,178,54,4,0x3355FF;
+		mes "^3355FF+^000000 -> Item Shop ";
+		break;
+	case 6:
+		viewpoint 1,36,36,5,0xFF5555;
+		mes "^FF5555+^000000 -> Alchemist Guild";
+		break;
+	case 7:
+		mes "[Al De Baran Guard]";
+		mes "We are sworn to";
+		mes "protect Al De Baran!";
+		mes "May the forces of good";
+		mes "always prevail over evil~";
+		break;
+	}
+	close2;
+	cutin "prt_soldier",255;
+	end;
+}
diff --git a/npc/guides/guides_ama.txt b/npc/guides/guides_ama.txt
index ae262ec78..798148e4a 100644
--- a/npc/guides/guides_ama.txt
+++ b/npc/guides/guides_ama.txt
@@ -1,24 +1,25 @@
 //===== eAthena Script ======================================= 
 //= Amatsu Guides
 //===== By: ================================================== 
-//= MasterOfMuppets
+//= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.3
 //===== Compatible With: ===================================== 
-//=
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for hte City of Amatsu
 //===== Additional Comments: ================================= 
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-amatsu,207,89,3	script	Amatsu Guide#01	758,{
-
+amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	mes "[Amachang]";
 	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
-	mes "and beatiful cherry blossoms.";
+	mes "and beautiful cherry blossoms.";
 	next;
 	mes "[Amachang]";
 	mes "I'm Amachang,";
@@ -28,101 +29,91 @@ amatsu,207,89,3	script	Amatsu Guide#01	758,{
 	mes "Please tell me";
 	mes "if you want to know something.";
 	next;
-	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;
-
-	viewpoint 1,85,235,1,0xFF0044;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^FF0044+^000000";
-	mes "to find the Palace.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Tool:
-	viewpoint 1,96,117,2,0xFF9200;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^FF9200+^000000";
-	mes "to find the Tool Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Weap:
-	viewpoint 1,132,117,3,0x85FF00;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^85FF00+^000000";
-	mes "to find the Weapon Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-
-s_Bar:
-	viewpoint 1,216,116,4,0x3366FF;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^3366FF+^000000";
-	mes "to find the Bar.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	}
 }
-
-amatsu,251,283,4	script	Amatsu Guide#02	767,{
-
+	
+amatsu,251,283,4	script	Guide Man#2ama	767,{
 	mes "[Guide Man]";
-	mes "Welcome, tourist from";
-	mes "Rune-Midgard.";
+	mes "Welcome, tourist from Rune-Midgard.";
 	mes "I'm the guide of";
-	mes "out beautiful town, Amatsu.";
+	mes "our beautiful town, Amatsu.";
 	next;
 	mes "[Guide Man]";
 	mes "What are you looking for?";
 	next;
-	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;
-
-	viewpoint 1,85,235,1,0xFF0044;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^FF0044+^000000";
-	mes "to find the Palace.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Tool:
-	viewpoint 1,96,117,2,0xFF9200;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^FF9200+^000000";
-	mes "to find the Tool Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Weap:
-	viewpoint 1,132,117,3,0x85FF00;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^85FF00+^000000";
-	mes "to find the Weapon Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-
-s_Bar:
-	viewpoint 1,216,116,4,0x3366FF;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^3366FF+^000000";
-	mes "to find the Bar.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	}
 }
diff --git a/npc/guides/guides_ayo.txt b/npc/guides/guides_ayo.txt
new file mode 100644
index 000000000..91839faf3
--- /dev/null
+++ b/npc/guides/guides_ayo.txt
@@ -0,0 +1,111 @@
+//===== eAthena Script ======================================= 

+//= Ayothaya Guides

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

+//= MasterOfMuppets

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

+//= 1.0

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

+//= eAthena SVN

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

+//= [Aegis Conversion]

+//= Guides for the City of Ayotaya

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

+//= 1.0 First version [L0ne_W0lf]

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

+

+ayothaya,203,169,3	script	Noi#ayo	839,{

+	mes "[Noi]";

+	mes "Welcome to Ayotaya.";

+	mes "Our beautiful village is built";

+	mes "above the water, surrounded";

+	mes "by a dense forest.";

+	next;

+	mes "[Noi]";

+	mes "There are many tourist attractions in this village that you won't be able to find anywhere else. Our fish markets and the the unique architecture of our buildings is enough reason to visit Ayotaya.";

+	next;

+	mes "[Noi]";

+	mes "Please feel free";

+	mes "to take a look around.";

+	next;

+	switch(select("Building Locations.:Remove marks from mini-map.:Cancel.")) {

+	case 1:

+		mes "[Noi]";

+		mes "Where would";

+		mes "you like to visit?";

+		next;

+		switch(select("Weapon Shop:Tool Shop:Tavern:Shrine:Fishing Spot:Cancel")) {

+		case 1:

+			mes "[Noi]";

+			mes "At our Weapon Shop,";

+			mes "you will find great weapons";

+			mes "favored by brave Ayotayan seafarers.";

+			next;

+			mes "[Noi]";

+			mes "Our Weapon Shop";

+			mes "is located at ^55FF33+^000000.";

+			viewpoint 1,165,90,2,0x55FF33;

+			close;

+		case 2:

+			mes "[Noi]";

+			mes "We Ayotayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, doesn't it?";

+			next;

+			mes "[Noi]";

+			mes "Our Tool Shop";

+			mes "is located at ^3355FF+^000000.";

+			viewpoint 1,129,86,3,0x3355FF;

+			close;

+		case 3:

+			mes "[Noi]";

+			mes "One of the basics of adventuring is gathering information, or at least that's what they say. You can meet people from all sorts of places in the Tavern. I'm sure you can learn something useful there.";

+			next;

+			mes "[Noi]";

+			mes "Of course, you must";

+			mes "drop by our Tavern.";

+			mes "It is located at ^00FF00+^000000.";

+			viewpoint 1,232,76,4,0x00FF00;

+			close;

+		case 4:

+			mes "[Noi]";

+			mes "If you wish to pray to God, or achieve a state of peace in your mind, why don't you visit our Shrine? Even if it's just for sight-seeing, everyone is";

+			mes "welcome there.";

+			next;

+			mes "[Noi]";

+			mes "Our Shrine";

+			mes "is located at ^00FF00+^000000.";

+			viewpoint 1,208,283,5,0x00FF00;

+			close;

+		case 5:

+			mes "[Noi]";

+			mes "Since Ayothaya was built above the surface of the water and close to a beach, it's been a favorite spot for fishermen. Why don't you catch some fish for dinner at the Fishing Spot?";

+			next;

+			mes "[Noi]";

+			mes "Our famous";

+			mes "Fishing Spot";

+			mes "is located at ^00FF00+^000000";

+			viewpoint 1,253,99,6,0x00FF00;

+			close;

+		case 6:

+			mes "[Noi]";

+			mes "If you wish to remove location marks on your mini-map, please select the 'Remove marks from mini-map' command from the menu.";

+			close;

+		}

+	case 2:

+		viewpoint 2,165,90,2,0x55FF33;

+		viewpoint 2,129,86,3,0x3355FF;

+		viewpoint 2,232,76,4,0x00FF00;

+		viewpoint 2,208,283,5,0x00FF00;

+		viewpoint 2,253,99,6,0x00FF00;

+		mes "[Noi]";

+		mes "Alright...";

+		mes "I've removed all the";

+		mes "location marks from";

+		mes "your mini-map.";

+		mes "Thank you.";

+		close;

+	case 3:

+		mes "[Noi]";

+		mes "Please enjoy";

+		mes "your travels.";

+		close;

+	}

+}

diff --git a/npc/guides/guides_cmd.txt b/npc/guides/guides_cmd.txt
new file mode 100644
index 000000000..5fe4c1d6f
--- /dev/null
+++ b/npc/guides/guides_cmd.txt
@@ -0,0 +1,127 @@
+//===== eAthena Script ======================================= 
+//= Comodo Guides
+//===== By: ================================================== 
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.5
+//===== Compatible With: ===================================== 
+//= eAthena  SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Guides for the City of Comodo
+//===== Additional Comments: ================================= 
+//= Fully working v1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks
+//=	to Muad_Dib [MasterOfMuppets]
+//= 1.4	Removed 3 guides, and converted to use functions.
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	700,{
+	callfunc "F_CmdGuide","Native Kokomo";
+}
+
+comodo,176,350,4	script	Comodo Guide#2cmd	700,{
+	callfunc "F_CmdGuide","Native Nutcoco";
+}
+
+comodo,37,219,4	script	Guide#2cmd	700,{
+	callfunc "F_CmdGuide","Native Papaya";
+}
+
+function	script	F_CmdGuide	{
+	mes "["+getarg(0)+"]";
+	mes "Welcome to Comodo, the";
+	mes "city of dreams and fantasy,";
+	mes "where the nightlife never ends!";
+	mes "I know this area really well,";
+	mes "so let me know if you need";
+	mes "directions anywhere here.";
+	next;
+	switch(select("Casino:Hula Dance Stage ^3355FF(Dancer Job Change)^000000:Weapon and Armor Shop:Tool Shop:Tourist Shop:Kafra Co. Western Branch:Chief's House:Pub:Campground:End Conversation")) {
+	case 1:
+		viewpoint 1,140,98,0,0xFF6633;
+		mes "Please refer to the cross mark,";
+		mes "^FF6633+^000000, on your Mini-Map to find the";
+		mes "Casino, a haven for rest for";
+		mes "weary travlers and the heart";
+		mes "of Comodo's nightlife.";
+		close;
+	case 2:
+		viewpoint 1,188,168,1,0x0000FF;
+		mes "Please refer to the cross mark,";
+		mes "^0000FF+^000000, on your Mini-Map to find the";
+		mes "Hula Dance Stage, the place";
+		mes "where female Archers can";
+		mes "change jobs to Dancers.";
+		close;
+	case 3:
+		viewpoint 1,266,70,2,0x00FFFF;
+		mes "Please refer to the cross mark,";
+		mes "^00FFFF+^000000, on your Mini-Map to find the";
+		mes "Weapon and Armor shop. Be";
+		mes "sure to check that shop for";
+		mes "any special items that are";
+		mes "unique to Comodo!";
+		close;
+	case 4:
+		viewpoint 1,86,128,3,0x515151;
+		mes "Please refer to the cross mark,";
+		mes "^515151+^000000, on your Mini-Map to find the";
+		mes "Tool Shop. If you've never been";
+		mes "there before, then I suggest";
+		mes "you check it out and stock up";
+		mes "on tools you might need later.";
+		close;
+	case 5:
+		viewpoint 1,298,124,4,0x3355FF;
+		mes "Please refer to the cross mark,";
+		mes "^3355FF+^000000, on your Mini-Map to find the";
+		mes "Tourist Shop where you can ";
+		mes "buy gifts that can only be found^FFFFFF ^000000 in the Comodo region~";
+		close;
+	case 6:
+		viewpoint 1,136,202,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Western branch of the Kafra";
+		mes "Corporation. They offer some";
+		mes "pretty important services that^FFFFFF ^000000 you may want to check out later.";
+		close;
+	case 7:
+		viewpoint 1,114,294,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Chief's House. You're welcome";
+		mes "to visit him, and he's usually";
+		mes "happy to have visitors.";
+		close;
+	case 8:
+		viewpoint 1,166,298,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Pub. There, you can meet other";
+		mes "tourists, relax, and socialize";
+		mes "in an enjoyable environment~";
+		close;
+	case 9:
+		viewpoint 1,210,308,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Campground. Gather with your";
+		mes "family and friends, and enjoy";
+		mes "the special barbeque of";
+		mes "Comodo's camping grounds~";
+		close;
+	case 10:
+		mes "["+getarg(0)+"]";
+		mes "Actually, it always looks";
+		mes "like nighttime in Comodo";
+		mes "because it's built in a huge";
+		mes "cave. We don't get any sunlight";
+		mes "here, but the darkness here is";
+		mes "more exciting than gloomy~";
+		close;
+	}
+}
diff --git a/npc/guides/guides_com.txt b/npc/guides/guides_com.txt
deleted file mode 100644
index 31f683d26..000000000
--- a/npc/guides/guides_com.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Comodo Guides
-//===== By: ================================================== 
-//= kobra_k88
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
-//= Fully working v1.1 Now using duplicate command.
-//= 1.2 Optimized, updated common guide names [Lupus]
-//= 1.3 Updated the guide according to how it is on iRO, thanks
-//=	to Muad_Dib [MasterOfMuppets]
-//= 1.4	Removed 3 guides, and converted to use functions.
-//============================================================
-
-comodo,322,178,4	script	Comodo Guide#1	700,{
-	set @name$,"Native Kokomo";
-	callfunc "comodo_guide";
-	end;
-}
-comodo,176,350,4	script	Comodo Guide#2	700,{
-	set @name$,"Native Cocomo";
-	callfunc "comodo_guide";
-	end;
-}
-comodo,37,219,4	script	Comodo Guide#3	700,{
-	set @name$,"Native Papaya";
-	callfunc "comodo_guide";
-	end;
-}
-
-function	script	comodo_guide	{
-	mes "[" + @name$ + "]";
-	mes "The night of pleasure continues for 24 hours";
-	mes "Welcome to Comodo, the gambling city.";
-	mes "I can help you to find buildings easily, feel free to ask me anytime.";
-	mes "Please choose the building you're searching:";
-	next;
-	menu "Casino",L_MENU_1,"Hula dancing Stage^3355FF(Dancer Job Change)^000000",L_MENU_2,"Weapon and Armor Shop",L_MENU_3,"Tool Shop",L_MENU_4,"Tourist Shop",L_MENU_5,"Kapra Corp. Western Branch",L_MENU_6,"Chief's House",L_MENU_7,"Pub",L_MENU_8,"Camp Ground",L_MENU_9,"End conversation",L_MENU_10;
-L_MENU_1:
-	mes "[" + @name$ + "]";
-	viewpoint 1,140,98,1,0xFF6633;
-	mes "^FF6633+^000000 -> Casino";
-	mes "The casino is an important part of Comodo.";
-	mes "The Comodo Casino provides endless entertainment for travelers from all over the world";
-	close;
-L_MENU_2:
-	mes "[" + @name$ + "]";
-	viewpoint 1,188,168,2,0x0000FF;
-	mes "^0000FF+^000000 -> Hula dancing Stage";
-	mes "Check out the stage located center of town.";
-	mes "If you really enjoy the atmosphere of the stage, you should consider about becoming a dancer. ^3355FF(Dancer Job Change)^000000";
-	close;
-L_MENU_3:
-	mes "[" + @name$ + "]";
-	viewpoint 1,266,70,3,0x00FFFF;
-	mes "^00FFFF+^000000 -> Weapon and Armor Shop";
-	mes "The Weapon and Armor Shop is located south-east edge of town.";
-	close;
-L_MENU_4:
-	mes "[" + @name$ + "]";
-	viewpoint 1,86,128,4,0x515151;
-	mes "^515151+^000000 -> Tool Shop";
-	mes "The Kit shop is located south-west of town.";
-	close;
-L_MENU_5:
-	mes "[" + @name$ + "]";
-	viewpoint 1,298,124,5,0x3355FF;
-	mes "^3355FF+^000000 -> Tourist Shop";
-	mes "You should visit the Tourist shop for some rare seashell found only at the shores of Comodo.";
-	close;
-L_MENU_6:
-	mes "[" + @name$ + "]";
-	viewpoint 1,136,202,6,0xFF5555;
-	mes "^FF5555+^000000 -> Kapra Corp. Western Branch";
-	mes "Yep, the Kapra's Corp will stay with you wherever you go, even here in Comodo!";
-	mes "You could find the Kapras near the center of town.";
-	close;
-L_MENU_7:
-	mes "[" + @name$ + "]";
-	viewpoint 1,114,294,7,0xFF5555;
-	mes "^FF5555+^000000 -> Chief's House";
-	mes "Well, that's obviously where the chief resides.";
-	mes "You should pay a visit to him once in a while, he's a great man when you get to know him.";
-	close;
-L_MENU_8:
-	mes "[" + @name$ + "]";
-	viewpoint 1,166,298,8,0xFF5555;
-	mes "^FF5555+^000000 -> Pub";
-	mes "The pub is the place for all sort of information.";
-	mes "The pub is also a place filled with great cultural values for Comodo.";
-	close;
-L_MENU_9:
-	mes "[" + @name$ + "]";
-	viewpoint 1,210,308,9,0xFF5555;
-	mes "^FF5555+^000000 -> Camp Ground";
-	mes "The Camp Ground is simply a great place to hang out with your familty or companions.";
-	mes "Sit around the camp fire and enjoy the wonderful tropical weather and surroundings of Comodo!";
-	close;
-L_MENU_10:
-	mes "[" + @name$ + "]";
-	mes "Well, I guess I will be seeing you around then.";
-	mes "Take care, and enjoy your stay.";
-	close;
-}
diff --git a/npc/guides/guides_einbe.txt b/npc/guides/guides_einbe.txt
index d53e05675..c5ba272bb 100644
--- a/npc/guides/guides_einbe.txt
+++ b/npc/guides/guides_einbe.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Einbech Guides
 //===== By: ================================================== 
-//= Muad_dib
+//= Muad_dib; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4a
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the City of Einbroch
 //===== Additional Comments: ================================= 
 //= 1.0 Einbech guide by Muad_dib in prometheus format
 //= 1.0a Conversion to eA format [MasterOfMuppets]
@@ -16,105 +17,149 @@
 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4 Removed Duplicates [Silent]
 //= 1.4a missing tabs [KarLaeda]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
-einbech,67,37,4	script	Guide#1::Einbech_Guide	852,{
-	cutin "ein_soldier",2;
-	mes "[Einbech Guide]";
-	mes "Welcome to Einbech, the Mining Town.";
-	mes "We're here to assist tourists, so if you have any questions, please feel free to ask us.";
-L_MENU:
-	next;
-	menu "City Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Einbech Guide]";
-	mes "Please select a location from the following menu.";
-	mes "Would you like me to mark locations on your Mini-Map?";
-	next;
-	menu "Yes.",L_YES,"No.",-;
 
-	set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-	set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "Train Station",L_TRAIN,"Tavern",L_TAVERN,"Tool Shop",L_TOOL,"Swordman Guild",L_SWORD,"Mine",L_MINE,"Cancel",-;
-
-	mes "[Einbech Guide]";
-	mes "Please ask me to Remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
-	goto L_MENU;
-L_TRAIN:
-	mes "[Einbech Guide]";
-	mes "The Train Stations are located in the nortwest and northeast parts of Einbech.";
-	mes "There, you can take a train to Einbroch. They are running between here and Einbroch all day long, everyday.";
-	viewpoint 1,44,216,1,0xFF0000;
-	next;
-	goto L_WIPE;
-L_TAVERN:
-	mes "[Einbech Guide]";
-	mes "The Tavern is located in the southern part of Einbech.";
-	mes "It's a nice place to relax after a long day.";
-	viewpoint 1,145,112,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Einbech Guide]";
-	mes "You can find the Tool Shop in the center of Einbech.";
-	mes "There, you can purchase any tools you might need for your travels.";
-	viewpoint 1,177,135,3,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_SWORD:
-	mes "[Einbech Guide]";
-	mes "The Swordman Guild is located in the eastern outskirts of Einbech.";
-	mes "It's under construction and they haven't started accepting applications.";
-	viewpoint 1,253,109,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_MINE:
-	mes "[Einbech Guide]";
-	mes "The Mine, which is Einbech's major industry, is located in the northern part of this town.";
-	mes "It's where we get all of our ores, although monsters get in the mines way.";
-	viewpoint 1,138,250,5,0x00FF00;
-	next;
-	goto L_WIPE; 
-L_WIPE:
-	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,44,216,1,0xFF0000;
-	viewpoint 2,145,112,2,0xFF00FF;
-	viewpoint 2,177,135,3,0xFF00FF;
-	viewpoint 2,253,109,4,0xFF00FF;
-	viewpoint 2,138,250,5,0x00FF00;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,44,216,1,0xFF0000;
-	viewpoint 2,145,112,2,0xFF00FF;
-	viewpoint 2,177,135,3,0xFF00FF;
-	viewpoint 2,253,109,4,0xFF00FF;
-	viewpoint 2,138,250,5,0x00FF00;
-	mes "[Einbech Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Einbroch please let me or one of the other Einbech Guides know.";
-	goto L_MENU;
-L_NOTICE:
-	mes "[Einbech Guide]";
-	mes "Through the technology of the Schwarzwald Republic, we've upgraded to a digital information system that allows us to mark locations on your Mini-Map for easier navigation.";
-	next;
-  	mes "[Einbech Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Einbech Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Einbech.";
- 	goto L_MENU;
-L_END:
+einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
+	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
-	mes "We hope that you";
-	mes "enjoy your travels";
-	mes "here in Einbech.";
-	cutin "ein_soldier",255; 
-	close;
+	mes "Welcome to Einbech,";
+	mes "the Mining Town. We're";
+	mes "here to assist tourists,";
+	mes "so if you have any questions,";
+	mes "please feel free to ask us.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) {
+		case 1:
+			mes "[Einbech Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("Train Station:Tavern:Tool Shop:Swordman Guild:Mine:Cancel")) {
+				case 1:
+					mes "[Einbech Guide]";
+					mes "The Train Stations are";
+					mes "located in the northwest";
+					mes "and northeast parts of";
+					mes "Einbech. There, you can";
+					mes "take a train to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,43,213,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Einbech Guide]";
+					mes "The Tavern is located";
+					mes "in the southern part of";
+					mes "Einbech. It's a nice place";
+					mes "to relax after a long day.";
+					if (.@compass_check)
+						viewpoint 1,142,112,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Einbech Guide]";
+					mes "You can find the Tool";
+					mes "Shop in the center of";
+					mes "Einbech. There, you can";
+					mes "purchase any tools you";
+					mes "might need for your travels.";
+					if (.@compass_check)
+						viewpoint 1,176,136,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Einbech Guide]";
+					mes "The Swordman Guild";
+					mes "is located in the eastern";
+					mes "outskirts of Einbech. It's";
+					mes "under construction and they";
+					mes "haven't started accepting";
+					mes "applications.";
+					if (.@compass_check)
+						viewpoint 1,250,110,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Einbech Guide]";
+					mes "The Mine, which is";
+					mes "Einbech's major industry,";
+					mes "is located in the northern";
+					mes "part of this town. It's where";
+					mes "we get all our ores, although monsters get in the miners' way.";
+					if (.@compass_check)
+						viewpoint 1,138,251,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Einbech Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,43,213,2,0xFF0000;
+			viewpoint 2,142,112,3,0xFF00FF;
+			viewpoint 2,176,136,4,0xFF00FF;
+			viewpoint 2,250,110,5,0xFF00FF;
+			viewpoint 2,138,251,6,0x00FF00;
+			set .@compass_check,0;
+			mes "[Einbech Guide]";
+			mes "Okay, the marks from";
+			mes "your Mini-Map have been";
+			mes "removed. If you need any";
+			mes "guidance around Einbech,";
+			mes "please let me or one of the";
+			mes "other Einbech Guides know.";
+			break;
+		case 3:
+			mes "[Einbech Guide]";
+			mes "Through the technology of";
+			mes "the Schwaltzvalt Republic,";
+			mes "we've upgraded to a digital";
+			mes "information system that allows";
+			mes "us to mark locations on your";
+			mes "Mini-Map for easier navigation.";
+			next;
+			mes "[Einbech Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Einbech Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Einbech, adventurer.";
+			break;
+		case 4:
+			mes "[Einbech Guide]";
+			mes "We hope that you";
+			mes "enjoy your travels";
+			mes "here in Einbech.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-einbech,48,214,4	duplicate(Einbech_Guide)	Guide#Ein2	852
+einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	852
diff --git a/npc/guides/guides_einbr.txt b/npc/guides/guides_einbr.txt
index 9e5526318..68870040b 100644
--- a/npc/guides/guides_einbr.txt
+++ b/npc/guides/guides_einbr.txt
@@ -1,168 +1,208 @@
 //===== eAthena Script ======================================= 
 //= Einbroch Guides
 //===== By: ================================================== 
-//= Reddozen
+//= Muad_dib; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the City of Einbroch
 //===== Additional Comments: ================================= 
 //= 1.0b missing tabs, fixed Guide coords [Lupus]
 //= 1.1 added 1 more Guide NPC, thanx to Justin84 [Lupus]
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4 Removed Duplicates [Silent]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-einbroch,72,202,4	script	Guide#1::Einbroch_Guide	852,{
+einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
 	cutin "ein_soldier",2;
 	mes "[Einbroch Guide]";
-	mes "Welcome to Einbroch, the City of Steel.";
-	mes "Please ask me if you have any questions";
-
-M_Menu:
-	next;
-	menu "City Guide",-, "Remove Marks from Mini-Map",M_2, "Notice",L_NOTICE, "Cancel",M_End;
-
-	mes "[Einbroch Guide]";
-	mes "Please select a location from the following menu.";
-	mes "Would you like me to mark locations on your Mini-Map";
-	next;
-	menu "No Thanks",-,"Yes Please",sM_1b;
-	
-	set @COMPASS_CHECK,0;
-	goto L_Cont;
-
-	sM_1b:
-	set @COMPASS_CHECK,1;
-
-	L_Cont:
-sM_Menu:
-	menu "^FF0000Airport^000000",-,"Train Station",sM_2b,"Factory",sM_2c,"Plaza",sM_2d,
-	"Hotel",sM_2e,"Weapon Shop",sM_2f,"Laboratory",sM_2g,"Blacksmith Guild",sM_2h,
-	"Einbroch Tower",sM_2i,"Cancel",SM_2j;
-
-	mes "[Einbroch Guide]";
-	mes "The ^FF0000Airport^000000 is is located in the northwestern part of the city.";
-	mes "There you can see our city's pride and joy, the Airship.";
-	mes "Remember that you must pay admission to board the Airship.";
-	viewpoint 1,63,208,1,0xFF0000;
-	next;
-	goto sL_Wipe;
-	sM_2b:
-	mes "[Einbroch Guide]";
-	mes "The Train Station is located in the northeast part of Einbroch.";
-	mes "Trains are running between here and Einbech all day long, everyday.";
-	viewpoint 1,238,272,2,0x0000FF;
-	next;
-	goto sL_Wipe;
-sM_2c:
-	mes "[Einbroch Guide]";
-	mes "The Factory, perhaps the most important facility in Einbroch, is located in the southern part of the city.";
-	viewpoint 1,149,80,3,0x00FF00;
-	next;
-	goto sL_Wipe;
-sM_2d:
-	mes "[Einbroch Guide]";
-	mes "The Plaza, our biggest shopping district, can be found just east from the center of Einbroch";
-	viewpoint 1,231,189,4,0xFF00FF;
-	next;
-	goto sL_Wipe;
-sM_2e:
-	mes "[Einbroch Guide]";
-	mes "The Hotel is east of the Plaza and offers top caliber accomodations.";
-	mes "There, you can enjoy your stay in Einbroch in comfort~";
-	viewpoint 1,257,200,5,0x00AAFF;
-	next;
-	goto sL_Wipe;
-sM_2f:
-	mes "[Einbroch Guide]";
-	mes "The Weapon Shop is located north from the Plaza.";
-	mes "There you can purchase weapons for your personal use.";
-	viewpoint 1,217,212,6,0xDDAA00;
-	next;
-	goto sL_Wipe;
-sM_2g:
-	mes "[Einbroch Guide]";
-	mes "The Laboratory is an annex of the factory and is located in the southwest sector of Einbech";
-	viewpoint 1,43,45,7,0xDDAA00;
-	next;
-	goto sL_Wipe;
-sM_2h:
-	mes "[Einbroch Guide]";
-	mes "The Blacksmith Guild is located in the southeast part of Einbroch.";
-	mes "You can upgrade your equipment by using their services.";
-	viewpoint 1,255,105,8,0xDDAA00;
-	next;
-	goto sL_Wipe;
-sM_2i:
-	mes "[Einbroch Guide]";
-	mes "The Einbroch Tower is located in the center of the city.";
-	mes "From the top of the tower, you can view all of Einbroch.";
-	viewpoint 1,173,195,9,0xDDAA00;
-	next;
-	goto sL_Wipe;
-
-SM_2j:
-	mes "[Einbroch Guide]";
-	mes "Please ask me to Remove";
-	mes "Marks from Mini-Map if you";
-	mes "no longer wish to have the";
-	mes "location marks displayed";
-	mes "on your Mini-Map.";
-	goto M_Menu;
-
-sL_Wipe:
-	if(@COMPASS_CHECK == 1) goto sM_Menu;
-	viewpoint 2,63,208,1,0xFF0000;
-	viewpoint 2,238,272,2,0x0000FF;
-	viewpoint 2,149,80,3,0x00FF00;
-	viewpoint 2,231,189,4,0xFF00FF;
-	viewpoint 2,257,200,5,0x00AAFF;
-	viewpoint 2,217,212,6,0xDDAA00;
-	viewpoint 2,43,45,7,0xDDAA00;
-	viewpoint 2,255,105,8,0xDDAA00;
-	viewpoint 2,173,195,9,0xDDAA00;
-	if (@COMPASS_CHECK == 0) goto sM_Menu;
-
-M_2:
-	viewpoint 2,63,208,1,0xFF0000;
-	viewpoint 2,238,272,2,0x0000FF;
-	viewpoint 2,149,80,3,0x00FF00;
-	viewpoint 2,231,189,4,0xFF00FF;
-	viewpoint 2,257,200,5,0x00AAFF;
-	viewpoint 2,217,212,6,0xDDAA00;
-	viewpoint 2,43,45,7,0xDDAA00;
-	viewpoint 2,255,105,8,0xDDAA00;
-	viewpoint 2,173,195,9,0xDDAA00;
-	mes "[Einbroch Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Einbroch, please let me or one of the other Einbroch Guides know.";
+	mes "Welcome";
+	mes "to Einbroch,";
+	mes "the City of Steel.";
+	mes "Please ask me if you";
+	mes "have any questions.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) {
+		case 1:
+			mes "[Einbroch Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Airport^000000:Train Station:Factory:Plaza:Hotel:Weapon Shop:Laboratory:Blacksmith Guild:Einbroch Tower:Cancel")) {
+				case 1:
+					mes "[Einbroch Guide]";
+					mes "The ^FF0000Airport^000000 is located";
+					mes "in the northwestern part";
+					mes "of the city. There you can";
+					mes "see our city's pride and joy, the Airship. Remember that you must pay admission to board the Airship.";
+					if (.@compass_check)
+						viewpoint 1,63,228,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Einbroch Guide]";
+					mes "The Train Station is";
+					mes "located in the northeast";
+					mes "part of Einbroch. Trains";
+					mes "running between here";
+					mes "and Einbech run all day";
+					mes "long, everyday.";
+					if (.@compass_check)
+						viewpoint 1,236,279,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Einbroch Guide]";
+					mes "The Factory, perhaps the";
+					mes "most important facility in";
+					mes "Einbroch, is located in the";
+					mes "southern part of the city.";
+					if (.@compass_check)
+						viewpoint 1,158,78,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Einbroch Guide]";
+					mes "The Plaza, our biggest";
+					mes "shopping district, can be";
+					mes "found just east from the";
+					mes "center of Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,232,190,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Einbroch Guide]";
+					mes "The Hotel is east of";
+					mes "the Plaza and offers top";
+					mes "caliber accomodations.";
+					mes "There, you can enjoy your";
+					mes "stay in Einbroch in comfort~";
+					if (.@compass_check)
+						viewpoint 1,260,201,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Einbroch Guide]";
+					mes "The Weapon Shop is";
+					mes "located north from the";
+					mes "Plaza. There you can";
+					mes "purchase weapons for";
+					mes "your personal use.";
+					if (.@compass_check)
+						viewpoint 1,215,221,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Einbroch Guide]";
+					mes "The Laboratory is an";
+					mes "annex of the Factory and";
+					mes "is located in the southwest";
+					mes "sector of Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,36,49,8,0x00FF;
+					break;
+				case 8:
+					mes "[Einbroch Guide]";
+					mes "The Blacksmith Guild is";
+					mes "located in the southeast";
+					mes "part of Einbroch. You can";
+					mes "upgrade your equipment";
+					mes "by using their services.";
+					if (.@compass_check)
+						viewpoint 1,244,90,9,0x00FF00;
+					break;
+				case 9:
+					mes "[Einbroch Guide]";
+					mes "The Einbroch Tower is";
+					mes "located in the center of";
+					mes "the city. From the top of";
+					mes "the tower, you can view";
+					mes "all of Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,174,195,10,0xFFFF00;
+					break;
+				case 10:
+					mes "[Einbroch Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,63,228,2,0xFF0000;
+			viewpoint 2,236,279,3,0xFF00FF;
+			viewpoint 2,158,78,4,0xFF00FF;
+			viewpoint 2,232,190,5,0xFF00FF;
+			viewpoint 2,260,201,6,0x00FF00;
+			viewpoint 2,215,221,7,0x00FF00;
+			viewpoint 2,36,49,8,0x00FF00;
+			viewpoint 2,244,90,9,0x00FF00;
+			viewpoint 2,174,195,10,0xFFFF00;
+			set .@compass_check,0;
+			mes "[Einbroch Guide]";
+			mes "Okay, the marks from";
+			mes "your Mini-Map have been";
+			mes "removed. If you need any";
+			mes "guidance around Einbroch,";
+			mes "please let me or one of the";
+			mes "other Einbroch Guides know.";
+			break;
+		case 3:
+			mes "[Einbroch Guide]";
+			mes "Through the technology of";
+			mes "the Schwaltzvalt Republic,";
+			mes "we've upgraded to a digital";
+			mes "information system that allows";
+			mes "us to mark locations on your";
+			mes "Mini-Map for easier navigation.";
+			next;
+			mes "[Einbroch Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Einbroch Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Einbroch, adventurer.";
+			break;
+		case 4:
+			mes "[Einbroch Guide]";
+			mes "We hope that you";
+			mes "enjoy your travels";
+			mes "here in Einbroch.";
+			mes "Oh, and please be";
+			mes "aware of the Smog Alerts.";
+			close2;
+			set .@loop1,0;
+		}
+	}
 	cutin "ein_soldier",255;
-	goto M_Menu;
-
-L_NOTICE:
-	mes "[Einbroch Guide]";
-	mes "Through the technology of the Schwarzwald Republic, we've upgraded to a digital information system that allows us to mark locations on your Mini-Map for easier navigation.";
-	next;
-  	mes "[Einbroch Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Einbroch Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Einbroch.";
- 	goto M_Menu;
-
-M_End:
-	mes "[Einbroch Guide]";
-	mes "We hope that you enjoy your travels here in Einbroch. Oh, and please be aware of the Smog Alerts";
-	cutin "ein_soldier",255;
-	close;
+	end;
 }
 
-einbroch,155,43,4	duplicate(Einbroch_Guide)	Guide#Einb2	852
-einbroch,162,317,4	duplicate(Einbroch_Guide)	Guide#Einb3	852
+einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	852
+
+einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	852
diff --git a/npc/guides/guides_gef.txt b/npc/guides/guides_gef.txt
index 6a1dc1d78..68cf803f4 100644
--- a/npc/guides/guides_gef.txt
+++ b/npc/guides/guides_gef.txt
@@ -1,130 +1,168 @@
 //===== eAthena Script ======================================= 
 //= Geffen Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis COnversion]
+//= Guides for hte City of Geffen
 //===== Additional Comments: ================================= 
 //= Fully working.  Added a guide at every exit.
 //= v1.1 Now using duplicate command.
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.2a Small note that the BS guild moved to Einbroch [Poki#3]
 //= 1.3 Removed Duplicates [Silent]
+//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-// North --------------------------------------------
-geffen,123,202,5	script	Guide#1::Gef_Guide	705,{
+geffen,203,116,0	script	Guide#gef::GefGuide	705,{
 	cutin "gef_soldier",2;
-	mes "[Geffen Soldier]";
-	mes "Welcome to Geffen, the City of Magic.";
-	next;
-	mes "[Geffen Soldier]";
-	mes "We are here to help you find your way.  Please feel free to speak to us anytime you need help.";
-M_Menu:
-	next;
-	menu "View Buildings",-, "Notice",M_2, "Cancel",M_End;
-
-		mes "[Geffen Soldier]";
-		mes "Do you want me to leave indications on the Mini-Map?";
-		next;
-		menu "No Thanks",-,"Yes Please",sM_1b;
-		
-			set @COMPASS_CHECK,0;
-			goto L_Cont;
-
-		sM_1b:
-			set @COMPASS_CHECK,1;
-
-		L_Cont:
-		mes "[Geffen Soldier]";
-		mes "Please choose a building to view.";
+	mes "[Geffen Guide]";
+	mes "Welcome to Geffen,";
+	mes "the City of Magic. If you";
+	mes "need any guidance around";
+	mes "the city, feel free to ask me";
+	mes "and I'll do my best to assist you. ^FFFFFFcobo^000000";
+	set .@loop1,1;
+	while (.@loop1) {
 		next;
-	sM_Menu:
-		menu "^FF0000Magic Acadamy^000000",-, "^00A500Blacksmith Workshop^000000",M_1_2, "^4444FFGeffen Tower^000000",M_1_3,
-			"Armory",M_1_4, "Item Shop",M_1_5, "Pub",M_1_6, "Inn",M_1_7, "Wipe all indications from mini-map",M_1_8, "Cancel", M_End;
-
-			mes "[Geffen Soldier]";
-			mes "'The 'Magic Acadamy' is the home of magical theorists, and the place for would be Mages.";
-			viewpoint 1,61,180,1,0xFF5555;
-			goto sL_Wipe;
-		M_1_2:
-			mes "[Geffen Soldier]";
-			mes "The 'Blacksmith Workshop' is SouthEast of Geffen Tower.";
-			mes "Please note that the Blacksmith training has bean moved to Einbroch.";
-			viewpoint 1,182,59,2,0x44FF44;
-			goto sL_Wipe;
-		M_1_3:
-			mes "[Geffen Soldier]";
-			mes "The lower levels of 'Geffen Tower' are spawning grounds for monsters.  People go there to train.";
-			mes "The top floor of the Tower is home to the ^0000FF'Wizard's Guild'^000000.  Mages can go there to become Wizards.";
-			viewpoint 1,120,120,3,0x5555FF;
-			goto sL_Wipe;
-		M_1_4:
-			mes "[Geffen Soldier]";
-			mes "Head over to the 'Armory' to equip yourself with a variety of weapons and armor.";
-			viewpoint 1,99,140,4,0xFF00FF;
-			goto sL_Wipe;
-		M_1_5:
-			mes "[Geffen Soldier]";
-			mes "The 'Item Shop' is the place to go when you need to stock up on things like potions and fly-wings.";
-			viewpoint 1,44,86,5,0xFF00FF;
-			goto sL_Wipe;
-		M_1_6:
-			mes "[Geffen Soldier]";
-			mes "The 'Pub' is a great place to meet people and have fun.";
-			viewpoint 1,138,138,6,0xF0C40F;
-			goto sL_Wipe;
-		M_1_7:
-			mes "[Geffen Soldier]";
-			mes "The 'Inn' is a good place to rest and replenish your hp and sp.";
-			viewpoint 1,172,174,7,0xFF8000;
-			goto sL_Wipe;
-		M_1_8:
-			set @COMPASS_CHECK, 2;
-
-		sL_Wipe:
-			if(@COMPASS_CHECK != 2) next;	// avoids a double 'next' when 'wipe indications' is chosen
-			if(@COMPASS_CHECK == 1) goto sM_Menu;
-			viewpoint 2,61,180,1,0xFF5555;
-			viewpoint 2,182,59,2,0x44FF44;
-			viewpoint 2,120,120,3,0x5555FF;
-			viewpoint 2,99,140,4,0xFF00FF;
-			viewpoint 2,44,86,5,0xFF00FF;
-			viewpoint 2,138,138,6,0xF0C40F;
-			viewpoint 2,172,174,7,0xFF8000;
-			if (@COMPASS_CHECK == 0) goto sM_Menu;
-			mes "[Geffen Soldier]";
-			mes "All indications have been removed";
-			cutin "gef_soldier",255;
-			close;
-
-	M_2:
-		mes "[Geffen Soldier]";
-		mes "We upgraded the Location Guide to the Newest Digital Style.  We hope you like this gorgeous new system.";
-		next;
-		mes "[Geffen Soldier]";
-		mes "Don't forget to refer to the Mini-Map on the Upper-Right corner of your screen.";
-		next;
-		mes "[Geffen Soldier]";
-		mes "If you can't see the Mini-Map, just hit ^0000ff'ctrl+tab'^000000 or Click the ^0000ff'map'^000000 button in the Basic Information Window";
-		mes "Remeber to use the ^ff0000+,-^000000 buttons to adjust the map to your liking.";
-		goto M_Menu;
-
-	M_End:
-		mes "[Geffen Soldier]";
-		mes "Have a nice day.";
-		cutin "gef_soldier",255;
-		close;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Geffen Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				next;
+				switch(select("^FF0000Magic Acedemy^000000:Forge Shop:Weapon Shop:Tool Shop:Pub:Inn:Geffen Tower:Cancel")) {
+				case 1:
+					mes "[Geffen Guide]";
+					mes "The Magic Academy in";
+					mes "northwest Geffen handles";
+					mes "Job Changes to the Mage class.";
+					if (.@compass_check)
+						viewpoint 1,61,180,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Geffen Guide]";
+					mes "The Forge Shop is";
+					mes "located just southeast";
+					mes "from the center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,182,59,3,0x00FF00;
+					break;
+				case 3:
+					mes "[Geffen Guide]";
+					mes "The Weapon Shop";
+					mes "can be found northwest";
+					mes "from the center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,99,140,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Geffen Guide]";
+					mes "You can find the";
+					mes "Tool Shop by heading";
+					mes "southwest from the";
+					mes "center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,44,86,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Geffen Guide]";
+					mes "The Pub can be";
+					mes "found northeast";
+					mes "from the Geffen Tower.";
+					if (.@compass_check)
+						viewpoint 1,138,138,6,0xFF00FF;
+					break;
+				case 6:
+					mes "[Geffen Guide]";
+					mes "The Inn can be";
+					mes "found by traveling";
+					mes "northeast from the";
+					mes "center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,172,174,7,0xFF00FF;
+					break;
+				case 7:
+					mes "[Geffen Guide]";
+					mes "Geffen Tower is found";
+					mes "in the center of the city.";
+					mes "The Wizard Guild is at the";
+					mes "top, and there's even a dungeon";
+					mes "underneath it. There's many a";
+					mes "mystery surrounding that tower...";
+					if (.@compass_check)
+						viewpoint 1,120,114,8,0x00FF00;
+					break;
+				case 8:
+					mes "[Geffen Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,2,0xFF0000;
+			viewpoint 2,237,41,3,0x00FF00;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF00FF;
+			viewpoint 2,134,221,6,0xFF00FF;
+			viewpoint 2,204,214,7,0xFF00FF;
+			viewpoint 2,204,214,8,0x00FF00;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Geffen Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Geffen Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Geffen Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Geffen.";
+			break;
+		case 4:
+			mes "[Geffen Guide]";
+			mes "Alright, adventurer.";
+			mes "I wish you safety on";
+			mes "your journeys through";
+			mes "the lands you may travel...";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "gef_soldier",255;
+	end;
 }
 
-// South ------------------------------------------
-geffen,118,62,0	duplicate(Gef_Guide)	Guide#Gef2	705
-// East -----------------------------------------------------
-geffen,203,116,2	duplicate(Gef_Guide)	Guide#Gef3	705
-// West ----------------------------------------------
-geffen,37,123,5	duplicate(Gef_Guide)	Guide#Gef4	705
+geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	705
diff --git a/npc/guides/guides_gon.txt b/npc/guides/guides_gon.txt
new file mode 100644
index 000000000..ef443e33e
--- /dev/null
+++ b/npc/guides/guides_gon.txt
@@ -0,0 +1,66 @@
+//===== eAthena Script ======================================= 

+//= Kunlun Guides

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

+//= kobra_k88; L0ne_W0lf

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

+//= 1.0

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

+//= eAthena  SVN

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

+//= [Aegis COnversion]

+//= Guides for the City of Kunlun

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

+//= 1.0 First version [L0ne_W0lf]

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

+

+gonryun,163,60,4	script	Kunlun Guide#gon	780,{

+	mes "[He Yuen Zhe]";

+	mes "Ni Hao!";

+	mes "Welcome to Kunlun~";

+	mes "Take a walk around and experience";

+	mes "the ancient history and tradition";

+	mes "of our breath taking city.";

+	next;

+	mes "[He Yuen Zhe]";

+	mes "I am responsible for helping you";

+	mes "with any questions you may have.";

+	mes "Please feel free to ask me anything.";

+	next;

+	switch(select("Residence of the Chief:Tool Dealer:Weapon Dealer:Armor Dealer:Wine Maker")) {

+	case 1:

+		viewpoint 1,109,131,0,0xFF3355;

+		mes "[He Yuen Zhe]";

+		mes "Please follow your minimap, and head over to the ^FF3355+^000000 mark.";

+		mes "There, you'll get to the residence of the Chief. Enjoy your stay in lovely Kunlun!";

+		mes "Xie Xie!";

+		close;

+	case 2:

+		viewpoint 1,147,82,1,0xCE6300;

+		mes "[He Yuen Zhe]";

+		mes "Please follow your minimap, and head over to the ^CE6300+^000000 mark.";

+		mes "There, you'll get to the Tool Dealer. Enjoy your stay in lovely Kunlun!";

+		mes "Xie Xie!";

+		close;

+	case 3:

+		viewpoint 1,174,104,2,0x55FF33;

+		mes "[He Yuen Zhe]";

+		mes "Please follow your minimap, and head over to the ^55FF33+^000000 mark.";

+		mes "There, you'll get to the Weapon Dealer. Enjoy your stay in lovely Kunlun!";

+		mes "Xie Xie!";

+		close;

+	case 4:

+		viewpoint 1,173,84,3,0x3355FF;

+		mes "[He Yuen Zhe]";

+		mes "Please follow your minimap, and head over to the ^3355FF+^000000 mark.";

+		mes "There, you'll get to the Armor Dealer. Enjoy your stay in lovely Kunlun!";

+		mes "Xie Xie!";

+		close;

+	case 5:

+		viewpoint 1,215,114,3,0xCD69C9;

+		mes "[He Yuen Zhe]";

+		mes "Please follow your minimap, and head over to the ^CD69C9+^000000 mark.";

+		mes "There, you'll get to the Wine Maker. Enjoy your stay in lovely Kunlun!";

+		mes "Xie Xie!";

+		close;

+	}

+}

diff --git a/npc/guides/guides_hu.txt b/npc/guides/guides_hu.txt
index 51e84fae8..aec6fa62a 100644
--- a/npc/guides/guides_hu.txt
+++ b/npc/guides/guides_hu.txt
@@ -1,151 +1,155 @@
 //===== eAthena Script =======================================
-//= Guard of Hugel City
+//= Hugel Guides
 //===== By: ==================================================
-//= erKURITA
+//= erKURITA; L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
-//= Guard/Guide NPC of City of Hugel.
+//= Guides for the City of Hugel.
 //===== Additional Comments: =================================
 //= 1.0 Started the script. [erKURITA]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-hugel,98,57,3	script	Old Lady#hu1	863,{
-	mes "[Old Lady]";
-	mes "Welcome to Hugel, the Power Source City.";
-	next;
-	mes "[Old Lady]";
-	mes "I am here to help you find your way.  Please feel free to speak to me anytime you need help.";
-M_Menu:
-	next;
-	menu "View Buildings",-, "Notice",M_2, "Cancel",M_End;
-
-		mes "[Old Lady]";
-		mes "Do you want me to leave indications on the Mini-Map?";
-		next;
-		menu "No Thanks",-,"Yes Please",sM_1b;
-		
-			set @COMPASS_CHECK,0;
-			goto L_Cont;
-
-		sM_1b:
-			set @COMPASS_CHECK,1;
-
-		L_Cont:
-		mes "[Old Lady]";
-		mes "Please choose a building to view.";
+hugel,98,56,3	script	Hugel Guide Granny#huge	863,0,0,{
+	mes "[Hugel Guide Granny]";
+	mes "Oh, hello~ you are one energetic adventurer.";
+	mes "Welcome to Hugel. I was honored to guide you to this beautiful village.";
+	mes "If this is the first time for you to use the guide services, why don't you check the ''Notice'' menu first?";
+	while(1) {
 		next;
-	sM_Menu:
-		menu "Church",-,
-			"Hotel",M_1_2,
-			"Pub",M_1_3,
-			"Airship",M_1_4,
-			"Weapon/Armor Shop",M_1_5,
-			"Grocery/Tool shop",M_1_6,
-			"Firecrackers Shop",M_1_7,
-			"Hunter Guild",M_1_8a,
-			"^000066Poring Track 1^000000",M_1_9,
-			"^000066Poring Track 2^000000",M_1_10,
-			"^000066Bingo House^000000",M_1_11,
-			"Wipe all indications from mini-map",M_1_8,
-			"Cancel", M_End;
-
-			mes "[Old Lady]";
-			mes "'The 'Church' here in Hugel will grant your wedding's day a lot of happiness.";
-			mes "It's located at the east of Hugel, south of the Airship";
-			viewpoint 1,157,112,1,0xFF5555;
-			goto sL_Wipe;
-		M_1_2:
-			mes "[Old Lady]";
-			mes "The 'Hotel' is a few steps close here. Just go north through this road.";
-			mes "It is a good place to rest and replenish your hp and sp.";
-			viewpoint 1,101,78,2,0x44FF44;
-			goto sL_Wipe;
-		M_1_3:
-			mes "[Old Lady]";
-			mes "The 'Pub' is east of here, go and pass by for some rest! It is a great place to meet people and have fun.";
-			viewpoint 1,126,65,3,0x5555FF;
-			goto sL_Wipe;
-		M_1_4:
-			mes "[Old Lady]";
-			mes "Head over to the 'Airship' to fly to other cities.";
-			viewpoint 1,189,166,4,0xFF00FF;
-			goto sL_Wipe;
-		M_1_5:
-			mes "[Old Lady]";
-			mes "The 'Weapon/Armor shop' is the place to go when you need something to defend yourself from the other monsters";
-			viewpoint 1,72,155,5,0xFF00FF;
-			goto sL_Wipe;
-		M_1_6:
-			mes "[Old Lady]";
-			mes "The 'Grocery/Tool shop' is the place to go when you need to stock up on things like potions and fly-wings.";
-			viewpoint 1,92,164,6,0xF0C40F;
-			goto sL_Wipe;
-		M_1_7:
-			mes "[Old Lady]";
-			mes "The 'Firecracker shop' will provide you with some flashy fireworks to lit up your night";
-			viewpoint 1,94,104,7,0xFF8000;
-			goto sL_Wipe;
-		M_1_8a:
-			mes "[Old Lady]";
-			mes "The 'Hunter Guild' is located at the northeast of Hugel. Sharpen your eyes!";
-			viewpoint 1,208,225,7,0xFF8000;
-			goto sL_Wipe; 
-		M_1_9:
-			mes "[Old Lady]";
-			mes "The '^000066Poring Track Nº1^000000' is new and exciting entertaintment, make sure to check it!";
-			viewpoint 1,58,72,7,0xFF8000;
-			goto sL_Wipe;
-		M_1_10:
-			mes "[Old Lady]";
-			mes "The '^000066Poring Track Nº2^000000' is new and exciting entertaintment, make sure to check it!";
-			viewpoint 1,62,68,7,0xFF8000;
-			goto sL_Wipe;
-		M_1_11:
-			mes "[Old Lady]";
-			mes "The 'Bingo House' is located at the northwest of Hugel. Lay your bet ladies and gentlements!";
-			viewpoint 1,57,207,7,0xFF8000;
-			goto sL_Wipe;
-		M_1_8:
-			set @COMPASS_CHECK, 2;
-
-		sL_Wipe:
-			if(@COMPASS_CHECK != 2) next;	// avoids a double 'next' when 'wipe indications' is chosen
-			if(@COMPASS_CHECK == 1) goto sM_Menu;
-			viewpoint 2,157,112,1,0xFF5555;
-			viewpoint 2,101,78,2,0x44FF44;
-			viewpoint 2,126,65,3,0x5555FF;
-			viewpoint 2,189,166,4,0xFF00FF;
-			viewpoint 2,72,155,5,0xFF00FF;
-			viewpoint 2,92,164,6,0xF0C40F;
-			viewpoint 2,94,104,7,0xFF8000;
-			viewpoint 2,208,225,7,0xFF8000;
-			viewpoint 2,58,72,7,0xFF8000;
-			viewpoint 2,62,68,7,0xFF8000;
-			viewpoint 2,57,207,7,0xFF8000;
-			if (@COMPASS_CHECK == 0) goto sM_Menu;
-			mes "[Old Lady]";
-			mes "All indications have been removed";
+		switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Hugel Guide Granny]";
+			mes "I can tell you any building location as long as it is in Hugel.";
+			mes "So where do you want to go?";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop,1;
+			while(.@loop) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("Church:Inn:Pub:Airport:Weapon Shop:Tool Shop:Party Supplies Shop:^3131FFHunter Job Change Place^000000:^3131FFShrine Expedition's Place^000000:Monster Race Arena:Bingo Game Room:Cancel")) {
+				case 1:
+					mes "[Hugel Guide Granny]";
+					mes "Well, to me, this Church is rather like a place for old folks like me, you know...";
+					if (.@compass_check)
+						viewpoint 1,156,116,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Hugel Guide Granny]";
+					mes "Pudding rather than praise.";
+					mes "You'd better unpack your stuffs first before you start looking around this village.";
+					mes "It is the building right next to me.";
+					if (.@compass_check)
+						viewpoint 1,104,79,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Hugel Guide Granny]";
+					mes "Yes, when you travel, you want to drop by a pub and make new friends.";
+					mes "Go east from here, then you will arrive at the pub.";
+					if (.@compass_check)
+						viewpoint 1,129,66,4,0x99FFFF;
+					break;
+				case 4:
+					mes "[Hugel Guide Granny]";
+					mes "A while ago, strangers came to village and built that strange airport kind of thing...";
+					mes "What do they call it? Airship?";
+					if (.@compass_check)
+						viewpoint 1,178,146,5,0x0000FF;
+					break;
+				case 5:
+					mes "[Hugel Guide Granny]";
+					mes "Well, we have a weapon shop in the center of village.";
+					mes "But I don't know if there is any weapon that you find useful.";
+					if (.@compass_check)
+						viewpoint 1,70,158,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Hugel Guide Granny]";
+					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
+					mes "The tool shop is located in the center of village.";
+					if (.@compass_check)
+						viewpoint 1,93,167,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Hugel Guide Granny]";
+					mes "The party supplies shop is around the center of village.";
+					mes "Make sure that you will not use any firecracker stuffs near other people, because it is dangerous, you know?";
+					if (.@compass_check)
+						viewpoint 1,91,105,8,0xFF99FF;
+					break;
+				case 8:
+					mes "[Hugel Guide Granny]";
+					mes "Oh, are you an aspiring Hunter?";
+					mes "Then head northeast following the beach, then you will find the Hunter job change place.";
+					if (.@compass_check)
+						viewpoint 1,206,228,9,0xFF9900;
+					break;
+				case 9:
+					mes "[Hugel Guide Granny]";
+					mes "I heard that the shrine expedition is staying in a house at the west.";
+					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
+					mes "I wonder what they are doing in here...hmmm.";
+					if (.@compass_check)
+						viewpoint 1,52,91,10,0xFFFFFF;
+					break;
+				case 10:
+					mes "[Hugel Guide Granny]";
+					mes "I also like playing Monster Race games. It is pretty fun, you know?";
+					mes "Oh, you haven't tried it yet? No~ you'd better try. Trust me, you will like it.";
+					if (.@compass_check)
+						viewpoint 1,58,72,11,0xFF9900;
+					break;
+				case 11:
+					mes "[Hugel Guide Granny]";
+					mes "Do you like bingo games? If you do, go visit Euklan's Bingo Game Room.";
+					if (.@compass_check)
+						viewpoint 1,55,209,12,0x66FFFF;
+					break;
+				case 12:
+					mes "[Hugel Guide Granny]";
+					mes "If you like to get rid of all the location marks on your Mini-Map,";
+					mes "just ask me again, and choose ''Remove Marks from Mini-Map'' menu.";
+					set .@loop,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,156,116,2,0xFF0000;
+			viewpoint 2,104,79,3,0xFF00FF;
+			viewpoint 2,129,66,4,0x99FFFF;
+			viewpoint 2,178,146,5,0x0000FF;
+			viewpoint 2,70,158,6,0x00FF00;
+			viewpoint 2,93,167,7,0x00FF00;
+			viewpoint 2,91,105,8,0xFF99FF;
+			viewpoint 2,206,228,9,0xFF9900;
+			viewpoint 2,52,91,10,0xFFFFFF;
+			viewpoint 2,58,72,11,0xFF9900;
+			viewpoint 2,55,209,12,0x66FFFF;
+			set .@compass_check,0;
+			mes "[Hugel Guide Granny]";
+			mes "Okay, they are gone now. If you have more locations to ask, just let me know.";
+			break;
+		case 3:
+			mes "[Hugel Guide Granny]";
+			mes "When you are using the ''Village Guide'' menu, ";
+			mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen.";
+			mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?";
+			mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village.";
+			break;
+		case 4:
+			mes "[Hugel Guide Granny]";
+			mes "This guide job is pretty exciting. Hohoho~";
 			close;
-
-	M_2:
-		mes "[Old Lady]";
-		mes "We upgraded the Location Guide to the Newest Digital Style.  We hope you like this gorgeous new system.";
-		next;
-		mes "[Old Lady]";
-		mes "Don't forget to refer to the Mini-Map on the Upper-Right corner of your screen.";
-		next;
-		mes "[Old Lady]";
-		mes "If you can't see the Mini-Map, just hit ^0000ff'ctrl+tab'^000000 or Click the ^0000ff'map'^000000 button in the Basic Information Window";
-		mes "Remeber to use the ^ff0000+,-^000000 buttons to adjust the map to your liking.";
-		goto M_Menu;
-
-	M_End:
-		mes "[Old Lady]";
-		mes "Have a nice day, deary~";
-		close;
+		}
+	}
 }
diff --git a/npc/guides/guides_izl.txt b/npc/guides/guides_izl.txt
index 314390136..bf3c6c925 100644
--- a/npc/guides/guides_izl.txt
+++ b/npc/guides/guides_izl.txt
@@ -1,116 +1,156 @@
 //===== eAthena Script ======================================= 
 //= Izlude Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the City of Izlude
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
 //=     to Muad_Dib
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-izlude,121,87,6	script	Guide	105,{
+izlude,121,87,6	script	Guide#iz	105,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
-	mes "Welcome to Izlude, Prontera's satellite city.";
-	mes "If you need any guidance around Izlude, feel free to ask me at anytime.";
-L_MENU:
-	next;
-	menu "City Guide",L_CITY,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-L_CITY:
-	mes "[Izlude Guide]";
-  	mes "Please select a location from the following menu.";
-  	mes "Would you like me to mark locations on your Mini-Map?";
-  	next;
-  	menu "Yes.",L_YES,"No.",L_NO;
-L_NO:
-  		set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  		set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "^FF0000Swordman Association^000000",L_SWORD,"Swordman Hall",L_HALL,"Arena",L_ARENA,"Izlude Marina",L_MARINA,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Cancel",-;
-	mes "[Izlude Guide]";
- 	mes "Please ask me to remove marks from then Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
- 	goto L_MENU;
-L_SWORD:
-	mes "[Izlude Guide]";
-	mes "The Swordman Association is located on an island that is in west Izlude.";
-	mes "If you're thinking of changing jobs to Swordman, you should check it out.";
-	viewpoint 1,52,140,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_HALL:
-	mes "[Izlude Guide]";
-	mes "The Swordman Hall is located on the eastern island connected to Izlude.";
-	viewpoint 1,214,130,2,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_ARENA:
-	mes "[Izlude Guide]";
-	mes "Izlude's famous Arena is located at the northern end of Izlude.";
-	viewpoint 1,128,225,3,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_MARINA:
-	mes "[Izlude Guide]";
-	mes "You can find the Marina in the northeast part of Izlude.";
-	mes "There, you can ride a ship which will take you to Alberta or Byalan Island.";
-	viewpoint 1,200,180,4,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Izlude Guide]";
-	mes "You can easily find the Weapon Shop in northwest Izlude.";
-	viewpoint 1,111,149,5,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Izlude Guide]";
-	mes "The Tool Shop shouldn't be too hard to find in the northeast part of Izlude.";
-	viewpoint 1,148,148,6,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_WIPE:
- 	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,52,140,1,0xFF0000;
-	viewpoint 2,214,130,2,0x00FF00;
-	viewpoint 2,128,225,3,0x00FF00;
-	viewpoint 2,200,180,4,0xFF0000;
-	viewpoint 2,111,149,5,0xFF00FF;
-	viewpoint 2,148,148,6,0xFF00FF;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,52,140,1,0xFF0000;
-	viewpoint 2,214,130,2,0x00FF00;
-	viewpoint 2,128,225,3,0x00FF00;
-	viewpoint 2,200,180,4,0xFF0000;
-	viewpoint 2,111,149,5,0xFF00FF;
-	viewpoint 2,148,148,6,0xFF00FF;
-  	goto L_MENU;
-L_NOTICE:
- 	mes "[Izlude Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Izlude Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Izlude Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Izlude.";
- 	goto L_MENU;
-L_END:
- 	mes "[Izlude Guide]";
- 	mes "Okay then, feel free to come to me if you ever feel lost around Izlude, alright?";
-	cutin "prt_soldier",255; 
- 	close;
+	mes "Welcome to Izlude,";
+	mes "Prontera's satellite city.";
+	mes "If you need any guidance";
+	mes "around Izlude, feel free";
+	mes "to ask me at anytime.";
+	set .@loop1,1;
+	while(.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Izlude Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				next;
+				switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) {
+				case 1:
+					mes "[Izlude Guide]";
+					mes "The Swordman Association";
+					mes "is located on an island that is";
+					mes "in west Izlude. If you're thinking of changing jobs to Swordman,";
+					mes "you should check it out.";
+					if (.@compass_check)
+						viewpoint 1,52,140,0,0xFF0000;
+					break;
+				case 2:
+					mes "[Izlude Guide]";
+					mes "The Swordman Hall";
+					mes "is located in the eastern";
+					mes "island connected to Izlude.";
+					if (.@compass_check)
+						viewpoint 1,214,130,1,0x00FF00;
+					break;
+				case 3:
+					mes "[Izlude Guide]";
+					mes "Izlude's famous";
+					mes "Arena is located at the";
+					mes "northern end of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,128,225,2,0x00FF00;
+					break;
+				case 4:
+					mes "[Izlude Guide]";
+					mes "You can find the";
+					mes "Marina in the northeast";
+					mes "part of Izlude. There, you can";
+					mes "ride a ship which will take you";
+					mes "to Alberta or Byalan Island.";
+					if (.@compass_check)
+						viewpoint 1,200,180,3,0xFF0000;
+					break;
+				case 5:
+					mes "[Izlude Guide]";
+					mes "You can easily";
+					mes "find the Weapon Shop";
+					mes "in northwest Izlude.";
+					if (.@compass_check)
+						viewpoint 1,111,149,4,0xFF00FF;
+					break;
+				case 6:
+					mes "[Izlude Guide]";
+					mes "The Tool Shop shouldn't";
+					mes "be too hard to find in the";
+					mes "northeast part of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,148,148,5,0xFF00FF;
+					break;
+				case 7:
+					mes "[Izlude Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,0,0x00FF00;
+			viewpoint 2,237,41,1,0x0000FF;
+			viewpoint 2,46,345,2,0x00FF00;
+			viewpoint 2,175,220,3,0xFF0000;
+			viewpoint 2,134,221,4,0xFF0000;
+			viewpoint 2,204,214,5,0xFF0000;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Izlude Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Izlude Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Izlude Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Izlude.";
+			break;
+		case 4:
+			mes "[Izlude Guide]";
+			mes "Okay then, feel";
+			mes "free to come to me";
+			mes "if you ever feel lost";
+			mes "around Izlude, alright?";
+			set .@loop1,0;
+		}
+	}
+	close2;
+	cutin "prt_soldier",255;
+	end;
 }
diff --git a/npc/guides/guides_juno.txt b/npc/guides/guides_juno.txt
new file mode 100644
index 000000000..c7af7a9e3
--- /dev/null
+++ b/npc/guides/guides_juno.txt
@@ -0,0 +1,118 @@
+//===== eAthena Script ======================================= 
+//= Yuno Guides
+//===== By: ================================================== 
+//= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.7
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Guides for the City of Juno
+//===== Additional Comments: ================================= 
+//= Edited Miss Yoon text. Added town soldiers by usul. Edited town soldiers
+//= and added map location option for them. [kobra_k88]
+//= 1.1 Changed sprites and cutins to Schwarzwald Republic ones
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the mini map localization function. [Musashiden]
+//= 1.4 Juno Guides are now up to date according to iRO. [Musashiden]
+//= 1.5 Removed Duplicates [Silent].
+//= 1.6 Changed one of the Juno soldier's sprite. [Musashiden]
+//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================ 
+
+yuno,153,47,4	script	Juno Guide#yuno	700,{
+	mes "[Ms. Yoon]";
+	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
+	mes "the city of Juno!";
+	next;
+	switch(select("Armory:Tool Shop:Sage Castle (Sage Job Change Place):Street of Book Stores:Juphero Plaza:Library of the Republic:Schweicherbil Magic Academy:Monster Museum:Forge:Airport:End Conversation")) {
+	case 1:
+		viewpoint 1,120,138,0,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^FF3355+^000000 -> Armory";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 2:
+		viewpoint 1,193,142,1,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^3355FF+^000000 -> Tool Shop";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 3:
+		viewpoint 1,90,318,2,0x33FF55;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^33FF55+^000000 -> Sage Castle";
+		mes "( Sage Job Change Place )";
+		mes "Thank you, have a good day.";
+		close;
+	case 4:
+		viewpoint 1,257,102,3,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^FF3355+^000000 -> Street of Book Stores";
+		mes "Thank you, have a good day.";
+		close;
+	case 5:
+		viewpoint 1,157,170,4,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^3355FF+^000000 -> Juphero Plaza";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 6:
+		viewpoint 1,336,204,5,0x33FF55;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^33FF55+^000000 -> Library of the Republic";
+		mes "Thank you, have a good day.";
+		close;
+	case 7:
+		viewpoint 1,323,281,6,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Schweicherbil Magic Academy";
+		mes "Thank you, have a good day.";
+		close;
+	case 8:
+		viewpoint 1,278,288,7,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^3355FF+^000000 -> Monster Museum";
+		mes "Thank you, have a good day.";
+		close;
+	case 9:
+		viewpoint 1,120,138,8,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Forge";
+		mes "The forge is located underneath Armory.";
+		mes "Thank you, have a good day.";
+		close;
+	case 10:
+		viewpoint 1,53,214,9,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Airport";
+		mes "Thank you, have a good day.";
+		close;
+	case 11:
+		mes "[Ms. Yoon]";
+		mes "A great city of wise men.";
+		mes "A city of Knowledge!";
+		mes "Welcome to Juno.";
+		close;
+	}
+}
diff --git a/npc/guides/guides_lhz.txt b/npc/guides/guides_lhz.txt
index adc2b875d..7e13464e0 100644
--- a/npc/guides/guides_lhz.txt
+++ b/npc/guides/guides_lhz.txt
@@ -1,362 +1,227 @@
 //===== eAthena Script ======================================= 
 //= Lighthalzen Guides
 //===== By: ================================================== 
-//= MasterOfMuppets
+//= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//=
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Lighthalzen Guide NPCs
+//= [Aegis Conversion]
+//= Guides for the City of Lighthalzen
 //===== Additional Comments: ================================= 
 //= 1.0 First Version [MasterOfMuppets]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-lighthalzen,220,311,3	script	Guide::LhzSlum	852,{
-
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
+	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
-	mes "welcome to Lighthalzen,";
-	mes "the Coropration City-State.";
+	mes "Welcome to Lighthalzen,";
+	mes "the Corporation City-State.";
 	mes "If you need any guidance";
-	mes "around the city, feel free.";
+	mes "around the city, feel free";
 	mes "to ask me and I'll do my";
 	mes "very best to help you.";
-	next;
-loopback:
-	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Lighthalzen is divided";
-	mes "into the East and West";
-	mes "districts by a railroad that";
-	mes "runs right through the middle.";
-	mes "There are always guards on";
-	mes "watch to protect the peace.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please don't hesitate";
-	mes "to report and suspicious";
-	mes "activity or persons to us.";
-	mes "We hope that you enjoy";
-	mes "our fair city, adventurer.";
-	close;
-
-s_Guide:
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the East District,";
-	mes "more commonly known as the";
-	mes "Slums. Select the location that";
-	mes "you'd like know more about.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "But before that,";
-	mes "would you like me";
-	mes "to mark locations";
-	mes "on your Mini-Map?";
-	next;
-	Menu "Yes",s_Yes,"No",-;
-
-	goto s_Cont;
-s_Yes:
-	set @tempguide,1;
-s_Cont:
-	menu "Tool Shop",s_Tool,"Mill",s_Mill,"Pub",s_Pub,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Please ask me to \"Remove";
-	mes "Marks from Mini-Map\" if you";
-	mes "no longer wish to have the";
-	mes "location marks displayed";
-	mes "on your Mini-Map.";
-	next;
-	goto loopback;
-
-s_Tool:
-	mes "[Lighthalzen Guide]";
-	mes "The Tool Shop is";
-	mes "located in the 11 o' clock";
-	mes "direction from the center";
-	mes "of the East District.";
-	if(@tempguide)viewpoint 1,324,301,1,0xFF0000;
-	next;
-	goto s_Cont;
-
-s_Mill:
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "the Mill can be found in";
-	mes "the 1 o'clock direction";
-	mes "in the East District.";
-	if(@tempguide)viewpoint 1,365,301,2,0xFF00FF;
-	next;
-	goto s_Cont;
-
-s_Pub:
-	mes "[Lighthalzen Guide]";
-	mes "The Pub is located";
-	mes "in the southern part";
-	mes "of the East District.";
-	if(@tempguide)viewpoint 1,346,232,3,0xCCFFFF;
-	next;
-	goto s_Cont;
-
-s_Remove:
-	viewpoint 2,324,301,1,0xFF0000;
-	viewpoint 2,365,301,2,0xFF00FF;
-	viewpoint 2,346,232,3,0xCCFFFF;
-	mes "[Lighthalzen Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
-	next;
-	goto loopback;
-
-s_Notice:
-	mes "[Lighthalzen Guide]";
-	mes "Advances in sorcery and";
-	mes "techonlogy have allowed";
-	mes "us to update our information";
-	mes "system, enabling up to mark";
-	mes "locations on your Mini-Map";
-	mes "for easier navigation.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Your Mini-Map is located";
-	mes "in the upper right cornern";
-	mes "of the screen. If you can't";
-	mes "see it, press the Ctrl + Tab";
-	mes "keys or click the \"Map\" button";
-	mes "in your Basic Info Window.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "click on the \"+\" and \"-\"";
-	mes "symbols to zoom in and";
-	mes "out of your Mini-Map. We";
-	mes "hope you enjoy your travels";
-	mes "here in Lighthalzen.";
-	next;
-	goto loopback;
-
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Lighthalzen Guide]";
+			mes "Please be aware that I'm";
+			mes "in charge of providing info";
+			mes "regarding the West District";
+			mes "of Lighthalzen. Now, please";
+			mes "select the location that you'd";
+			mes "like to learn more about.";
+			if (.@compass_check == 0) {
+				next;
+				mes "[Lighthalzen Guide]";
+				mes "But before that,";
+				mes "would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Rekenber Corporation^000000:Train Staition:Police Station:Bank:Hotel:Airport:Merchant Guild:Jewelry Shop:Weapon Shop:Departement Store:Cancel")) {
+				case 1:
+					mes "[Lighthalzen Guide]";
+					mes "Rekenber Corporation,";
+					mes "the largest company in";
+					mes "the Schwaltzvalt Republic,";
+					mes "in located in northwestern";
+					mes "Lighthalzen. You can't miss";
+					mes "the headquarters building.";
+					if (.@compass_check)
+						viewpoint 1,102,247,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Lighthalzen Guide]";
+					mes "The Train Station is";
+					mes "located in the center of";
+					mes "the city, where we have";
+					mes "a direct railroad to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,233,164,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Lighthalzen Guide]";
+					mes "Our Police Station is just";
+					mes "north of the city's center.";
+					mes "Please don't hesitate to report";
+					mes "any suspicious persons and";
+					mes "activity, or if you have any";
+					mes "problems whatsoever.";
+					if (.@compass_check)
+						viewpoint 1,236,276,4,0x99FFFFF;
+					break;
+				case 4:
+					mes "[Lighthalzen Guide]";
+					mes "The Bank is located";
+					mes "just opposite to the";
+					mes "Lighthalzen Police Station,";
+					mes "which is a pretty good idea";
+					mes "when I think about it, actually. ^FFFFFFspacer^000000";
+					if (.@compass_check)
+						viewpoint 1,198,257,5,0x0000FF;
+					break;
+				case 5:
+					mes "[Lighthalzen Guide]";
+					mes "Our Hotel is located in";
+					mes "the middle of the South Plaza.";
+					mes "Due to its quality services and";
+					mes "luxurious accomodations, this";
+					mes "hotel is extremely popular.";
+					if (.@compass_check)
+						viewpoint 1,159,133,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Lighthalzen Guide]";
+					mes "The Airport is to the far";
+					mes "west of the Central Promenade.";
+					mes "You can travel anywhere within";
+					mes "the Schwaltzvalt Republic by";
+					mes "riding on one of the Airships.";
+					if (.@compass_check)
+						viewpoint 1,267,75,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Lighthalzen Guide]";
+					mes "The Merchant Guild can be";
+					mes "found in the southwestern";
+					mes "part of Lighthalzen.";
+					if (.@compass_check)
+						viewpoint 1,74,53,8,0xFF99FF;
+					break;
+				case 8:
+					mes "[Lighthalzen Guide]";
+					mes "The Jewelry Shop is";
+					mes "located just west of";
+					mes "the South Plaza.";
+					if (.@compass_check)
+						viewpoint 1,93,110,9,0xFF9900;
+					break;
+				case 9:
+					mes "[Lighthalzen Guide]";
+					mes "The Weapon Shop is";
+					mes "located at the end of";
+					mes "the Central Promenade.";
+					mes "It's at least worth a look";
+					mes "if you're serious about";
+					mes "adventuring around here.";
+					if (.@compass_check)
+						viewpoint 1,196,46,10,0x330033;
+					break;
+				case 10:
+					mes "[Lighthalzen Guide]";
+					mes "The Department Store is";
+					mes "located in the middle of";
+					mes "Lighthalzen and is the biggest";
+					mes "and most convenient place for";
+					mes "shopping for almost everything.";
+					if (.@compass_check)
+						viewpoint 1,199,163,11,0xFFFF00;
+					break;
+				case 11:
+					mes "[Lighthalzen Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,102,247,2,0xFF0000;
+			viewpoint 2,233,164,3,0xFF00FF;
+			viewpoint 2,236,276,4,0x99FFFF;
+			viewpoint 2,198,257,5,0x0000FF;
+			viewpoint 2,159,133,6,0x00FF00;
+			viewpoint 2,267,75,7,0x00FF00;
+			viewpoint 2,74,53,8,0xFF99FF;
+			viewpoint 2,93,110,9,0xFF9900;
+			viewpoint 2,196,46,10,0x330033;
+			viewpoint 2,199,163,11,0xFFFF00;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Lighthalzen Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Lighthalzen.";
+			break;
+		case 4:
+			mes "[Lighthalzen Guide]";
+			mes "Lighthalzen is divided";
+			mes "into the East and West";
+			mes "districts by a railroad that";
+			mes "runs right through the middle.";
+			mes "There are always guards on";
+			mes "watch to protect the peace.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Please don't hesitate";
+			mes "to report any suspicious";
+			mes "activity or persons to us.";
+			mes "We hope that you enjoy";
+			mes "our fair city, adventurer.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-lighthalzen,207,311,3	script	Guide::LhzWest	852,{
-
-	mes "[Lighthalzen Guide]";
-	mes "welcome to Lighthalzen,";
-	mes "the Coropration City-State.";
-	mes "If you need any guidance";
-	mes "around the city, feel free.";
-	mes "to ask me and I'll do my";
-	mes "very best to help you.";
-	next;
-loopback:
-	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Lighthalzen is divided";
-	mes "into the East and West";
-	mes "districts by a railroad that";
-	mes "runs right through the middle.";
-	mes "There are always guards on";
-	mes "watch to protect the peace.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please don't hesitate";
-	mes "to report and suspicious";
-	mes "activity or persons to us.";
-	mes "We hope that you enjoy";
-	mes "our fair city, adventurer.";
-	close;
-
-s_Guide:
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the West District,";
-	mes "of Lighthalzen. Now, please";
-	mes "select the location that you'd";
-	mes "like to learn more about.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "But before that,";
-	mes "would you like me";
-	mes "to mark locations";
-	mes "on your Mini-Map?";
-	next;
-	Menu "Yes",s_Yes,"No",-;
-
-	goto s_Cont;
-s_Yes:
-	set @tempguide,1;
-s_Cont:
-	menu "^FF0000Rekenber Corporation^000000",s_Rekenber,"Train Station",s_Train,"Police Station",s_Police,"Bank",s_Bank,"Hotel",s_Hotel,"Airport",s_Airport,"Merchant Guild",s_Merchant,"Jewel Shop",s_Jewel,"Weapon Shop",s_Weap,"Department Store",s_Store,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Please ask me to \"Remove";
-	mes "Marks from Mini-Map\" if you";
-	mes "no longer wish to have the";
-	mes "location marks displayed";
-	mes "on your Mini-Map.";
-	next;
-	goto loopback;
-
-s_Rekenber:
-	mes "[Lighthalzen Guide]";
-	mes "Rekenber Corporation,";
-	mes "the largest company in";
-	mes "the Schwarzwald Republic,";
-	mes "is located in the northwestern";
-	mes "Lighthalzen. You can't miss";
-	mes "the headquarters building.";
-	if(@tempguide)viewpoint 1,103,244,1,0xFF0000;
-	next;
-	goto s_Cont;
-
-s_Train:
-	mes "[Lighthalzen Guide]";
-	mes "The Train Station is";
-	mes "located in the center of";
-	mes "the city, where we have";
-	mes "a direct railroad to Einbroch.";
-	if(@tempguide)viewpoint 1,240,163,2,0xFF00FF;
-	next;
-	goto s_Cont;
-
-s_Police:
-	mes "[Lighthalzen Guide]";
-	mes "Our Police Station is just";
-	mes "north of the city's center.";
-	mes "Please don't hesitate to report";
-	mes "any suspicious persons and";
-	mes "activity, or if you have any";
-	mes "problems whatsoever.";
-	if(@tempguide)viewpoint 1,236,276,3,0xCCFFFF;
-	next;
-	goto s_Cont;
-
-s_Bank:
-	mes "[Lighthalzen Guide]";
-	mes "The Bank is located";
-	mes "just opposite to the";
-	mes "Lighthalzen Police Station,";
-	mes "which is a pretety good idea";
-	mes "when I think about it, actually.";
-	if(@tempguide)viewpoint 1,199,257,4,0x0000FF;
-	next;
-	goto s_Cont;
-
-s_Hotel:
-	mes "[Lighthalzen Guide]";
-	mes "Our Hotel is located in";
-	mes "the middle of the South Plaza.";
-	mes "Due to its quality of services and";
-	mes "luxurious accomodations, this";
-	mes "hotel is extremely popular.";
-	if(@tempguide)viewpoint 1,159,133,5,0x0FFF00;
-	next;
-	goto s_Cont;
-
-s_Airport:
-	mes "[Lighthalzen Guide]";
-	mes "The Airport is to the far";
-	mes "west of the Central Promenade";
-	mes "You can travel anywhere within";
-	mes "the Schwarzwald Republic by";
-	mes "riding one of the Airships.";
-	if(@tempguide)viewpoint 1,266,76,6,0x00FF00;
-	next;
-	goto s_Cont;
-
-s_Merchant:
-	mes "[Lighthalzen Guide]";
-	mes "The Merchant Guild can be";
-	mes "found in the southwestern";
-	mes "part of Lighthalzen.";
-	if(@tempguide)viewpoint 1,74,52,7,0xEFAEBD;
-	next;
-	goto s_Cont;
-
-s_Jewel:
-	mes "[Lighthalzen Guide]";
-	mes "The Jewelry Shop is";
-	mes "located just west of";
-	mes "the South Plaza.";
-	if(@tempguide)viewpoint 1,92,110,8,0xFF9500;
-	next;
-	goto s_Cont;
-
-s_Weap:
-	mes "[Lighthalzen Guide]";
-	mes "The Weapon Shop is";
-	mes "located at the end of";
-	mes "the Central Promenade.";
-	mes "It's at least worth a look";
-	mes "if you're serious about";
-	mes "adventuring around here.";
-	if(@tempguide)viewpoint 1,196,46,9,0x330033;
-	next;
-	goto s_Cont;
-
-s_Store:
-	mes "[Lighthalzen Guide]";
-	mes "The Department Store is";
-	mes "located in the middle of";
-	mes "Lighthalzen and is the biggest";
-	mes "and most convenient place for";
-	mes "shopping for almost everything.";
-	if(@tempguide)viewpoint 1,199,163,10,0xFFFF00;
-	next;
-	goto s_Cont;
-
-s_Remove:
-	viewpoint 2,103,244,1,0xFF0000;
-	viewpoint 2,240,163,2,0xFF00FF;
-	viewpoint 2,236,276,3,0xCCFFFF;
-	viewpoint 2,199,257,4,0x0000FF;
-	viewpoint 2,159,133,5,0x0FFF00;
-	viewpoint 2,266,76,6,0x00FF00;
-	viewpoint 2,74,52,7,0xEFAEBD;
-	viewpoint 2,92,110,8,0xFF9500;
-	viewpoint 2,196,46,9,0x330033;
-	viewpoint 2,199,163,10,0xFFFF00;
-	mes "[Lighthalzen Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
-	next;
-	goto loopback;
-
-s_Notice:
-	mes "[Lighthalzen Guide]";
-	mes "Advances in sorcery and";
-	mes "techonlogy have allowed";
-	mes "us to update our information";
-	mes "system, enabling up to mark";
-	mes "locations on your Mini-Map";
-	mes "for easier navigation.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Your Mini-Map is located";
-	mes "in the upper right cornern";
-	mes "of the screen. If you can't";
-	mes "see it, press the Ctrl + Tab";
-	mes "keys or click the \"Map\" button";
-	mes "in your Basic Info Window.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "click on the \"+\" and \"-\"";
-	mes "symbols to zoom in and";
-	mes "out of your Mini-Map. We";
-	mes "hope you enjoy your travels";
-	mes "here in Lighthalzen.";
-	next;
-	goto loopback;
-
-}
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
 
-lighthalzen,154,100,5	duplicate(LhzWest)	Guide#lhz1	852
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
 
-lighthalzen,319,243,5	duplicate(LhzSlum)	Guide#lhz2	852
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852
diff --git a/npc/guides/guides_louyang.txt b/npc/guides/guides_louyang.txt
index a10730365..288b1c76c 100644
--- a/npc/guides/guides_louyang.txt
+++ b/npc/guides/guides_louyang.txt
@@ -1,161 +1,21 @@
 //===== eAthena Script =======================================
-//= Louyang Guide NPCs
+//= Louyang Guides
 //===== By: ==================================================
-//= jAthena/Tsuyuki
+//= jAthena/Tsuyuki; L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0a
+//= 1.1
 //===== Compatible With: =====================================
-//= eAthena/Freya
+//= eAthena SVN
 //===== Description: =========================================
-//= Louyang Guide NPCs
+//= Guides for hte City of Louyang
 //===== Additional Comments: =================================
 //= Fully working
 //= 0.5 Added first, Japanese version [Tsuyuki]
 //= 1.0 Translated to English from iRO NPC Dialogue (100% Official) [Tsuyuki]
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//----------------------------------------------------------------------
-
-louyang,224,104,4	script	Representative#Lou	818,{
-
-	mes "[Representative]";
-	mes "Welcome to Louyang,";
-	mes "an ancient land with";
-	mes "a history full of tales";
-	mes "of bravery.";
-	next;
-	mes "[Representative]";
-	mes "We now provide an ocean lane to";
-	mes "accomodate foreign travelers and";
-	mes "intercultural exchange from which";
-	mes "all can benefit.";
-	next;
-	mes "[Representative]";
-	mes "Louyang is famous for";
-	mes "its elaborate history, as well as";
-	mes "specialties that are unique to this";
-	mes "nation. Please take your time and";
-	mes "enjoy your stay.";
-	next;
-	menu "Ask Building Locations.",LouCase1A,"Remove all marks from mini-map.",LouCase2A,"Cancel.",LouCase3A;
-
-	LouCase1A:
-		mes "[Representative]";
-		mes "Where would you like to go?";
-		next;
-		menu "Dragon Castle",LouCase1B,"Doctor's Office",LouCase2B,"City Hall",LouCase3B,"Weapon Shop",LouCase4B,"Tool Shop",LouCase5B,"Tavern",LouCase6B,"Cancel",LouCase7B;
-
-			LouCase1B:
-				mes "[Representative]";
-				mes "The Dragon Castle is located at ^ff0000+^000000.";
-				mes "It is where all the nobles reside,";
-				mes "including our lord.";
-				next;
-				mes "[Representative]";
-				mes "Since you're an outsider, I guess";
-				mes "it would be appropriate for you to";
-				mes "visit our lord first.";
-				viewpoint 1,218,255,1,0xff0000;
-				close;
-
-			LouCase2B:
-				mes "[Representative]";
-				mes "We have a very skillful doctor.";
-				mes "You can find her office at ^8a0000+^000000.";
-				next;
-				mes "[Representative]";
-				mes "It is said that there";
-				mes "is no disease she cannot cure.";
-				mes "Well, I can't guarantee if that's";
-				mes "true or not.";
-				viewpoint 1,263,93,2,0x8a0000;
-				close;
-
-			LouCase3B:
-				mes "[Representative]";
-				mes "We have a City Hall where the";
-				mes "federal government operates.";
-				mes "It is located at ^777777+^000000.";
-				next;
-				mes "[Representative]";
-				mes "If you have any problems,";
-				mes "you should talk with the";
-				mes "employees in City Hall.";
-				viewpoint 1,309,80,3,0x00ff00;
-				close;
-
-			LouCase4B:
-				mes "[Representative]";
-				mes "The Weapon Shop is located at ^00ff00+^000000.";
-				next;
-				mes "[Representative]";
-				mes "You will see";
-				mes "marvelous weapons forged";
-				mes "by the well-experienced";
-				mes "blacksmiths of Louyang.";
-				viewpoint 1,145,174,4,0x00ff00;
-				close;
-
-			LouCase5B:
-				mes "[Representative]";
-				mes "The Tool Shop is located at ^0000ff+^000000.";
-				next;
-				mes "[Representative]";
-				mes "Knowing your enemy";
-				mes "is half the battle!";
-				mes "It's also safer to prepare yourself";
-				mes "than to be sorry later. Why don't";
-				mes "you go check their supplies?";
-				viewpoint 1,136,97,5,0x0000ff;
-				close;
-
-			LouCase6B:
-				mes "[Representative]";
-				mes "When you get tired during your";
-				mes "trip, I suggest that you visit the";
-				mes "Tavern. It's located at ^00ff00+^000000.";
-				viewpoint 1,280,167,6,0x00ff00;
-				next;
-				mes "[Representative]";
-				mes "The Tavern is a good place";
-				mes "to meet other tourists, as well as";
-				mes "to hear of any news that may be";
-				mes "helpful to know.";
-				close;
-
-			LouCase7B:
-				mes "[Representative]";
-				mes "If you wish to remove all marks";
-				mes "on your mini-map, please choose";
-				mes "'Remove all marks from mini-map.'";
-				mes "from the menu.";
-				close;
-
-	LouCase2A:
-		mes "[Representative]";
-		mes "Done! All the marks on your";
-		mes "mini-map are erased. Feel free to";
-		mes "ask me about building locations";
-		mes "whenever you need to.";
-		viewpoint 2,218,255,1,0xff0000;
-		viewpoint 2,263,93,2,0x8a0000;
-		viewpoint 2,309,80,3,0x00ff00;
-		viewpoint 2,145,174,4,0x00ff00;
-		viewpoint 2,136,97,5,0x0000ff;
-		viewpoint 2,280,167,6,0x00ff00;
-		close;
-
-	LouCase3A:
-		mes "[Representative]";
-		mes "I understand that you want to";
-		mes "explore Louyang and see the";
-		mes "sights for yourself. Alright then,";
-		mes "take care!";
-		close;
-}
-
-louyang,160,175,4	script	Soldier#Lou1	825,{
-
+louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
 	mes "[Soldier]";
 	mes "Welcome to Louyang,";
 	mes "a city with a long";
@@ -168,130 +28,206 @@ louyang,160,175,4	script	Soldier#Lou1	825,{
 	mes "foreign nations.";
 	next;
 	mes "[Soldier]";
-	mes "Louyang is well-known for various";
-	mes "specialties in addition to its rich";
-	mes "history. Here you can find many";
-	mes "things unique to our land.";
+	mes "Louyang is well-known for various specialties in addition to its rich history. Here you can find many things unique to our land.";
 	next;
 	mes "[Soldier]";
 	mes "Please take your time";
 	mes "and we invite you to enjoy";
 	mes "your trip here in Louyang.";
 	next;
-	menu "Ask Building Locations.",LouCase1A,"Remove all marks from mini-map.",LouCase2A,"Cancel.",LouCase3A;
-
-	LouCase1A:
+	switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) {
+	case 1:
 		mes "[Soldier]";
 		mes "Where would you like to go?";
 		next;
-		menu "Dragon Castle",LouCase1B,"Doctor's Office",LouCase2B,"City Hall",LouCase3B,"Weapon Shop",LouCase4B,"Tool Shop",LouCase5B,"Tavern",LouCase6B,"Cancel",LouCase7B;
-
-			LouCase1B:
-				mes "[Soldier]";
-				mes "The Dragon Castle is located at ^ff0000+^000000.";
-				mes "It is where all the nobles reside,";
-				mes "including our lord.";
-				next;
-				mes "[Soldier]";
-				mes "Since you're an outsider, I guess";
-				mes "it would be appropriate for you to";
-				mes "visit our lord first.";
-				viewpoint 1,218,255,1,0xff0000;
-				close;
-
-			LouCase2B:
-				mes "[Soldier]";
-				mes "We have a very skillful doctor.";
-				mes "You can find her office at ^8a0000+^000000.";
-				next;
-				mes "[Soldier]";
-				mes "It is said that there";
-				mes "is no disease she cannot cure.";
-				mes "Well, I can't guarantee if that's";
-				mes "true or not.";
-				viewpoint 1,263,93,2,0x8a0000;
-				close;
-
-			LouCase3B:
-				mes "[Soldier]";
-				mes "We have a City Hall where the";
-				mes "federal government operates.";
-				mes "It is located at ^777777+^000000.";
-				next;
-				mes "[Soldier]";
-				mes "If you have any problems,";
-				mes "you should talk with the";
-				mes "employees in City Hall.";
-				viewpoint 1,309,80,3,0x00ff00;
-				close;
-
-			LouCase4B:
-				mes "[Soldier]";
-				mes "The Weapon Shop is located at ^00ff00+^000000.";
-				next;
-				mes "[Soldier]";
-				mes "You will see";
-				mes "marvelous weapons forged";
-				mes "by the well-experienced";
-				mes "blacksmiths of Louyang.";
-				viewpoint 1,145,174,4,0x00ff00;
-				close;
-
-			LouCase5B:
-				mes "[Soldier]";
-				mes "The Tool Shop is located at ^0000ff+^000000.";
-				next;
-				mes "[Soldier]";
-				mes "Knowing your enemy";
-				mes "is half the battle!";
-				mes "It's also safer to prepare yourself";
-				mes "than to be sorry later. Why don't";
-				mes "you go check their supplies?";
-				viewpoint 1,136,97,5,0x0000ff;
-				close;
-
-			LouCase6B:
-				mes "[Soldier]";
-				mes "When you get tired during your";
-				mes "trip, I suggest that you visit the";
-				mes "Tavern. It's located at ^00ff00+^000000.";
-				viewpoint 1,280,167,6,0x00ff00;
-				next;
-				mes "[Soldier]";
-				mes "The Tavern is a good place";
-				mes "to meet other tourists, as well as";
-				mes "to hear of any news that may be";
-				mes "helpful to know.";
-				close;
-
-			LouCase7B:
-				mes "[Soldier]";
-				mes "If you wish to remove all marks";
-				mes "on your mini-map, please choose";
-				mes "'Remove all marks from mini-map.'";
-				mes "from the menu.";
-				close;
-
-	LouCase2A:
+		switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) {
+		case 1:
+			mes "[Soldier]";
+			mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord.";
+			next;
+			mes "[Soldier]";
+			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
+			viewpoint 1,218,255,2,0xFF3355;
+			break;
+		case 2:
+			mes "[Soldier]";
+			mes "We have a very skillful doctor.";
+			mes "You can find her office at ^CE6300+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "It is said that there";
+			mes "is no disease she cannot cure. Well, I can't guarantee if that's true or not.";
+			viewpoint 1,263,94,3,0xCE6300;
+			break;
+		case 3:
+			mes "[Soldier]";
+			mes "We have a City Hall where the federal government operates.";
+			mes "It is located at ^A5BAAD+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "If you have any problems,";
+			mes "you should talk with the";
+			mes "employees in City Hall.";
+			viewpoint 1,309,80,4,0xA5BAAD;
+			break;
+		case 4:
+			mes "[Soldier]";
+			mes "The Weapon Shop is located at ^55FF33+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "You will see";
+			mes "marvelous weapons forged";
+			mes "by the well-experienced";
+			mes "blacksmiths of Louyang.";
+			viewpoint 1,145,174,5,0x55FF33;
+			break;
+		case 5:
+			mes "[Soldier]";
+			mes "The Tool Shop is located at ^3355FF+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "Knowing your enemy";
+			mes "is half the battle!";
+			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
+			viewpoint 1,135,98,6,0x3355FF;
+			break;
+		case 6:
+			mes "[Soldier]";
+			mes "When you get tired during your trip, I suggest that you visit the Tavern. It's located at ^00FF00+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "The Tavern is a good place";
+			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
+			viewpoint 1,280,167,7,0x00FF00;
+			break;
+		case 7:
+			mes "[Soldier]";
+			mes "If you wish to remove all marks";
+			mes "on your mini-map, please choose 'Remove all marks from mini-map.' from the menu.";
+		}
+		break;
+	case 2:
+		viewpoint 2,218,255,2,0xFF00FF;
+		viewpoint 2,263,94,3,0xFF00FF;
+		viewpoint 2,309,80,4,0xFF00FF;
+		viewpoint 2,145,174,5,0xFF00FF;
+		viewpoint 2,135,98,6,0xFF00FF;
+		viewpoint 2,280,167,7,0xFF00FF;
 		mes "[Soldier]";
-		mes "There, I've erased all the marks on";
-		mes "your mini-map. Feel free to ask me";
-		mes "about building locations whenever";
-		mes "you need to.";
-		viewpoint 2,218,255,1,0xff0000;
-		viewpoint 2,263,93,2,0x8a0000;
-		viewpoint 2,309,80,3,0x00ff00;
-		viewpoint 2,145,174,4,0x00ff00;
-		viewpoint 2,136,97,5,0x0000ff;
-		viewpoint 2,280,167,6,0x00ff00;
-		close;
-
-	LouCase3A:
+		mes "There, I've erased all the marks on your mini-map. Feel free to ask me about building locations whenever you need to.";
+		break;
+	case 3:
 		mes "[Soldier]";
 		mes "I guess it's fun";
 		mes "sometimes to go exploring";
 		mes "on your own. Take care.";
-		close;
+	}
+	close;
 }
 
-louyang,213,213,4	duplicate(Soldier#Lou1)	Soldier#Lou2	825
+louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	825
+
+louyang,224,104,3	script	Representative	818,{
+	mes "[Representative]";
+	mes "Welcome to Louyang,";
+	mes "an ancient land with";
+	mes "a history full of tales";
+	mes "of bravery.";
+	next;
+	mes "[Representative]";
+	mes "We now provide an ocean lane to accomodate foreign travelers and intercultural exchange from which all can benefit.";
+	next;
+	mes "[Representative]";
+	mes "Louyang is famous for";
+	mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay.";
+	next;
+	switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) {
+	case 1:
+		set .@compass_check,1;
+		mes "[Representative]";
+		mes "Where would you like to go?";
+		next;
+		switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) {
+		case 1:
+			mes "[Representative]";
+			mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord.";
+			next;
+			mes "[Representative]";
+			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
+			viewpoint 1,218,255,2,0xFFFF33;
+			break;
+		case 2:
+			mes "[Representative]";
+			mes "We have a very skillful doctor.";
+			mes "You can find her office at ^CE6300+^000000.";
+			next;
+			mes "[Representative]";
+			mes "It is said that there";
+			mes "is no disease she cannot cure. Well, I can't guarantee if that's true or not.";
+			viewpoint 1,263,94,3,0xFFCE63;
+			break;
+		case 3:
+			mes "[Representative]";
+			mes "We have a City Hall where the federal government operates.";
+			mes "It is located at ^A5BAAD+^000000.";
+			next;
+			mes "[Representative]";
+			mes "If you have any problems,";
+			mes "you should talk with the";
+			mes "employees in City Hall.";
+			viewpoint 1,309,80,4,0xFF00FF;
+			break;
+		case 4:
+			mes "[Representative]";
+			mes "The Weapon Shop is located at ^55FF33+^000000.";
+			next;
+			mes "[Representative]";
+			mes "You will see";
+			mes "marvelous weapons forged";
+			mes "by the well-experienced";
+			mes "blacksmiths of Louyang.";
+			viewpoint 1,145,174,5,0xFF55FF;
+			break;
+		case 5:
+			mes "[Representative]";
+			mes "The Tool Shop is located at ^3355FF+^000000.";
+			next;
+			mes "[Representative]";
+			mes "Knowing your enemy";
+			mes "is half the battle!";
+			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
+			viewpoint 1,135,98,6,0xFF3355;
+			break;
+		case 6:
+			mes "[Representative]";
+			mes "When you get tired during your trip, I suggest that you visit the Tavern. It's located at ^00FF00+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "The Tavern is a good place";
+			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
+			viewpoint 1,280,167,7,0xFF00FF;
+			break;
+		case 7:
+			mes "[Representative]";
+			mes "If you wish to remove all marks";
+			mes "on your mini-map, please choose 'Remove all marks from mini-map.' from the menu.";
+		}
+		break;
+	case 2:
+		viewpoint 2,218,255,2,0xFF00FF;
+		viewpoint 2,263,94,3,0xFF00FF;
+		viewpoint 2,309,80,4,0xFF00FF;
+		viewpoint 2,145,174,5,0xFF00FF;
+		viewpoint 2,135,98,6,0xFF00FF;
+		viewpoint 2,280,167,7,0xFF00FF;
+		mes "[Representative]";
+		mes "Done! All the marks on your mini-map are erased. Feel free to ask me about building locations whenever you need to.";
+		break;
+	case 3:
+		mes "[Representative]";
+		mes "I understand that you want to explore Louyang and see the";
+		mes "sights for yourself. Alright then, take care!";
+		break;
+	}
+	close;
+}
diff --git a/npc/guides/guides_moc.txt b/npc/guides/guides_moc.txt
new file mode 100644
index 000000000..44a091122
--- /dev/null
+++ b/npc/guides/guides_moc.txt
@@ -0,0 +1,161 @@
+//===== eAthena Script ======================================= 
+//= Morroc Guides
+//===== By: ================================================== 
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.4
+//===== Compatible With: ===================================== 
+//= eAthena  SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Guides for the City of Morroc
+//===== Additional Comments: ================================= 
+//= Fully working.  Added a guide at every exit.
+//= v1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Removed Duplicates [Silent]
+//= 1.4 rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+morocc,153,286,6	script	Guide#moc::MocGuide	707,{
+	cutin "moc_soldier",2;
+	mes "[Morroc Guide]";
+	mes "Welcome to Morroc,";
+	mes "the frontier town of the";
+	mes "Rune-Midgarts Kingdom.";
+	mes "Please ask me for help if";
+	mes "you're having any trouble";
+	mes "finding anything in town.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Morroc Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				next;
+				switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) {
+				case 1:
+					mes "[Morroc Guide]";
+					mes "The Thief Guild is";
+					mes "in charge of all Job";
+					mes "Changes to the Thief";
+					mes "Class. From what I hear,";
+					mes "you can find them inside";
+					mes "the Pyramids nearby...";
+					if (.@compass_check)
+						viewpoint 1,24,297,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Morroc Guide]";
+					mes "The Weapon Shop";
+					mes "is in the southeast";
+					mes "end of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,253,56,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Morroc Guide]";
+					mes "There are Inns";
+					mes "where you can rest";
+					mes "at the southeast and";
+					mes "northeast ends of Morroc.";
+					if (.@compass_check) {
+						viewpoint 1,197,66,4,0xFF00FF;
+						viewpoint 1,273,269,5,0xFF00FF;
+					}
+					break;
+				case 4:
+					mes "[Morroc Guide]";
+					mes "You can find the";
+					mes "Pub in northeast Morroc.";
+					if (.@compass_check)
+						viewpoint 1,52,259,6,0xFF00FF;
+					break;
+				case 5:
+					mes "[Morroc Guide]";
+					mes "The Mercenary";
+					mes "Guild is located";
+					mes "in East Morroc.";
+					if (.@compass_check)
+						viewpoint 1,284,171,7,0x00FF00;
+					break;
+				case 6:
+					mes "[Morroc Guide]";
+					mes "The Forge is";
+					mes "located just";
+					mes "southwest from";
+					mes "the center of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,47,47,7,0xFF00FF;
+					break;
+				case 7:
+					mes "[Morroc Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0x00FF00;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Morroc Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Morroc Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Morroc Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Morroc.";
+			break;
+		case 4:
+			mes "[Morroc Guide]";
+			mes "Alright then,";
+			mes "try to stay out of";
+			mes "too much trouble";
+			mes "out there, adventurer.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "moc_soldier",255;
+	end;
+}
+
+morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	707
diff --git a/npc/guides/guides_mor.txt b/npc/guides/guides_mor.txt
deleted file mode 100644
index 01b638c2c..000000000
--- a/npc/guides/guides_mor.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Morroc Guides
-//===== By: ================================================== 
-//= kobra_k88
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
-//= Fully working.  Added a guide at every exit.
-//= v1.1 Now using duplicate command.
-//= 1.2 Optimized, updated common guide names [Lupus]
-//= 1.3 Removed Duplicates [Silent]
-//============================================================
-
-
-// North ------------------------------------------------
-morocc,153,286,6	script	Guide#1::Mor_Guide	707,{
-	cutin "moc_soldier",2;
-	mes "[Morroc Soldier]";
-	mes "Welcome to Morroc, the Desert Frontier!";
-	next;
-	mes "[Morroc Soldier]";
-	mes "We are here to help you find your way.  Please feel free to speak to us anytime you need help.";
-M_Menu:
-	next;
-	menu "View Buildings",-, "Notice",M_2, "Cancel",M_End;
-
-		mes "[Morroc Soldier]";
-		mes "Do you want me to leave indications on the Mini-Map?";
-		next;
-		menu "No Thanks",-,"Yes Please",sM_1b;
-		
-			set @COMPASS_CHECK,0;
-			goto L_Cont;
-
-		sM_1b:
-			set @COMPASS_CHECK,1;
-
-		L_Cont:
-		mes "[Morroc Soldier]";
-		mes "Please choose a building to view.";
-		next;
-	sM_Menu:
-		menu "^FF0000Thief Guild^000000",-, "Armory",M_1_2, "Inn",M_1_3, "Pub",M_1_4, "Mercenary Guild",M_1_5,
-			"Wipe all indications from mini-map.",M_1_6, "Cancel",M_End;
-
-			mes "[Morocc Soldier]";
-			mes "The 'Thief Guild'.... I hear that it's the place to go if you want to be a Thief.....";
-			viewpoint 1,24,297,1,0xFF0000;
-			goto sL_Wipe;
-		M_1_2:
-			mes "[Morocc Soldier]";
-			mes "Head over to the 'Armory' to equip yourself with a variety of weapons and armor.";
-			viewpoint 1,253,56,2,0xFF00FF;
-			goto sL_Wipe;
-		M_1_3:
-			mes "[Morocc Soldier]";
-			mes "In Morroc there are 2 'Inn's' located in the South and NorthEastern parts of town.";
-			viewpoint 1,274,269,3,0xFF00FF;
-			viewpoint 1,197,66,4,0xFF00FF;
-			goto sL_Wipe;
-		M_1_4:
-			mes "[Morocc Soldier]";
-			mes "The 'Pub' is located to the NorthWest of town.";
-			viewpoint 1,52,259,5,0xFF00FF;
-			goto sL_Wipe;
-		M_1_5:
-			mes "[Morocc Soldier]";
-			mes "The 'Mercenary Guild' is in the Eastern corner of town.";
-			viewpoint 1,284,171,6,0x00FF00;
-			goto sL_Wipe;
-		M_1_6:
-			set @COMPASS_CHECK, 2;
-
-		sL_Wipe:
-			if(@COMPASS_CHECK != 2) next;	// avoids a double 'next' when 'wipe indications' is chosen
-			if(@COMPASS_CHECK == 1) goto sM_Menu;
-			viewpoint 2,24,297,1,0xFF0000;
-			viewpoint 2,253,56,2,0xFF00FF;
-			viewpoint 2,274,269,3,0xFF00FF;
-			viewpoint 2,197,66,4,0xFF00FF;
-			viewpoint 2,52,259,5,0xFF00FF;
-			viewpoint 2,284,171,6,0x00FF00;
-			if (@COMPASS_CHECK == 0) goto sM_Menu;
-			mes "[Morroc Soldier]";
-			mes "All indications have been removed";
-			cutin "moc_soldier",255;
-			close;
-
-	M_2:
-		mes "[Morroc Soldier]";
-		mes "We upgraded the Location Guide to the Newest Digital Style.  We hope you like this gorgeous new system.";
-		next;
-		mes "[Morroc Soldier]";
-		mes "Don't forget to refer to the Mini-Map on the Upper-Right corner of your screen.";
-		next;
-		mes "[Morroc Soldier]";
-		mes "If you can't see the Mini-Map, just hit ^0000ff'ctrl+tab'^000000 or Click the ^0000ff'map'^000000 button in the Basic Information Window";
-		mes "Remeber to use the ^ff0000+,-^000000 buttons to adjust the map to your liking.";
-		goto M_Menu;
-
-	M_End:
-		mes "[Morocc Soldier]";
-		mes "Good by for now.";
-		cutin "moc_soldier",255;
-		close;
-}
-
-// South --------------------------------------------
-morocc,162,97,6	duplicate(Mor_Guide)	Guide#Mor2	707
-// West --------------------------------------------
-morocc,28,161,6	duplicate(Mor_Guide)	Guide#Mor3	707
-// East  --------------------------------------------
-morocc,294,203,9	duplicate(Mor_Guide)	Guide#Mor4	707
diff --git a/npc/guides/guides_nif.txt b/npc/guides/guides_nif.txt
index 5703418df..13115a96f 100644
--- a/npc/guides/guides_nif.txt
+++ b/npc/guides/guides_nif.txt
@@ -1,83 +1,134 @@
 //===== eAthena Script ======================================= 
 //= Niflheim Guide
 //===== By: ================================================== 
-//= eAthena Team
+//= eAthena Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
-//= eAthena 1.0 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the City of Niflheim
 //===== Additional Comments: ================================= 
 //= 1.1 Fixed location command format [Lupus]
 //= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-
-//=====================================================================================
-niflheim,186,190,5	script	Wandering Man	798,{
-	mes "[Wandering Man]";
-	mes "Why are you in this scary city? I guess you lost your way too, heh.";
-	mes "I was attracted here by the tall trees, but still can't find my way out after so long...";
+niflheim,107,156,6	script	Roaming Man#nif	798,{
+	mes "[Ricael]";
+	mes "You must be lost...";
+	mes "Why would anyone come";
+	mes "to this horrid, dreadful";
+	mes "place on purpose...??";
 	next;
-	mes "[Wandering Man]";
-	mes "But instead i have become familiar with the village surroundings,";
-	mes "perhaps it may be useful for escaping sometimes.";
+	mes "[Ricael]";
+	mes "Ever since I stumbled fell down into this giant tree, I've suffered endlessly here. I've wasted years in sadness, being unable to escape Niflheim.";
 	next;
-	menu "Enquire locations",-,"Wipe indications",L_MENU_2,"Cancel",L_end;
-
-		mes "[Wandering Man]";
-		mes "Where do you want to know about?";
+	mes "[Ricael]";
+	mes "But in searching for an";
+	mes "escape route, I probably know";
+	mes "this town better than anyone";
+	mes "else. I guess knowing the";
+	mes "layout might help you escape";
+	mes "if it weren't so futile.";
+	next;
+	switch(select("Ask building locations.:Remove marks on the mini-map.:Cancel.")) {
+	case 1:
+		mes "[Ricael]";
+		mes "So, um, which place do you want to know about?";
 		next;
-		menu "Witch's Hut",-,"Equipment Shop",M_item,"Weapon Shop",M_weapon,"Inn",M_hotel,"Cancel",L_cancel;
-
-		viewpoint 1,255,194,1,0xFF3366;
-		mes "[Wandering Man]";
-		mes "In Niflheim lives a terrible witch,";
-		mes "you'll see her house right ^FF3366there^000000,";
-		mes "it was so scary i fled right after going in!";
-		close;
-
-		M_item:  
-		viewpoint 1,219,198,2,0xCC6600;
-		mes "[Wandering Man]";
-		mes "The equipment shop should be over ^CC6600here^000000";
-		mes "they sell several items not available to the outside world.";
-		close;
-
-		M_weapon:
-		viewpoint 1,219,170,3,0x66FF33;
-		mes "[Wandering Man]";
-		mes "The weapon shop should be over ^66FF33here^000000";
-		mes "they sell several items not available to the outside world.";
-		close;
-
-		M_hotel:
-		viewpoint 1,189,210,4,0x3366FF;
-		mes "[Wandering Man]";
-		mes "^3366FFThat^000000 would be the inn,";
-		mes "occasionally the spirits throw a party in there.";
-		close;
-
-		L_cancel:
-		mes "[Wandering Man]";
-		mes "To remove all indications of the minimap";
-		mes "come back and talk to me again.";
-		close;
-  
-	L_MENU_2:
-	viewpoint 2,255,194,1,0xFF3366;
-	viewpoint 2,219,198,2,0xCC6600;
-	viewpoint 2,219,170,3,0x66FF33;
-	viewpoint 2,189,210,4,0x3366FF;
-	mes "[Wandering Man]";
-	mes "I removed all the indications,";
-	mes "If you still need any directions, come back and talk to me again.";
-	close;
-
-	L_end: 
-	mes "[Wandering Man]";
-	mes "Wandering around by yourself is dangerous...";
-	mes "please take care.";
+		switch(select("Witch's castle:Tool shop:Weapon shop:Pub:Cancel")) {
+		case 1:
+			mes "[Ricael]";
+			mes "There. I made a ^FF3355+^000000 mark";
+			mes "on your mini-map so that you can";
+			mes "go to the castle where that";
+			mes "creepy witch lives.";
+			next;
+			mes "[Ricael]";
+			mes "I went there once, but then I";
+			mes "ran away and decided that I";
+			mes "should try to not die as much";
+			mes "as possible. That's pretty";
+			mes "much my life goal here in";
+			mes "Niflheim.";
+			viewpoint 1,253,191,2,0xFF3355;
+			break;
+		case 2:
+			mes "[Ricael]";
+			mes "The Tool shop is located";
+			mes "at the ^CE6300+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items that";
+			mes "you cannot find outside of this";
+			mes "town. Of course, they weren't so";
+			mes "special once I realized no";
+			mes "Potion can ease the pain I feel.";
+			mes "...I wish I was in prison.";
+			Emotion e_wah;
+			viewpoint 1,217,196,3,0xCE6300;
+			break;
+		case 3:
+			mes "[Ricael]";
+			mes "The Weapon shop is located";
+			mes "at the ^55FF33+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items which";
+			mes "you cannot find outside of this";
+			mes "town... Of course, fighting";
+			mes "the monsters here will just";
+			mes "make them angrier. You may as";
+			mes "well let them eat you.";
+			Emotion e_wah;
+			viewpoint 1,216,171,4,0x55FF33;
+			break;
+		case 4:
+			mes "[Ricael]";
+			mes "The Pub is located at";
+			mes "the ^3355FF+^000000 mark I've made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "Sometimes I see dead people in the";
+			mes "Pub enjoying themselves, having a";
+			mes "good time. I used to be able to";
+			mes "have fun once, but now all I feel";
+			mes "is the cold tingle of loneliness";
+			mes "and despair...every waking moment.";
+			viewpoint 1,189,207,5,0x3355FF;
+			break;
+		case 5:
+			mes "[Ricael]";
+			mes "If you want to remove the location";
+			mes "marks from your mini-map, please";
+			mes "choose 'Remove marks on the";
+			mes "mini-map' from the menu.";
+		}
+		break;
+	case 2:
+		viewpoint 2,253,191,2,0xFF3355;
+		viewpoint 2,217,196,3,0xCE6300;
+		viewpoint 2,216,171,4,0x55FF33;
+		viewpoint 2,189,207,5,0x3355FF;
+		mes "[Ricael]";
+		mes "I removed the location marks from";
+		mes "your mini-map. Go ahead and ask";
+		mes "me if you want to mark the";
+		mes "building locations again. It";
+		mes "helps me ignore the depression";
+		mes "that gnaws at me constantly.";
+		break;
+	case 3:
+		mes "[Ricael]";
+		mes "It's not a good idea to search";
+		mes "Niflheim by yourself...";
+		mes "At least try to be careful.";
+		break;
+	}
 	close;
 }
diff --git a/npc/guides/guides_pay.txt b/npc/guides/guides_pay.txt
index b1d1a123f..da8287f40 100644
--- a/npc/guides/guides_pay.txt
+++ b/npc/guides/guides_pay.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Payon Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis COnversion]
+//= Guides for hte City of Payon
 //===== Additional Comments: ================================= 
 //= Fully working
 //= v1.1 Now using duplicate command.New Payon Locations [Darkchild]
@@ -18,203 +19,279 @@
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4a Tixed Archer Village Guide [Lupus] 
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-payon,162,67,4	script	Guide#pay1	708,{
+payon,162,67,4	script	Guide#pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to the mountain city of Payon.";
-	mes "If you're unfammiliar with this area, I can help you find what you're looking for around here.";
-L_MENU:
-	next;
-	menu "City Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Payon Guide]";
-  	mes "Please select a location from the following menu.";
-  	mes "Would you like me to mark locations on your Mini-Map?";
-  	next;
-  	menu "Yes.",L_YES,"No.",L_NO;
-L_NO:
-  	set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  	set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "^FF0000Archer Guild^000000",L_ARCHER,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Pub",L_PUB,"Central Palace",L_PALACE,"The Empress",L_EMPRESS,"Palace Annex",L_ANNEX,"Royal Kitchen",L_KITCHEN,"Forge",L_FORGE,"Cancel",-;
-	mes "[Payon Guide]";
- 	mes "Please ask me to remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
- 	goto L_MENU;
-L_ARCHER:
-	mes "[Payon Guide]";
-	mes "The Archer Guild handles Job Changes to the Archer Class.";
-	mes "You'll need to enter the Archer Village wich is to the northeast of Payon.";
-	viewpoint 1,228,326,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Payon Guide]";
-	mes "The Weapon Shop can be found in the northwest corner of the city of Payon.";
-	viewpoint 1,139,158,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Payon Guide]";
-	mes "The Tool Shop is located near the northwest corner of Payon.";
-	viewpoint 1,144,85,3,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_PUB:
-	mes "[Payon Guide]";
-	mes "The Pub can be found in the northeast part of Payon.";
-	mes "It's the best place to relax after a long day of hunting.";
-	viewpoint 1,220,117,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_PALACE:
-	mes "[Payon Guide]";
-	mes "The Central Palace is located to the north within the city of Payon.";
-	viewpoint 1,156,245,5,0x00FF00;
-	next;
-	goto L_WIPE;
-L_EMPRESS:
-	mes "[Payon Guide]";
-	mes "The Empress can be found to the northwest in Payon.";
-	viewpoint 1,107,327,6,0x00FF00;
-	next;
-	goto L_WIPE;
-L_ANNEX:
-	mes "[Payon Guide]";
-	mes "The Palace Annex can be found in the western part of Payon.";
-	viewpoint 1,127,204,7,0x00FF00;
-	next;
-	goto L_WIPE;
-L_KITCHEN:
-	mes "[Payon Guide]";
-	mes "The Royal Kitchen is located near the northern end of Payon.";
-	viewpoint 1,155,327,8,0x00FF00;
-	next;
-	goto L_WIPE;
-L_FORGE:
-	mes "[Payon Guide]";
-	mes "The Forge is situaded near the center of Payon.";
-	viewpoint 1,142,172,9,0xFFFF00;
-	next;
-//	goto L_WIPE;	
-L_WIPE:
- 	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,228,326,1,0xFF0000;
-	viewpoint 2,139,158,2,0xFF00FF;
-	viewpoint 2,144,85,3,0xFF00FF;
-	viewpoint 2,220,117,4,0xFF00FF;
-	viewpoint 2,156,245,5,0x00FF00;
-	viewpoint 2,107,327,6,0x00FF00;
-	viewpoint 2,127,204,7,0x00FF00;
-	viewpoint 2,155,327,8,0x00FF00;
-	viewpoint 2,142,172,9,0xFFFF00;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,228,326,1,0xFF0000;
-	viewpoint 2,139,158,2,0xFF00FF;
-	viewpoint 2,144,85,3,0xFF00FF;
-	viewpoint 2,220,117,4,0xFF00FF;
-	viewpoint 2,156,245,5,0x00FF00;
-	viewpoint 2,107,327,6,0x00FF00;
-	viewpoint 2,127,204,7,0x00FF00;
-	viewpoint 2,155,327,8,0x00FF00;
-	viewpoint 2,142,172,9,0xFFFF00;
-  	goto L_MENU;
-
-L_NOTICE:
- 	mes "[Payon Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Payon Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Payon Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Payon.";
- 	goto L_MENU;
-L_END:
- 	mes "[Payon Guide]";
- 	mes "Be safe in your travels, brave adventurer.";
-	cutin "pay_soldier",255; 
- 	close;
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Payon Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Archer Guild^000000:Weapon Shop:Tool Shop:Pub:Central Palace:The Empress:Palace Annex:Royal Kitchen:Forge:Cancel")) {
+				case 1:
+					mes "[Payon Guide]";
+					mes "The Archer Guild handles";
+					mes "Job Changes to the Archer";
+					mes "Class. You'll need to enter";
+					mes "the Archer Village which is";
+					mes "to the northeast of Payon.";
+					if (.@compass_check)
+						viewpoint 1,227,328,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Payon Guide]";
+					mes "The Weapon Shop";
+					mes "can be found in the";
+					mes "northwest corner of";
+					mes "the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,139,159,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Payon Guide]";
+					mes "The Tool Shop";
+					mes "is located near";
+					mes "the northwest";
+					mes "corner of Payon.";
+					if (.@compass_check)
+						viewpoint 1,144,85,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Payon Guide]";
+					mes "The Pub can be";
+					mes "found in the northeast";
+					mes "part of Payon. It's the";
+					mes "best place to relax after";
+					mes "a long day of hunting.";
+					if (.@compass_check)
+						viewpoint 1,220,117,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Payon Guide]";
+					mes "The Central Palace";
+					mes "is located to the north";
+					mes "within the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,155,245,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Payon Guide]";
+					mes "The Empress";
+					mes "can be found to the";
+					mes "northwest in Payon.";
+					if (.@compass_check)
+						viewpoint 1,107,324,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Payon Guide]";
+					mes "The Palace Annex";
+					mes "can be found in the";
+					mes "western part of Payon.";
+					if (.@compass_check)
+						viewpoint 1,130,204,8,0x00FF00;
+					break;
+				case 8:
+					mes "[Payon Guide]";
+					mes "The Royal Kitchen";
+					mes "is located near the";
+					mes "northern end of Payon.";
+					if (.@compass_check)
+						viewpoint 1,154,325,9,0x00FF00;
+					break;
+				case 9:
+					mes "[Payon Guide]";
+					mes "The Forge is";
+					mes "situated near";
+					mes "the center of Payon.";
+					if (.@compass_check)
+						viewpoint 1,126,169,10,0xFFFF00;
+					break;
+				case 10:
+					mes "[Payon Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+					break;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,237,41,8,0x0000FF;
+			viewpoint 2,46,345,9,0x00FF00;
+			viewpoint 2,175,220,10,0xFF0000;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Payon Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Payon Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Payon Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Payon.";
+			break;
+		case 4:
+			mes "[Payon Guide]";
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "pay_soldier",255;
+	end;
 }
 
-pay_arche,85,30,2	script	Guide#pay2	708,{
+pay_arche,85,30,2	script	Guide#2pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to the Archer Village.";
-	mes "If you're unfammiliar with this area, I can help you find what you're looking for around here.";
-L_MENU:
-	next;
-	menu "Village Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Payon Guide]";
-  	mes "Please select a location from the following menu.";
-  	mes "Would you like me to mark locations on your Mini-Map?";
-  	next;
-  	menu "Yes.",L_YES,"No.",L_NO;
-L_NO:
-  	set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  	set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "^FF0000Archer Guild^000000",L_ARCHER,"Tool Shop",L_TOOL,"Payon Dungeon",L_DUNGEON,"Cancel",-;
-	mes "[Payon Guide]";
- 	mes "Please ask me to remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
- 	goto L_MENU;
-L_ARCHER:
-	mes "[Payon Guide]";
-	mes "The Archer Guild, found northeast in the Archer Village, handles Job Changes to the Archer Class.";
-	viewpoint 1,144,164,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Payon Guide]";
-	mes "The Tool Shop is located near the northwest corner of the village.";
-	viewpoint 1,71,156,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_DUNGEON:
-	mes "[Payon Guide]";
-	mes "The entrance to the Payon Dungeon is located at the west end of the village.";
-	viewpoint 1,34,132,3,0xFFFFFF;
-	next; 
-//	goto L_WIPE;
-L_WIPE:
- 	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,144,164,1,0xFF0000;
-	viewpoint 2,71,156,2,0xFF00FF;
-	viewpoint 2,34,132,3,0xFFFFFF;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,144,164,1,0xFF0000;
-	viewpoint 2,71,156,2,0xFF00FF;
-	viewpoint 2,34,132,3,0xFFFFFF;
-  	goto L_MENU;
-
-L_NOTICE:
- 	mes "[Payon Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Payon Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Payon Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Payon.";
- 	goto L_MENU;
-L_END:
- 	mes "[Payon Guide]";
- 	mes "Be safe in your travels, brave adventurer.";
-	cutin "pay_soldier",255; 
- 	close;
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Payon Guide]";
+			mes "Please, select a menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like to leave indicators on the mini-map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Archer Guild^000000:Tool Shop:Payon Dungeon:Cancel")) {
+				case 1:
+					mes "[Payon Guide]";
+					mes "The Archer Guild,";
+					mes "found northeast in";
+					mes "the Archer Village,";
+					mes "handles Job Changes";
+					mes "to the Archer Class.";
+					if (.@compass_check)
+						viewpoint 1,144,164,0,0xFFFF00;
+					break;
+				case 2:
+					mes "[Payon Guide]";
+					mes "You can find";
+					mes "a Tool Shop in";
+					mes "the northeast corner";
+					mes "of the Archer Village.";
+					if (.@compass_check)
+						viewpoint 1,71,156,1,0xFFFF00;
+					break;
+				case 3:
+					mes "[Payon Guide]";
+					mes "The entrance to";
+					mes "the Payon Dungeon";
+					mes "is located at the west";
+					mes "end of the village.";
+					if (.@compass_check)
+						viewpoint 1,34,132,2,0xFFFFFF;
+					break;
+				case 4:
+					mes "[Payon Guide]";
+					mes "If you'd like to erase the marks on the mini-map, select menu, 'Wipe all indicators on the mini-map'.";
+					set @loop2,0;
+					break;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,0,0xFF00FF;
+			viewpoint 2,237,41,1,0xFF0000;
+			viewpoint 2,46,345,2,0xFF00FF;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Payon Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Payon Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Payon Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Payon.";
+			break;
+		case 4:
+			mes "[Payon Guide]";
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "pay_soldier",255;
+	end;
 }
diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt
index 25ac43bde..ac45b4583 100644
--- a/npc/guides/guides_pron.txt
+++ b/npc/guides/guides_pron.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Prontera Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for hte City of Prontera
 //===== Additional Comments: ================================= 
 //= Fully working
 //= v1.1 Now using duplicate command.
@@ -16,196 +17,220 @@
 //=     to Muad_Dib
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-prontera,154,187,4	script	Guide::Prt_Guide	105,{
+prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
-	mes "Welcome to Prontera, the beautiful capital of the Run-Midgard Kingdom.";
-	mes " If you have questions or need help find something in the city, don't hesitate to ask.";
-L_MENU:
-	next;
-	menu "City Guide",L_CITY,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-L_CITY:
-	mes "[Prontera Guide]";
-  	mes "Please select a location from the following menu.";
-  	mes "Would you like me to mark locations on your Mini-Map?";
-  	next;
-  	menu "Yes.",L_YES,"No.",L_NO;
-L_NO:
-  		set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  		set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "Swordman Association",L_SWORD,"^0000FFSanctuary^000000",L_SANCTUARY,"Prontera Chivalry",L_CHIVALRY,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Inn",L_INN,"Trading Post",L_TRADING,"Pub",L_PUB,"Library",L_LIBRARY,"Job Agency",L_JOB,"Prontera Castle",L_CASTLE,"City Hall",L_HALL,"Cancel",-;
-	mes "[Prontera Guide]";
- 	mes "Pleas ask me to Remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
- 	goto L_MENU;
-L_SWORD:
-	mes "[Prontera Guide]";
-	mes "The Swordman Association, which handles Job Changes to the Swordman class, has moved to Izlude.";
-	mes "This facility is just an empty building now.";
-	viewpoint 1,237,41,1,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_SANCTUARY:
-	mes "[Prontera Guide]";
-	mes "The Prontera Sanctuary handles Job Changes to the Acolyte class, and can be found in the northeast corner of Prontera.";
-	viewpoint 1,236,316,2,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_CHIVALRY:
-	mes "[Prontera Guide]";
-	mes "The Prontera Chivalry, which is responsible for the safety of our capital, is in Prontera's northwest corner.";
-	viewpoint 1,46,345,3,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Prontera Guide]";
-	mes "The Weapon Shop is located northeast of the central fountain.";
-	viewpoint 1,175,220,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Prontera Guide]";
-	mes "The Tool Shop is located northwest of the central fountain.";
-	viewpoint 1,134,221,5,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_INN:
-	mes "[Prontera Guide]";
-	mes "The Inns in Prontera are located both to the east and west of Prontera's central fountain area.";
-	viewpoint 1,204,214,6,0xFF00FF;
-	viewpoint 1,107,192,7,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TRADING:
-	mes "[Prontera Guide]";
-	mes "The Trading Post can be found southeast from the central fountain.";
-	viewpoint 1,179,184,8,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_PUB:
-	mes "[Prontera Guide]";
-	mes "The Pub is located southeast of the fountain, behind the Trading Post.";
-	viewpoint 1,208,154,9,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_LIBRARY:
-	mes "[Prontera Guide]";
-	mes "If you head north from the central fountain, you'll find an empty area in which both branches of the Prontera Library can be accessed if you head towards the east or west.";
-	viewpoint 1,120,267,10,0x00FF00;
-	viewpoint 1,192,267,11,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_JOB:
-	mes "[Prontera Guide]";
-	mes "The Job Agency is just southwest of the central fountain area.";
-	viewpoint 1,133,183,12,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_CASTLE:
-	mes "[Prontera Guide]";
-	mes "The Prontera Castle is located at the northern sector of this city.";
-	mes " You can go to fields that are north of Prontera by going through the castle's rear exit.";
-	viewpoint 1,156,360,13,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_HALL:
-	mes "[Prontera Guide]";
-	mes "The City Hall is located in the southwest corner in our city of Prontera.";
-	viewpoint 1,75,91,14,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_WIPE:
- 		if(@COMPASS_CHECK == 1)goto L_MENU_2;
-		viewpoint 2,237,41,1,0x00FF00;
-		viewpoint 2,236,316,2,0xFF0000;
-		viewpoint 2,46,345,3,0x00FF00;
-		viewpoint 2,175,220,4,0xFF00FF;
-		viewpoint 2,8,134,5,0xFF00FF;
-		viewpoint 2,204,214,6,0xFF00FF;
-		viewpoint 2,107,192,7,0xFF00FF;
-		viewpoint 2,179,184,8,0x00FF00;
-		viewpoint 2,208,154,9,0x00FF00;
-		viewpoint 2,120,267,10,0x00FF00;
-		viewpoint 2,192,267,11,0x00FF00;
-		viewpoint 2,133,183,12,0x00FF00;
-		viewpoint 2,156,360,13,0x00FF00;
-		viewpoint 2,75,91,14,0x00FF00;
-	goto L_MENU_2;
-L_REMOVE:
-		viewpoint 2,237,41,1,0x00FF00;
-		viewpoint 2,236,316,2,0xFF0000;
-		viewpoint 2,46,345,3,0x00FF00;
-		viewpoint 2,175,220,4,0xFF00FF;
-		viewpoint 2,8,134,5,0xFF00FF;
-		viewpoint 2,204,214,6,0xFF00FF;
-		viewpoint 2,107,192,7,0xFF00FF;
-		viewpoint 2,179,184,8,0x00FF00;
-		viewpoint 2,208,154,9,0x00FF00;
-		viewpoint 2,120,267,10,0x00FF00;
-		viewpoint 2,192,267,11,0x00FF00;
-		viewpoint 2,133,183,12,0x00FF00;
-		viewpoint 2,156,360,13,0x00FF00;
-		viewpoint 2,75,91,14,0x00FF00;
-  	goto L_MENU;
-L_NOTICE:
- 	mes "[Prontera Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Prontera Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Prontera Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Prontera.";
- 	goto L_MENU;
-L_END:
- 	mes "[Prontera Guide]";
- 	mes "Well, adventurer... I hope your journeys through Rune-Midgard are both fun and safe.";
-	cutin "prt_soldier",255; 
- 	close;
+	mes "Welcome to Prontera,";
+	mes "the beautiful capital of the";
+	mes "Rune-Midgarts Kingdom. If";
+	mes "you have questions or need^FFFFFF33333^000000 help finding something in the^FFFFFFco^000000 city, don't hesitate to ask.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Prontera Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				next;
+				switch(select("Swordman Association:^0000FFSanctuary^000000:Prontera Chivalry:Weapon Shop:Tool Shop:Inn:Trading Post:Pub:Library:Job Agency:Prontera Castle:City Hall:Cancel")) {
+				case 1:
+					mes "[Prontera Guide]";
+					mes "The Swordman Association,";
+					mes "which handles Job Changes";
+					mes "to the Swordman class, has";
+					mes "moved to Izlude. This facility";
+					mes "is just an empty building now.";
+					if (.@compass_check)
+						viewpoint 1,237,41,4,0x00FF00;
+					break;
+				case 2:
+					mes "[Prontera Guide]";
+					mes "The Prontera Sanctuary";
+					mes "handles Job Changes to";
+					mes "the Acolyte class, and can";
+					mes "be found in the northeast";
+					mes "corner of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,236,316,5,0xFF0000;
+					break;
+				case 3:
+					mes "[Prontera Guide]";
+					mes "The Prontera Chivralry,";
+					mes "which is responsible for";
+					mes "the safety of our capital, is";
+					mes "in Prontera's northwest corner.";
+					if (.@compass_check)
+						viewpoint 1,46,345,6,0x00FF00;
+					break;
+				case 4:
+					mes "[Prontera Guide]";
+					mes "The Weapon Shop";
+					mes "is located northeast";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,175,220,7,0xFF00FF;
+					break;
+				case 5:
+					mes "[Prontera Guide]";
+					mes "The Tool Shop";
+					mes "is located northwest";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,134,221,8,0xFF00FF;
+					break;
+				case 6:
+					mes "[Prontera Guide]";
+					mes "The Inns in Prontera are";
+					mes "located both to the east";
+					mes "and west of Prontera's";
+					mes "central fountain area.";
+					if (.@compass_check) {
+						viewpoint 1,204,191,9,0xFF00FF;
+						viewpoint 1,107,192,10,0xFF00FF;
+					}
+					break;
+				case 7:
+					mes "[Prontera Guide]";
+					mes "The Trading Post";
+					mes "can be found southeast";
+					mes "from the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,179,184,11,0x00FF00;
+					break;
+				case 8:
+					mes "[Prontera Guide]";
+					mes "The Pub is located";
+					mes "southeast of the fountain,";
+					mes "behind the Trading Post.";
+					if (.@compass_check)
+						viewpoint 1,208,154,12,0x00FF00;
+					break;
+				case 9:
+					mes "[Prontera Guide]";
+					mes "If you head north from";
+					mes "the central fountain, you'll";
+					mes "find an empty area in which";
+					mes "both branches of the Prontera";
+					mes "Library can be accessed if you";
+					mes "head towards the east or west.";
+					if (.@compass_check) {
+						viewpoint 1,120,267,13,0x00FF00;
+						viewpoint 1,192,267,14,0x00FF00;
+					}
+					break;
+				case 10:
+					mes "[Prontera Guide]";
+					mes "The Job Agency is";
+					mes "just southwest of the";
+					mes "central fountain area.";
+					if (.@compass_check)
+						viewpoint 1,133,183,15,0x00FF00;
+					break;
+				case 11:
+					mes "[Prontera Guide]";
+					mes "The Prontera Castle is";
+					mes "located at the northern";
+					mes "sector of this city. You can";
+					mes "go to the fields that are north";
+					mes "of Prontera by going through";
+					mes "the castle's rear exit.";
+					if (.@compass_check)
+						viewpoint 1,156,360,16,0x00FF00;
+					break;
+				case 12:
+					mes "[Prontera Guide]";
+					mes "The City Hall";
+					mes "is located in the";
+					mes "southwest corner";
+					mes "in our city of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,75,91,17,0x01FF01;
+					break;
+				case 13:
+					mes "[Prontera Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,4,0x00FF00;
+			viewpoint 2,237,41,5,0x0000FF;
+			viewpoint 2,46,345,6,0x00FF00;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,134,221,8,0xFF0000;
+			viewpoint 2,204,191,9,0xFF0000;
+			viewpoint 2,107,192,10,0xFF0000;
+			viewpoint 2,179,184,11,0x00FF00;
+			viewpoint 2,208,154,12,0x00FF00;
+			viewpoint 2,120,267,13,0x00FF00;
+			viewpoint 2,192,267,14,0x00FF00;
+			viewpoint 2,133,183,15,0x00FF00;
+			viewpoint 2,156,360,16,0x00FF00;
+			viewpoint 2,75,91,17,0x00FF00;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Prontera Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Prontera Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Prontera Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Prontera.";
+			break;
+		case 4:
+			mes "[Prontera Guide]";
+			mes "Well, adventurer...";
+			mes "I hope your journeys";
+			mes "through Rune-Midgard";
+			mes "are both fun and safe.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "prt_soldier",255;
+	end;
 }
 
-// East ----------------------------------------------------
-prontera,282,208,2	duplicate(Prt_Guide)	Guide#prt2	105
-//West --------------------------------------------------
-prontera,29,200,6	duplicate(Prt_Guide)	Guide#prt3	105
-// South -----------------------------------------------------
-prontera,160,29,0	duplicate(Prt_Guide)	Guide#prt4	105
-// North -----------------------------------------------
-prontera,151,330,4	duplicate(Prt_Guide)	Guide#prt5	105
+prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	105
 
+prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	105
 
-// Guard -----------------------------------------------------
-prontera,160,330,4	script	Guard#1::Prt_Guard	105,{
-	mes "[Guard]";
-	mes "Welcome to Prontera.";
-	close;
-}
-
-prontera,229,104,5	duplicate(Prt_Guard)	Guard#prt2	105
-prontera,223,98,8	duplicate(Prt_Guard)	Guard#prt3	105
-prontera,52,344,5	duplicate(Prt_Guard)	Guard#prt4	105
-prontera,47,339,5	duplicate(Prt_Guard)	Guard#prt5	105
-
+prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	105
 
-//---------------------------------------------------------------------------------------- Prontera Maze ----------------------------------------------------------------------------------\\
-prt_maze02,100,69,4	script	Guard#maz01	105,{
-	mes "[Guard]";
-	mes "Hey, I don't get your point but I say you should go home and rest rather than go inside the forest.  Don't you know the 'Demon' lurks there?";
-	mes "Naturally, Nobody came back on the hoof so I am not sure whether it really exists or not... well, Do as you want, dude.  I'm not your mother.";
-	close;
-}
-prt_maze02,110,69,4	script	Guard#maz02	105,{
-	mes "[Guard]";
-	mes "Phew...That geek who went inside last time never returned either.";
-	mes "I tried to stop him so many times but he never took me seriously.  He told me he needed herbs.";
-	mes "If I were him, I would never give up my life for stupid herbs.";
-	close;
-}
+prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	105
diff --git a/npc/guides/guides_um.txt b/npc/guides/guides_um.txt
new file mode 100644
index 000000000..9eb42ab06
--- /dev/null
+++ b/npc/guides/guides_um.txt
@@ -0,0 +1,122 @@
+//===== eAthena Script ======================================= 
+//= Umbala Guides
+//===== By: ================================================== 
+//= Dizzy, Translated by Celest; L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.5
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= Guide for hte City of Umbala
+//===== Additional Comments: ================================= 
+//= 1.1 Fixed location command format [Lupus]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================ 
+
+umbala,128,94,4	script	Adventurer#um	702,1,1,{
+	mes "[Adventurer]";
+	mes "This is a very strange place...";
+	mes "It's underdeveloped, and there";
+	mes "are a number of complex, winding paths...";
+	next;
+	mes "[Adventurer]";
+	mes "However, since I have been here";
+	mes "for months, I am familiar with";
+	mes "this area's geography and points";
+	mes "of interest in this village.";
+	mes "You're welcome to ask me about the";
+	mes "locations of buildings.";
+	next;
+	switch(select("Locations of buildings.:Remove marks on the mini map.:Quit.")) {
+	case 1:
+		mes "[Adventurer]";
+		mes "So, which one do you want to check?";
+		next;
+		switch(select("Chief's House:Shaman's House:Weapon Shop:Tool Shop:Bungee Jump Place:Cancel")) {
+		case 1:
+			mes "[Adventurer]";
+			mes "I have made a ^FF3355+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "Only the chief knows the language";
+			mes "of the outside world. So you'd";
+			mes "better visit him before anything else.";
+			viewpoint 1,66,250,2,0xFF3355;
+			break;
+		case 2:
+			mes "[Adventurer]";
+			mes "I have made a ^CE6300+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "The Utan Shaman has some";
+			mes "sort of mystic power...";
+			mes "People say she can create rough";
+			mes "enchanted stones, and divide a";
+			mes "pure enchanted stone into rough ones.";
+			viewpoint 1,217,186,3,0xCE6300;
+			break;
+		case 3:
+			mes "[Adventurer]";
+			mes "I have made a ^55FF33+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "The Utans are usually well armed";
+			mes "in preparation for attacks from";
+			mes "their enemies. Apparently, they";
+			mes "have been attacked from the outside many times in the past.";
+			viewpoint 1,126,154,4,0x55FF33;
+			break;
+		case 4:
+			mes "[Adventurer]";
+			mes "I have made a ^3355FF+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "There are many useful things for";
+			mes "traveling in the Tool Shop, so why don't you go look around?";
+			viewpoint 1,136,127,5,0x3355FF;
+			break;
+		case 5:
+			mes "[Adventurer]";
+			mes "I have made a ^00FF00+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "Umbala has a unique locale called";
+			mes "the 'Bungee Jump Place'.";
+			mes "If you're interested in testing";
+			mes "your courage, why don't you go";
+			mes "and partake in this Utan";
+			mes "ritual yourself?";
+			viewpoint 1,139,198,6,0x00FF00;
+			break;
+		case 6:
+			mes "[Adventurer]";
+			mes "If you want to remove the location";
+			mes "marks on your mini map, please";
+			mes "choose 'Remove marks on the mini map' menu.";
+		}
+		break;
+	case 2:
+		viewpoint 2,66,250,2,0xFF3355;
+		viewpoint 2,217,186,3,0xCE6300;
+		viewpoint 2,126,154,4,0x55FF33;
+		viewpoint 2,136,127,5,0x3355FF;
+		viewpoint 2,139,198,6,0x00FF00;
+		mes "[Adventurer]";
+		mes "I removed all the marks from your";
+		mes "mini map. Feel free to ask me";
+		mes "again if you want me to mark building locations.";
+		break;
+	case 3:
+		mes "[Adventurer]";
+		mes "It's fun to learn Utan culture on your own. Take care.";
+		break;
+	}
+	close;
+}
diff --git a/npc/guides/guides_umb.txt b/npc/guides/guides_umb.txt
deleted file mode 100644
index 67d25581d..000000000
--- a/npc/guides/guides_umb.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Umbala Guides
-//===== By: ================================================== 
-//= Dizzy, Translated by Celest
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= eAthena 1.0 +
-//===== Description: ========================================= 
-//= Umbala tour guide
-//===== Additional Comments: ================================= 
-//= 1.1 Fixed location command format [Lupus]
-//= 1.2 Optimized, updated common guide names [Lupus]
-//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
-//============================================================ 
-umbala,128,94,3	script	Ricard	702,{
-	mes "[Ricard]";
-	mes "This sure is an odd place, perhaps due to the fact that it hasn't been developed, and the roads here can be very perilous.";
-	next;
-	mes "[Ricard]";
-	mes "Good thing I've already been here for quite some time, so i know the details of the village quite well.";
-	mes "You may ask me for directions if you want.";
-	next;
-	menu "View buildings",-,"Clear indications",L_MENU_2,"Cancel",L_end1;
-
-	mes "[Ricard]";
-	mes "Where would you want to know about?";
-	next;
-	menu "Village Chieftain's house",-,"Village Shaman's house",L_room2,"Weapon shop",L_room3,"Equipment shop",L_room4,"Bungee Jumping Spot",L_room5,"Cancel",L_end2;
-
-		mes "[Ricard]";
-		mes "The chieftain lives ^FF0000here^000000, only he understands the languages of outsiders, perhaps you should see him first.";
-		viewpoint 1,68,251,1,0xFF0000;
-		close;
-
-	L_room2:
-		mes "[Ricard]";
-		mes "The shaman is known to possess mysterious powers, his house would be right ^996600here^000000, it is said that he can manipulate the elements of the Earth easily!";
-		viewpoint 1,218,187,2,0x996600;
-		close;
-
-	L_room3:
-		mes "[Ricard]";
-		mes "The weapon shop is ^009933over there^000000, because of threats from the outside world, they have been stocking up on all kinds of weapons.";
-		viewpoint 1,125,155,3,0x009933;
-		close;
-
-	L_room4:
-		mes "[Ricard]";
-		mes "^3333FFThat^000000 would be the equipment shop, they sell all types of useful equipment.";
-		mes "You should have a look there before continueing your travels.";
-		viewpoint 1,136,127,4,0x3333FF;
-		close;
-
-	L_room5:
-		mes "[Ricard]";
-		mes "In Umbala there is a 'Bungee Jumping Spot' not seen anywhere else in the world as you can see ^66CC33over here^000000,";
-		mes "You can try it out if you're feeling brave enough.";
-		viewpoint 1,138,198,5,0x66CC33;
-		close;
-
-	L_end2:
-		mes "[Ricard]";
-		mes "To remove all indications of the minimap come back and talk to me again.";
-		close;
-
-L_MENU_2:	
-		viewpoint 2,68,251,1,0xFF0000;
-		viewpoint 2,218,187,2,0x996600;
-		viewpoint 2,125,155,3,0x009933;
-		viewpoint 2,136,127,4,0x3333FF;
-		viewpoint 2,138,198,5,0x66CC33;
-		mes "[Ricard]";
-		mes "I have removed all the indications.";
-		mes "If you still need any directions, come back and talk to me again.";
-		close;
-
-L_end1:
-		mes "[Ricard]";
-		mes "Exploring around to know the paths better is fun, but do be careful.";
-		close;
-}
diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt
deleted file mode 100644
index 7ae6402e8..000000000
--- a/npc/guides/guides_yun.txt
+++ /dev/null
@@ -1,290 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Yuno Guides
-//===== By: ================================================== 
-//= KitsuneStarwind, usul, kobra_k88
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= eAthena 1.0 +
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
-//= Edited Miss Yoon text. Added town soldiers by usul. Edited town soldiers
-//= and added map location option for them. [kobra_k88]
-//= 1.1 Changed sprites and cutins to Schwarzwald Republic ones
-//= 1.2 Optimized, updated common guide names [Lupus]
-//= 1.3 Updated the mini map localization function. [Musashiden]
-//= 1.4 Juno Guides are now up to date according to iRO. [Musashiden]
-//= 1.5 Removed Duplicates [Silent].
-//= 1.6 Changed one of the Juno soldier's sprite. [Musashiden]
-//============================================================ 
-
-
-//=====================================================================================
-yuno,153,47,4	script	Juno Guide#yun1	700,{ 
-	mes "[Ms. Yoon]"; 
-	mes "A place that takes the vision of"; 
-	mes "the future, and gives it form in";
-	mes "the present. welcome to";
-	mes "the city of Juno!";
-	set @name$, "[Ms. Yoon]";
-	next;
-	callfunc "F_YunoLoc";
-}
-
-//=====================================================================
-yuno,334,182,4	script	Juno Soldier#yun1	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Among the Sage's weapons, there is";
-	mes "a 'Dagger of Counter'.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Its use is limited to the Sage";
-	mes "class, and it increases the chance";
-	mes "of inflicting critical attacks. So,";
-	mes "for Sages, that dagger can be very";
-	mes "useful, as well as make them look";
-	mes "stylish in battle.";
-	close;
-}
-
-//=====================================================================
-yuno,263,320,4	script	Juno Soldier#yun2	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "There is a holy shield named";
-	mes "'Sacred Mission' which can only be";
-	mes "used by Crusaders.";
-	next;
-	mes "[Juno Soldier]";
-	mes "It's a long and narrow shield with";
-	mes "an angel wing engraved in the";
-	mes "center of the front side. Against";
-	mes "Devil and Undead monsters, it is";
-	mes "especially powerful.";
-	close;
-}
-
-//=====================================================================
-yuno,227,292,4	script	Juno Soldier#yun3	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Near Juno, there exists a fallen";
-	mes "angel named 'False Angel'. It";
-	mes "feigns innocence, pretending to";
-	mes "bless adventurers and then stabbing";
-	mes "them in the back without any";
-	mes "warning.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Don't be fooled by its appearance,";
-	mes "or you'll find yourself in";
-	mes "trouble.";
-	close;
-}
-
-//=====================================================================
-yuno,165,283,4	script	Yuno Soldier#yun4	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Geographer...";
-	mes "That monster looks like a flower";
-	mes "blooming from the ground.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Strangely, it can extend its body a";
-	mes "long distance. Even if you're far";
-	mes "away from it, it can still pose a";
-	mes "threat.";
-	next;
-	mes "[Juno Soldier]";
-	mes "The name of this monster originated";
-	mes "from a story about a poor";
-	mes "geographer who, unfortunately, was";
-	mes "eaten by this monster while he was";
-	mes "immersed in his studies.";
-	close;
-}
-
-//=====================================================================
-yuno,150,283,4	script	Yuno Soldier#yun5	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "there is a monster near here known";
-	mes "as Lava Golem. This golem is made";
-	mes "from a stone heart whose power";
-	mes "happened to be amplified with magic";
-	mes "power when it was swept away by";
-	mes "molten rock.";
-	next;
-	mes "[Juno Soldier]";
-	mes "The lava dripping from its body is";
-	mes "so hot that it can melt down armor";
-	mes "and weapons made out of high";
-	mes "quality steel.";
-	next;
-	mes "[Juno Soldier]";
-	mes "You'd better be careful when you";
-	mes "encounter this monster. It will";
-	mes "damage armor and weapons in the";
-	mes "twinkling of an eye.";
-	close;
-}
-
-//=====================================================================
-yuno,165,228,4	script	Yuno Soldier#yun6	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "'Goat' is a monster that was an";
-	mes "antelope living in the high";
-	mes "mountains that was somehow turned";
-	mes "into a monster.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Even if you manage to dodge to its";
-	mes "horns, you still need to be wary of";
-	mes "its powerful legs.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Goat's legs are so strong because";
-	mes "it's always climbing cliffs when";
-	mes "it's not busy slaughtering the";
-	mes "innocent.";
-	close;
-}
-
-//=====================================================================
-yuno,150,228,4	script	Yuno Soldier#yun7	105,{
-	mes "[Juno Soldier]";
-	mes "Welcome to Juno, the city of";
-	mes "noble-mindedness.";
-	next;
-	mes "[Juno Soldier]";
-	mes "Have you ever";
-	mes "seen a Large Jellopy?";
-	mes "Those things are huuuge!";
-	next;
-	mes "[Juno Soldier]";
-	mes "It's hard to believe";
-	mes "that such a large and";
-	mes "shining jellopy even exists!";
-	close;
-}
-
-
-//======================================================================
-function	script	F_YunoLoc	{
-
-
-sM_Menu:
-		menu "Armory",-, "Tool Shop",sM_2, "Sage Castle (Sage Job Change Place)",sM_3, "Street of Book Stores",sM_4, "Juphero Plaza",sM_5,"Library of the Republic",sM_6, "Schwheicherbil Magic Academy",sM_7, "Monsters Museum",sM_8, "Forge",sM_9, "Airport", sM_10, "End Conversation",M_End;
-
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Armory";
-			mes "Thank you,";
-			mes "Have a good day.";
-			viewpoint 1,117,135,1,0xFF0000;
-			close;
-		sM_2: 
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Tool Shop";
-			mes "Thank you,";
-			mes "Have a good day.";
-			viewpoint 1,163,189,2,0x0000FF;
-			close;
-		sM_3: 
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Sage Castle";
-			mes "(Sage Job Change Place)";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,89,320,3,0x00FF00;
-			close;
-		sM_4: 
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Street of Book Stores";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,196,138,4,0x0000ff;
-			close;
-		sM_5: 
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Juphero Plaza";
-			mes "Thank you,"; 
-			mes "Have a good day.";
-			viewpoint 1,157,327,5,0x0000ff;
-			close;
-		sM_6: 
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Library of the Republic";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,335,204,6,0x00FF00;
-			close;
-		sM_7:
-			mes @name$;
-			mes "Please look at the mini map.";
-			mes "^FF3355+^000000 -> Schweicherbil Magic Academy";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,323,280,7,0xFF0000;
-			close;
-		sM_8:
-			mes @name$;
-			mes "Please look at the mini map.";
-			mes "^FF3355+^000000 -> Monster Museum";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,278,291,8,0x0000FF;
-			close;
-		sM_9:
-			mes @name$;
-			mes "Please look at the mini map.";
-			mes "^FF3355+^000000 -> Forge";
-			mes "The forge is located underneath";
-			mes "Armory";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,117,135,9,0xFF0000;
-			close;
-		sM_10:
-			mes @name$;
-			mes "Please look";
-			mes "at the mini map.";
-			mes "^FF3355+^000000 -> Airport";
-			mes "Thank you, Have a good day.";
-			viewpoint 1,53,214,10,0xFF0000;
-			close;
-
-	M_End:
-		mes @name$;
-		mes "A great city of wise men.";
-		mes "A city of Knowledge!";
-		mes "Welcome to Juno.";
-		close;
-}
diff --git a/npc/guild/aldeg/aldeg_kafras.txt b/npc/guild/aldeg/aldeg_kafras.txt
index 80c429a02..d14fa17f7 100644
--- a/npc/guild/aldeg/aldeg_kafras.txt
+++ b/npc/guild/aldeg/aldeg_kafras.txt
@@ -4,58 +4,59 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
-//= Provides Kafra services for guild members of Al De Baran Castles.
+//= Provides Kafra Staffs for guild members of Al De Baran Castles.
 //= Used in conjuction with function F_Kafra.
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
 //============================================================
 
 
 // Castle 1 ===============================================
-aldeg_cas01,218,170,0	script	Kafra Service#A01	117,{
+aldeg_cas01,218,170,0	script	Kafra Staff#A01	117,{
 	callfunc "F_GKafra", "aldeg_cas01", "Al De Baran";
 	end;
 OnRecvCastleA01:
-	if (GetCastleData("aldeg_cas01",9) < 1) disablenpc "Kafra Service#A01";
+	if (GetCastleData("aldeg_cas01",9) < 1) disablenpc "Kafra Staff#A01";
 	end;
 }
 
 // Castle 2 ===============================================
-aldeg_cas02,84,74,0	script	Kafra Service#A02	117,{
+aldeg_cas02,84,74,0	script	Kafra Staff#A02	117,{
 	callfunc "F_GKafra", "aldeg_cas02", "Al De Baran";
 	end;
 OnRecvCastleA02:
-	if (GetCastleData("aldeg_cas02",9) < 1) disablenpc "Kafra Service#A02";
+	if (GetCastleData("aldeg_cas02",9) < 1) disablenpc "Kafra Staff#A02";
 	end;
 }
 
 // Castle 3 ===============================================
-aldeg_cas03,118,76,0	script	Kafra Service#A03	117,{
+aldeg_cas03,118,76,0	script	Kafra Staff#A03	117,{
 	callfunc "F_GKafra", "aldeg_cas03", "Al De Baran";
 	end;
 OnRecvCastleA03:
-	if (GetCastleData("aldeg_cas03",9) < 1) disablenpc "Kafra Service#A03";
+	if (GetCastleData("aldeg_cas03",9) < 1) disablenpc "Kafra Staff#A03";
 	end;
 }
 
 // Castle 4 ===============================================
-aldeg_cas04,45,88,0	script	Kafra Service#A04	117,{
+aldeg_cas04,45,88,0	script	Kafra Staff#A04	117,{
 	callfunc "F_GKafra", "aldeg_cas04", "Al De Baran";
 	end;
 OnRecvCastleA04:
-	if (GetCastleData("aldeg_cas04",9) < 1) disablenpc "Kafra Service#A04";
+	if (GetCastleData("aldeg_cas04",9) < 1) disablenpc "Kafra Staff#A04";
 	end;
 }
 
 // Castle 5 ===============================================
-aldeg_cas05,31,190,0	script	Kafra Service#A05	117,{
+aldeg_cas05,31,190,0	script	Kafra Staff#A05	117,{
 	callfunc "F_GKafra", "aldeg_cas05", "Al De Baran";
 	end;
 OnRecvCastleA05:
-	if (GetCastleData("aldeg_cas05",9) < 1) disablenpc "Kafra Service#A05";
+	if (GetCastleData("aldeg_cas05",9) < 1) disablenpc "Kafra Staff#A05";
 	end;
 }
diff --git a/npc/guild/gefg/gefg_kafras.txt b/npc/guild/gefg/gefg_kafras.txt
index bd5eed509..6c14ac7f9 100644
--- a/npc/guild/gefg/gefg_kafras.txt
+++ b/npc/guild/gefg/gefg_kafras.txt
@@ -4,63 +4,64 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
-//= Provides Kafra services for guild members of Geffen Castles.
+//= Provides Kafra Staffs for guild members of Geffen Castles.
 //= Used in conjuction with function F_Kafra.
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
+//=	Corrected hte location of Castle 1's kafra.
 //============================================================
 
 
 // Castle 1 ===============================================
-//gefg_cas01,96,173,0	script	Kafra Service#G01	117,{
-gefg_cas01,35,37,0	script	Kafra Service#G01	117,{
+gefg_cas01,83,47,0	script	Kafra Staff#G01	117,{
 	callfunc "F_GKafra", "gefg_cas01", "Geffen";
 	end;
 OnRecvCastleG01:
-	if (GetCastleData("gefg_cas01",9) < 1) disablenpc "Kafra Service#G01";
+	if (GetCastleData("gefg_cas01",9) < 1) disablenpc "Kafra Staff#G01";
 	end;
 }
 
 
 // Castle 2 ===============================================
-gefg_cas02,23,66,3	script	Kafra Service#G02	117,{
+gefg_cas02,23,66,3	script	Kafra Staff#G02	117,{
 	callfunc "F_GKafra", "gefg_cas02", "Geffen";
 	end;
 OnRecvCastleG02:
-	if (GetCastleData("gefg_cas02",9) < 1) disablenpc "Kafra Service#G02";
+	if (GetCastleData("gefg_cas02",9) < 1) disablenpc "Kafra Staff#G02";
 	end;
 }
 
 
 // Castle 3 ===============================================
-gefg_cas03,116,89,5	script	Kafra Service#G03	117,{
+gefg_cas03,116,89,5	script	Kafra Staff#G03	117,{
 	callfunc "F_GKafra", "gefg_cas03", "Geffen";
 	end;
 OnRecvCastleG03:
-	if (GetCastleData("gefg_cas03",9) < 1) disablenpc "Kafra Service#G03";
+	if (GetCastleData("gefg_cas03",9) < 1) disablenpc "Kafra Staff#G03";
 	end;
 }
 
 
 // Castle 4 ===============================================
-gefg_cas04,59,70,3	script	Kafra Service#G04	117,{
+gefg_cas04,59,70,3	script	Kafra Staff#G04	117,{
 	callfunc "F_GKafra", "gefg_cas04", "Geffen";
 	end;
 OnRecvCastleG04:
-	if (GetCastleData("gefg_cas04",9) < 1) disablenpc "Kafra Service#G04";
+	if (GetCastleData("gefg_cas04",9) < 1) disablenpc "Kafra Staff#G04";
 	end;
 }
 
 
 // Castle 5 ===============================================
-gefg_cas05,61,52,5	script	Kafra Service#G05	117,{
+gefg_cas05,61,52,5	script	Kafra Staff#G05	117,{
 	callfunc "F_GKafra", "gefg_cas05", "Geffen";
 	end;
 OnRecvCastleG05:
-	if (GetCastleData("gefg_cas05",9) < 1) disablenpc "Kafra Service#G05";
+	if (GetCastleData("gefg_cas05",9) < 1) disablenpc "Kafra Staff#G05";
 	end;
 }
diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index 0f49643e2..e92ff25e0 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -27,6 +27,7 @@
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
 //= 1.3a fixed Defence / Economy underflow [Lupus] thanks2 kyoki
 //= 1.4 updated a couple mapannounces in OnAgitBreak. [L0ne_W0lf]
+//= 1.5 Changed hte names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
 //============================================================
 
 
@@ -118,7 +119,7 @@ function	script	F_GuildBreak	{
 	killmonsterall getarg(0);
 
 	Announce "Guild Base [" + GetCastleName(getarg(0)) + "] has been abandoned.",0;
-	disablenpc "Kafra Service#"+getarg(1);
+	disablenpc "Kafra Staff#"+getarg(1);
 
 	SetCastleData getarg(0),0,0;
 	return;
@@ -143,7 +144,7 @@ function	script	F_AgitBreak	{
 	Announce "The [" + GetCastleName(getarg(0)) + "] castle has been conquered by the [" + GetGuildName(@GID) + "] guild.",bc_map;
 	GetCastleData getarg(0),0,"::OnRecvCastle"+getarg(1);
 
-	disablenpc "Kafra Service#"+getarg(1);
+	disablenpc "Kafra Staff#"+getarg(1);
 	set @i, 3;
 
 	L_Loop:
diff --git a/npc/guild/gldfunc_kafra.txt b/npc/guild/gldfunc_kafra.txt
index bb967cb58..2c18d85c5 100644
--- a/npc/guild/gldfunc_kafra.txt
+++ b/npc/guild/gldfunc_kafra.txt
@@ -18,6 +18,8 @@
 //===== Additional Comments: =================================
 //= v1.2: All Guild kafra scripts use this function. [kobra_k88]
 //= 1.2a Added extra check for Contract with Kafra Guild Skill [Lupus]
+//= 1.2 Kafra's not charge for use of Cart Rentals [L0ne_W0lf]
+//=	Updated dialog and names.
 //============================================================
 
 function	script	F_GKafra	{
@@ -26,13 +28,13 @@ function	script	F_GKafra	{
 	if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
 
 	mes "[Kafra Service]";
-	mes "I am here to serve only ^5533FF" + GetGuildName(@GID) + "^000000 members. Please use different Kafra Service. Thank you.";
+	mes "I am contracted to provide service only for the ^ff0000" + GetGuildName(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
 	cutin "",255;
 	close;
 L_StartG:
-	set @wrpP[0], 0;
+	set @wrpP[0], 200;
 	set @wrpD$[0], getarg(1);
-	setarray @wrpC$[0], @wrpD$[0], "Cancel", "", "", "","";
-	callfunc "F_Kafra",2,0,0;
+	setarray @wrpC$[0], @wrpD$[0]+" ^880000"+@wrpP[0]+"^000000 z", "Cancel", "", "", "","";
+	callfunc "F_Kafra",2,0,0,0,800;
 	end;
 }
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 4c65bd543..fb1c7fe63 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= jAthena - kalen (1.0) & eAthena Team
 //===== Current Version: =====================================
-//= 1.6b
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -30,6 +30,7 @@
 //= 1.6 According to recent info u can re-install Guardians during WoE [Lupus]
 //= 1.6a Fix for guild manager recognizing [KarLaeda]
 //= 1.6b Fixed the chance for double invest, now 50% instead of 49% [Lupus]
+//= 1.7 Changed hte names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
 //============================================================
 
 
@@ -58,11 +59,11 @@ function	script	F_GldManager	{
 
 	//Novice Castles. (we don't need ELSE here. Menu has direct labels)
 	if(getarg(1) == "nguild_prt" || getarg(1) == "nguild_alde" || getarg(1) == "nguild_gef" || getarg(1) == "nguild_pay" )
-		menu "Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
+		menu "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
 
 	//Common WoE Castles	
 	menu 	"Guild Base Briefing",M_Base, "Commerce Investment",M_Comrc, "Defence Investment",M_Def, "Guardian Installation",M_Guard, 
-		"Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
+		"Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
 
 	//========================
 	M_Base:
@@ -325,7 +326,7 @@ function	script	F_GldManager	{
 		mes "[ "+getarg(0)+" ]";
 		if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
 		if (getgdskilllv(@GID,10001) == 0){
-			mes "Master, you don't have a contract with the Kafra Service Company.";
+			mes "Master, you don't have a contract with the Kafra Staff Company.";
 			mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
 			return 0;
 		}
@@ -341,18 +342,18 @@ function	script	F_GldManager	{
 					return 0;
 				}
 				set Zeny,Zeny-10000;
-				enablenpc "Kafra Service#"+getarg(4);
+				enablenpc "Kafra Staff#"+getarg(4);
 				SetCastleData getarg(1),9,1;
-				mes "You have created a contract with the Kafra Service Company.";
+				mes "You have created a contract with the Kafra Staff Company.";
 				next;
 				cutin "kafra_01",2;
-				mes "[ Kafra Service ]";
+				mes "[ Kafra Staff ]";
 				mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you.";
 				next;
 				cutin "kafra_01",255;
 				mes "[ "+getarg(0)+" ]";
 				//mes "Your employment contract lasts ^5533FF1 month^000000.  After this term is over you will have to create a new contract.";
-				mes "I think the Kafra Service will benefit our guild members.";
+				mes "I think the Kafra Staff will benefit our guild members.";
 				return 0;
 
 			sM_KafEnd:
@@ -366,28 +367,28 @@ function	script	F_GldManager	{
 			menu "Dismissal",-,"Cancel",sM_KafEnd2;
 
 				cutin "kafra_01",2;
-				mes "[ Kafra Service ]";
+				mes "[ Kafra Staff ]";
 				mes "Have I done anything wrong? If I did, will you please forgive me?";
 				next;
 				menu "Dismiss",-,"Cancel",ssM_KafEnd2;
 
-					mes "[ Kafra Service ]";
+					mes "[ Kafra Staff ]";
 					mes "It's unfortunate that I won't be able to serve your guild anymore....";
 					next;
-					disablenpc "Kafra Service#"+getarg(4);
+					disablenpc "Kafra Staff#"+getarg(4);
 					SetCastleData getarg(1),9,0;
 					cutin "kafra_01",255;
 					mes "[ "+getarg(0)+" ]";
 					mes "The Kafra has been dismissed.  But... we should really get a Kafra as soon as possible!";
 					return 0;
 				ssM_KafEnd2:
-					mes "[ Kafra Service ]";
+					mes "[ Kafra Staff ]";
 					mes "Thank you master, I'll do my best! ^^.";
 					cutin "kafra_01",255;
 					return 0;
 			sM_KafEnd2:
 				mes "[ "+getarg(0)+" ]";
-				mes "Master, I think you should keep the current Kafra Service because she is already trying her best to serve us";
+				mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
 				return 0;
 
 	//=========================
diff --git a/npc/guild/payg/payg_kafras.txt b/npc/guild/payg/payg_kafras.txt
index 992668fdc..92cd0a86b 100644
--- a/npc/guild/payg/payg_kafras.txt
+++ b/npc/guild/payg/payg_kafras.txt
@@ -4,62 +4,63 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //== Current Version: ========================================
-//= 1.2
+//= 1.3
 //== Compatible With: ========================================
 //= eAthena 0.1+; RO Episode 4+
 //== Description: ============================================
-//= Provides Kafra services for guild members of Payon Castles.
+//= Provides Kafra Staffs for guild members of Payon Castles.
 //= Used in conjuction with function F_Kafra.
 //== Additional Comments: ==================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
 //============================================================
 
 
 // Castle 1 =============
-payg_cas01,128,58,3	script	Kafra Service#Py01	117,{
+payg_cas01,128,58,3	script	Kafra Staff#Py01	117,{
 	callfunc "F_GKafra", "payg_cas01", "Payon";
 	end;
 OnRecvCastlePy01:
-	if (GetCastleData("payg_cas01",9) < 1) disablenpc "Kafra Service#Py01";
+	if (GetCastleData("payg_cas01",9) < 1) disablenpc "Kafra Staff#Py01";
 	end;
 }
 
 
 // Castle 2 =============
-payg_cas02,22,275,5	script	Kafra Service#Py02	117,{
+payg_cas02,22,275,5	script	Kafra Staff#Py02	117,{
 	callfunc "F_GKafra", "payg_cas02", "Payon";
 	end;
 OnRecvCastlePy02:
-	if (GetCastleData("payg_cas02",9) < 1) disablenpc "Kafra Service#Py02";
+	if (GetCastleData("payg_cas02",9) < 1) disablenpc "Kafra Staff#Py02";
 	end;
 }
 
 
 // Castle 3 =============
-payg_cas03,9,263,5	script	Kafra Service#Py03	117,{
+payg_cas03,9,263,5	script	Kafra Staff#Py03	117,{
 	callfunc "F_GKafra", "payg_cas03", "Payon";
 	end;
 OnRecvCastlePy03:
-	if (GetCastleData("payg_cas03",9) < 1) disablenpc "Kafra Service#Py03";
+	if (GetCastleData("payg_cas03",9) < 1) disablenpc "Kafra Staff#Py03";
 	end;
 }
 
 
 // Castle 4 =============
-payg_cas04,40,235,1	script	Kafra Service#Py04	117,{
+payg_cas04,40,235,1	script	Kafra Staff#Py04	117,{
 	callfunc "F_GKafra", "payg_cas04", "Payon";
 	end;
 OnRecvCastlePy04:
-	if (GetCastleData("payg_cas04",9) < 1) disablenpc "Kafra Service#Py04";
+	if (GetCastleData("payg_cas04",9) < 1) disablenpc "Kafra Staff#Py04";
 	end;
 }
 
 
 // Castle 5 =============
-payg_cas05,276,227,1	script	Kafra Service#Py05	117,{
+payg_cas05,276,227,1	script	Kafra Staff#Py05	117,{
 	callfunc "F_GKafra", "payg_cas05", "Payon";
 	end;
 OnRecvCastlePy05:
-	if (GetCastleData("payg_cas05",9) < 1) disablenpc "Kafra Service#Py05";
+	if (GetCastleData("payg_cas05",9) < 1) disablenpc "Kafra Staff#Py05";
 	end;
 }
diff --git a/npc/guild/prtg/prtg_kafras.txt b/npc/guild/prtg/prtg_kafras.txt
index b4b81d5d4..10e93dcad 100644
--- a/npc/guild/prtg/prtg_kafras.txt
+++ b/npc/guild/prtg/prtg_kafras.txt
@@ -4,63 +4,64 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //=== Current Version: ===================
-//= 1.2
+//= 1.3
 //=== Compatible With: ===================
 //= eAthena 0.1+; RO Episode 4+
 //=== Description: =====================
-//= Provides Kafra services for guild members of Prontera Castles.
+//= Provides Kafra Staffs for guild members of Prontera Castles.
 //= Used in conjuction with function F_Kafra.
 //=== Additional Comments: =================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= v1.3 Changed "Kafra Service" to "Kafra Staff" [L0ne_W0lf]
 //==============================
 
 
 // Castle 1 ========================
-prtg_cas01,96,173,0	script	Kafra Service#Pt01	117,{
+prtg_cas01,96,173,0	script	Kafra Staff#Pt01	117,{
 	callfunc "F_GKafra", "prtg_cas01", "Prontera";
 	end;
 OnRecvCastlePt01:
-	if (GetCastleData("prtg_cas01",9) < 1) disablenpc "Kafra Service#Pt01";
+	if (GetCastleData("prtg_cas01",9) < 1) disablenpc "Kafra Staff#Pt01";
 	end;
 }
 
 
 // Castle 2 ========================
-prtg_cas02,71,36,4	script	Kafra Service#Pt02	117,{
+prtg_cas02,71,36,4	script	Kafra Staff#Pt02	117,{
 	callfunc "F_GKafra", "prtg_cas02", "Prontera";
 	end;
 OnRecvCastlePt02:
-	if (GetCastleData("prtg_cas02",9) < 1) disablenpc "Kafra Service#Pt02";
+	if (GetCastleData("prtg_cas02",9) < 1) disablenpc "Kafra Staff#Pt02";
 	end;
 }
 
 
 // Castle 3 ========================
-//prtg_cas03,181,215,4	script	Kafra Service#Pt03	117,{
-prtg_cas03,39,99,4	script	Kafra Service#Pt03	117,{
+//prtg_cas03,181,215,4	script	Kafra Staff#Pt03	117,{
+prtg_cas03,39,99,4	script	Kafra Staff#Pt03	117,{
 	callfunc "F_GKafra", "prtg_cas03", "Prontera";
 	end;
 OnRecvCastlePt03:
-	if (GetCastleData("prtg_cas03",9) < 1) disablenpc "Kafra Service#Pt03";
+	if (GetCastleData("prtg_cas03",9) < 1) disablenpc "Kafra Staff#Pt03";
 	end;
 }
 
 
 // Castle 4 ========================
-prtg_cas04,258,247,4	script	Kafra Service#Pt04	117,{
+prtg_cas04,258,247,4	script	Kafra Staff#Pt04	117,{
 	callfunc "F_GKafra", "prtg_cas04", "Prontera";
 	end;
 OnRecvCastlePt04:
-	if (GetCastleData("prtg_cas04",9) < 1) disablenpc "Kafra Service#Pt04";
+	if (GetCastleData("prtg_cas04",9) < 1) disablenpc "Kafra Staff#Pt04";
 	end;
 }
 
 
 // Castle 5 ========================
-prtg_cas05,52,41,4	script	Kafra Service#Pt05	117,{
+prtg_cas05,52,41,4	script	Kafra Staff#Pt05	117,{
 	callfunc "F_GKafra", "prtg_cas05", "Prontera";
 	end;
 OnRecvCastlePt05:
-	if (GetCastleData("prtg_cas05",9) < 1) disablenpc "Kafra Service#Pt05";
+	if (GetCastleData("prtg_cas05",9) < 1) disablenpc "Kafra Staff#Pt05";
 	end;
 }
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index cf36e5e53..aa2290072 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -4,7 +4,7 @@
 //= eAthena Dev Team
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //===== Current Version: ===================================== 
-//= 5.4b
+//= 5.5b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: =========================================
@@ -46,6 +46,8 @@
 //= 5.5 Added proper Niflheim welcome message.	[L0ne_W0lf]
 //=	Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
 //= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf]
+//= 5.6 Further dialog updates, added  dynamic costs for cart and storage use. [L0ne_W0lf]
+//=	Updated some functions to handle Guild Kafras the way they should. 
 //============================================================ 
 
 
@@ -53,12 +55,16 @@
 //=   arg(0): Used to determine which welcome message to show.
 //=   arg(1): Used to determine which menu to display.
 //=   arg(2): Used to determine if the info menu is shown in F_KafInfo.
+//=   arg(3): Cost to use Storage
+//=   arg(4): Cost to Rent a Pushcart
 //==========================================================================
 function	script	F_Kafra	{
 	callfunc "F_ClearGarbage"; //Clear outdated, unused variables
 
-	mes "[Kafra]";
+	//Display Kafra Welcome Message
+	mes "[Kafra Employee]";
 	switch(getarg(0)){
+		//Default message (obsolete)
 		default:
 		case 0:
 			mes "Welcome to the";
@@ -67,66 +73,86 @@ function	script	F_Kafra	{
 			mes "are always on your side.";
 			mes "How may I assist you?";
 			break;
-		//Niflheim
+
+		//Niflheim specific message
 		case 1:
 			mes "^666666W-weeeelc-c-come";
 			mes "to th-the K-kaaafrrrra";
 			mes "C-coorpoor-r-ratioooonn...^000000";
 			break;
-		//Guilds Castles
+
+		//Guild Castle Kafra message
 		case 2:
 	 		mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
 			mes "The Kafra Coporation will stay with you wherever you go.";
 			break;
-		//Amatsu
+
+		//Amatsu specific message (obsolete)
 		case 3:
 			mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
 			mes "In either case, why not stay awhile?";
 			mes "The air is eternally heavy with the";
 			mes "scent of pleasant wildflowers.";
 			break;
-		//Louyang, Ayothaya
+
+		//Louyang and Ayothaya specific message (obsolete)
 		case 4:
 			mes "With our many Kafra";
 			mes "service locations, you're never";
 			mes "far from home.";
 			break;
+
+		//NPC has it's own welcome message. (Display nothing)
+		case 5:
+			break;
 	}
 	next;
 
 	M_Menu:
 		cleararray @K_Menu0$[0],"",7;
 	switch(getarg(1)){
-		//only Save & Storage
+		// Save and Storage only
 		case 1:
 			setarray @K_Menu0$[0],"Save","Use Storage","Cancel";
 			break;
-		//only Storage
+
+		// Storage only
 		case 2:
 			setarray @K_Menu0$[0],"Use Storage","Cancel";
 			break;
-		//Common w/o teleport
+
+		// No Teleport (Common)
 		case 3: 
 			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Guide","Check Other Information","Cancel";
 			break;
-		//Case 4 is Einbroch no tele message.
-		//Common w/o save and teleport
+
+		// Case 4 is Einbroch no tele message.
+
+		// No save, or teleport. (Common)
 		case 5:
 			setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Guide","Cancel";
 			break;
-		//Only storage and other info check
+
+		// Storage and Check Other Information only.
 		case 6:
 			setarray @K_Menu0$[0],"Use Storage","Guide","Check Other Information","Cancel";
 			break;
-		//Common Kafra
+
+		// Save, Storage, and Pushcart only (Kafra Warehouse)
+		case 7:
+			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Cancel";
+			break;
+
+		// Common Kafra Employee
 		default:
 			setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Guide","Check Other Information","Cancel";
 			break;
 	}
+
+	// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
 	if(getarg(0)==2) {
-	//Guilds Kafra (free Teleport, free Storage, Free Cart)
 		cleararray @K_Menu0$[0],"",7;
-		setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Cart","Use Teleport Service","Cancel";
+		setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
 	}
 	menu 	@K_Menu0$[0],K_Menu0,@K_Menu0$[1],K_Menu1,@K_Menu0$[2],K_Menu2,
 		@K_Menu0$[3],K_Menu3,@K_Menu0$[4],K_Menu4,@K_Menu0$[5],K_Menu5,
@@ -157,18 +183,23 @@ function	script	F_Kafra	{
 	K_Menuf:
 		if (@K_Menu0$[@num] == "Save") return;
 		if (@K_Menu0$[@num] == "Use Storage"){
-			//Don't charge for a common Kafra Storage in your Castle
-			if(getarg(0) == 2) callfunc "F_KafStor",2;
-			else callfunc "F_KafStor",0;
+			// Do not charge for Guild Storage
+			if(getarg(0) == 2) callfunc "F_KafStor",2,0,0;
+			else callfunc "F_KafStor",0,getarg(3),getarg(0);
 			next;
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Use Teleport Service"){
-			if(getarg(1) == 4){				//Check for Einbroch Tele notice
-				mes "[Kafra]";
-				mes "Because of the ^FF0000Limited Transport Agreement^000000, the Kafra Corporation cannot provide Teleport Services in the Schwarzwald Republic.";
+			// Display Einbroch "No Teleport Service" notice.
+			if(getarg(1) == 4){
+				mes "[Kafra Employee]";
+				mes "Because of the ^FF0000Limited";
+				mes "Transport Agreement^000000, the";
+				mes "Kafra Corporation cannot";
+				mes "provide Teleport Services";
+				mes "in the Schwaltzvalt Republic.";
 				next;
-				mes "[Kafra]";
+				mes "[Kafra Employee]";
 				mes "We ask that you please";
 				mes "use the Airship Service";
 				mes "instead. Thank you for your";
@@ -180,7 +211,7 @@ function	script	F_Kafra	{
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Rent a Pushcart"){
-			if(callfunc("F_KafCart",getarg(0)) == 1) next;
+			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) next;
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Guide"){
@@ -197,7 +228,7 @@ function	script	F_Kafra	{
 			end;
 		}
 		if (@K_Menu0$[@num] == "Use Guild Storage"){
-			callfunc "F_KafStor",1;
+			callfunc "F_KafStor",1,0;
 			next;
 			goto M_Menu;
 		}
@@ -207,9 +238,10 @@ function	script	F_Kafra	{
 
 // Storage Function =======================================================
 function	script	F_KafStor	{
+	// Unable to access Guild Storage (Busy)
 	if(getarg(0) == 1){
 		if(guildopenstorage(0) == 1){
-			mes "[Kafra]";
+			mes "[Kafra Employee]";
 			mes "I'm sorry but another guild member is using the guild storage";
 			mes "right now.  Please wait until that person is finished.";
 			close2;
@@ -219,30 +251,74 @@ function	script	F_KafStor	{
 		cutin "", 255;
 		close;
 	}
+
+	// Unable to access Normal Storage (Insufficient Basic Skills)
 	if(basicskillcheck() && getskilllv(1) < 6){
-		mes "[Kafra]";
-		mes "I am sorry but you have to be at least Novice level 6 if you want to use the storage.";
+		mes "[Kafra Employee]";
+		// Niflheim Specific Message
+		if (getarg(2) == 1) {
+			mes "^666666S-s-ssoooorry,";
+			mes "y-you're a-a-aaaa";
+			mes "Nooviiice... N-neeeds";
+			mes "B-basic sssskill l-level 6...^000000";
+			return;
+		}
+		mes "I'm sorry, but you";
+		mes "need the Novice's";
+		mes "Basic Skill Level 6 to";
+		mes "use the Storage Service.";
 		return;
 	}
-	//don't charge for common storage in Castle
+
+	// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
 	if(getarg(0) != 2){
-		//we'll use Free Ticket for Kafra Storage if available
-		if(countitem(7059)){
-			delitem 7059,1;
-		} else {
-			if(Zeny<40){
-				mes "[Kafra]";
-				mes "Dear you don't have enough money. The Storage fee is 40 Zeny.";
+		// Consume "Free Ticket for Kafra Storage" if available.
+		if(countitem(7059)) delitem 7059,1;
+		else {
+			if(Zeny<getarg(1)){
+				mes "[Kafra Employee]";
+				// Niflheim Specific Message
+				if (getarg(2) == 1) {
+					percentheal -50,-50;
+					mes "^666666Zeeeeeny...";
+					mes "M-more z-zeny...!";
+					mes "N-neeed 150... zeny...";
+					mes "Ergh! T-taking bl-blood~!^000000";
+					return;
+				}
+				//Standard Message
+				mes "I'm sorry, but you don't";
+				mes "have enough zeny to use";
+				mes "the Storage Service. Our";
+				mes "Storage access fee is "+getarg(1)+" zeny.";
 				return;
 			}
-			set Zeny, Zeny-40;
-			set RESRVPTS, RESRVPTS + (40/5);
+			set Zeny, Zeny-getarg(1);
+			set RESRVPTS, RESRVPTS + (getarg(1)/5);
 		}
 	}
-	mes "[Kafra]";
-	mes "Close this window to open your storage.";
-	mes "We hope to see you again soon.";
 
+	// Surpress the "End" message if in guild castle.
+	if (getarg(0) != 2) {
+		// Niflheim specific Message
+		if (getarg(2) == 1) {
+			percentheal 0,-10;
+			mes "[Kafra Employee]";
+			mes "^666666Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...^000000";
+		}
+		// Normal message
+		else {
+			mes "[Kafra Employee]";
+			mes "Here, let me open";
+			mes "your Storage for you.";
+			mes "Thank you for using";
+			mes "the Kafra Service.";
+		}
+	}
 	callfunc("F_CheckKafCode");	//check your storage password, if set
 
 	close2;
@@ -254,8 +330,9 @@ function	script	F_KafStor	{
 
 // Teleport Function ==================================================
 function	script	F_KafTele	{
-	mes "[Kafra]";
-	mes "Please set your destination.";
+	mes "[Kafra Employee]";
+	mes "Please choose";
+	mes "your destination.";
 	next;
 
 	menu 	@wrpC$[0],M_Wrp0, @wrpC$[1],M_Wrp1, @wrpC$[2],M_Wrp2, @wrpC$[3],M_Wrp3, 
@@ -284,14 +361,16 @@ function	script	F_KafTele	{
 
 	L_Warp:
 		if (@wrpC$[@num] == "Cancel") return;
-		// we'll use Free Ticket for Kafra Transportation if available
-		if(countitem(7060)){
-			delitem 7060,1;
-		} else {
+		// Consume "Free Ticket for Kafra Transportation" if available.
+		// Do not consume if in Guild castle
+		if(countitem(7060) > 0 && getarg(0) != 2) delitem 7060,1;
+		else {
 			if (Zeny<@wrpP[@num]){
-				mes "[Kafra]";
-				mes "Dear you don't have enough money. Please check your funds again.";
-				emotion e_cash;
+				mes "[Kafra Employee]";
+				mes "I'm sorry, but you don't have";
+				mes "enough zeny for the Teleport";
+				mes "Service. The fee to teleport";
+				mes "to "+@wrpD$[@num]+" is "+@wrpP[@num]+" zeny.";
 				close2;
 				cutin "", 255;
 				end;
@@ -320,56 +399,59 @@ function	script	F_KafTele	{
 
 // Cart Function ========================================================
 function	script	F_KafCart	{
+	// Ensure that the class wanting to rent a pushcart is a merchant
 	if(baseClass != Job_Merchant){
-		mes "[Kafra]";
-		mes "I'm sorry dear.  The Cart service is only provided for the Merchant and Blacksmith Class.";
-		return 1;
-	}
-	if(getskilllv(39)==0){
-		mes "[Kafra]";
-		mes "I'm sorry but you need the skill ^0000FF'Pushcart'^000000 to rent a cart.";
+		mes "[Kafra Employee]";
+		mes "I'm sorry, but the";
+		mes "Pushcart rental service";
+		mes "is only available to Merchants,";
+		mes "Blacksmiths, Master Smiths,";
+		mes "Alchemists and Biochemists.";
 		return 1;
 	}
-	if(checkcart() == 1){
-		mes "[Kafra]";
-		mes "Excuse me... but you already have a cart....";
-		emotion e_swt;
+	// Make sure the invoking character does not have a cart already
+	else if(checkcart() == 1){
+		mes "[Kafra Employee]";
+		mes "You already have";
+		mes "a Pushcart equipped.";
+		mes "Unfortunately, we can't";
+		mes "rent more than one to";
+		mes "each customer at a time.";
 		return 1;
 	}
-	//get Cart in Guild for free
-	if(getarg(0) == 2) goto L_FreeCart;
-	//use Free Ticket for the Cart Service if available
-	if(countitem(7061)){
-		delitem 7061,1;
-		goto L_FreeCart;
+
+	// Consume "Free Ticket for the Cart Service" if available.
+	// Do not consume if in Guild castle.
+	if(countitem(7061) > 0 && getarg(0) != 2) delitem 7061,1;
+	else {
+		mes "[Kafra Employee]";
+		mes "The Pushcart rental";
+		mes "fee is "+getarg(1)+" zeny. Would";
+		mes "you like to rent a Pushcart?";
+		next;
+		menu "Rent a Pushcart.",-, "Cancel.",M_End;
+			if(Zeny<getarg(1)){
+				mes "[Kafra Employee]";
+				mes "I'm sorry, but you";
+				mes "don't have enough";
+				mes "zeny to pay the Pushcart";
+				mes "rental fee of "+getarg(1)+" zeny.";
+				return 1;
+			}
+			set Zeny,Zeny-getarg(1);
+			set RESRVPTS, RESRVPTS + 48;
 	}
-	mes "[Kafra]";
-	mes "The Cart Fee is 800 Zeny.  Do you want to Rent a Cart?";
-	next;
-	menu "-Rent a Cart.",-, "-Cancel.",M_End;
+	setcart;
+	return 1;
 
-		if(Zeny<800){
-			mes "[Kafra]";
-			mes "Dear, you don't have enough Money. You need 800 Zeny.";
-			emotion e_cash;
-			return 1;
-		}
-		set Zeny,Zeny-800;
-		set RESRVPTS, RESRVPTS + 48;
-	L_FreeCart:
-		setcart;
-		mes "[Kafra]";
-		mes "Here is your cart.";
-		return 1;
-	M_End:
-		return 0;
+M_End:
+	return 0;
 }
 
 
 // Pass Function ===============================================================
 function	script	F_KafGuide	{
-
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "WIP...";
 	return;
 }
@@ -379,25 +461,26 @@ function	script	F_KafInfo	{
 
 	sM_Menu:
 //Uncomment next line to block Kafra Storage Protection
-//	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
-	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Storage Password Service",sM_KafCode, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
+//	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
+	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Storage Password Service",sM_KafCode, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
 
 	sM_ResChk:
-		mes "[Kafra]";
-		mes "Here is your current amount of special reserve points:";
-		mes "^0000ff"+RESRVPTS+"^000000.";
-		next;
-		mes "[Kafra]";
-		mes "Remember to continue using Kafra services such as Storage and Teleport, to earn more special reserve points.";
+		mes "[Kafra Employee]";
+		mes "Let's see...";
+		mes strcharinfo(0) + "...";
+		mes "Ah, you have a total of";
+		mes RESRVPTS+ " Special Reserve Points.";
 		next;
-		mes "[Kafra]";
-		mes "You can trade them in at the Kafra Main Office in Al De Baran for useful items and cool prizes.";
+		mes "[Kafra Employee]";
+		mes "You can exchange your";
+		mes "Special Reserve Points for";
+		mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
+		mes "convenient services to see the benefits of our rewards program.";
 		next;
 		if(getarg(0) == 1) return;
 		goto sM_Menu;
+
 	sM_KafLoc:
-		mes "[Kafra]";
-		mes "The flashing signals on your mini-map point to the locations of all of the Kafra Agents in this city.";
 		viewpoint 1,@viewpX[0],@viewpY[0],1,0xFF00FF;
 		viewpoint 1,@viewpX[1],@viewpY[1],2,0xFF00FF;
 		viewpoint 1,@viewpX[2],@viewpY[2],3,0xFF00FF;
@@ -420,16 +503,36 @@ function	script	F_KafInfo	{
 // End Function =====================================================
 //  arg(0): used to determine what message to display.
 //  arg(1): used to determine if save message is displayed.
+//  arg(2): used to display the name of the area you're saving in.
 //===================================================================
 function	script	F_KafEnd	{
-	mes "[Kafra]";
-	if(getarg(1)==1) mes "Your respawn point has been saved.";		// only shown when a player uses save
-	if(getarg(0)!=1) mes "Thank you for using Kafra Services.  We hope to see you again soon.";
-	if(getarg(0)==1) mes "We, Kafra Corporation.... Will be with you.... whenever.... wherever... therefore.... please don't forget us.....";
+	mes "[Kafra Employee]";
+	//Save
+	if(getarg(1)==1) {
+		mes "[Kafra Employee]";
+		mes "Your Respawn Point";
+		mes "has been saved here";
+		mes getarg(2)+".";
+		mes "Thank you for using";
+		mes "the Kafra Services.";
+	}
+
+	// Generic End
+	else if(getarg(0)==0) {
+		mes "We, here at Kafra Corporation,";
+		mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
+	}
+
+	// Niflheim End
+	else if(getarg(0)==1) {
+		percentheal 0,- 25;
+		mes "^666666Kaffffra n-never";
+		mes "diiiiiiiiiiiiiies. On...";
+		mes "On y-yooour siiiiide~^000000";
+	}
+
 	close2;
 	cutin "", 255;
-	emotion e_thx;
-	close;
 	end;
 }
 
@@ -452,7 +555,7 @@ function	script	F_CheckKafCode	{
 
 // Set / Change / Clear Storage Password Function ====================
 function	script	F_SetKafCode	{
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(#kafra_code) {
 		mes "Your storage is protected with a password. What would you do now?";
 		next;
@@ -467,7 +570,7 @@ function	script	F_SetKafCode	{
 		"Cancel",M_END;
 	}
 
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "At first, please enter your ^0000FFold password^000000.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0 || @code != #kafra_code-getcharid(3)-1337) {
@@ -478,7 +581,7 @@ function	script	F_SetKafCode	{
 	next;
 
 M_SET:
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0) {
@@ -487,7 +590,7 @@ M_SET:
 		goto M_END;
 	}
 	next;
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(Zeny < 5000) goto L_ZENY;
 	set Zeny,Zeny-5000;
 	set RESRVPTS, RESRVPTS + (5000/50);
@@ -499,7 +602,7 @@ M_SET:
 	goto M_END;	
 
 M_CLEAR:
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "Please, enter your password before its removal.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0) {
@@ -508,7 +611,7 @@ M_CLEAR:
 		goto M_END;
 	}
 	next;
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(Zeny < 1000) goto L_ZENY;
 	set Zeny,Zeny-1000;
 	set RESRVPTS, RESRVPTS + (1000/50);
diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt
index cd3c95772..190665407 100644
--- a/npc/kafras/kafras_alb.txt
+++ b/npc/kafras/kafras_alb.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,35 +13,52 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New Teleport list and prices [Lupus]
 //= 2.3 Can't save outside city anymore [Evera]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //=====================================================================
 
 
 // NorthWest -----------------------------------------------------------------
-alberta,28,229,8	script	Kafra::kaf_alberta	115,{
-	cutin "kafra_03",2;
+alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{
+	cutin "kafra_02",2;
 	callfunc "F_KafSetAlb";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,0,0,50,850;
 
 	M_Save:
 		savepoint "alberta",31,231;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
 // South ---------------------------------------------------------------------
-alberta,113,60,5	script	Kafra::kaf_alberta2	112,{
+alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSetAlb";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation~";
+	mes "The Kafra Services are";
+	mes "always here to support";
+	mes "you. So how can I be";
+	mes "of service today?";
+	callfunc "F_Kafra",5,0,0,50,850;
 
 	M_Save:
 		savepoint "alberta",117,57;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
 
diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
index 7ae7a6d8b..3d1de5ed7 100644
--- a/npc/kafras/kafras_alde.txt
+++ b/npc/kafras/kafras_alde.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.2
+//= 2.3
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,39 +13,123 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New teleport destinations, prices [Lupus]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Kafra Leilah is now a full NPC and no longer uses functions.
+//=	Added unique Kafra Welcome message.
+//=	Changed "Yuno" to "Juno"
 //=====================================================================
 
-
 // Kafra Main Office (Kafra Leilah) ------------------------------------
-aldeba_in,96,181,4	script	Kafra Leilah	113,{
+aldeba_in,96,181,4	script	Kafra Service	113,{
 	cutin "kafra_05",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
+	mes "[Kafra Leilah]";
+	mes "Hm...?";
+	mes "Oh, welcome to";
+	mes "the Kafra Corporation";
+	mes "Headquarters. Did you";
+	mes "need something?";
+	next;
+	switch(select("Save:Use Storage:Rent a Pushcart:Cancel")) {
+	case 1:
+		mes "[Kafra Leilah]";
+		mes "Your Respawn Point has";
+		mes "been saved here, inside";
+		mes "of the Kafra Corporation";
+		mes "Headquarters. Thank you.";
+		next;
 		savepoint "aldeba_in",96,179;
-		callfunc "F_KafEnd",0,1;
-
+		mes "[Kafra Leilah]";
+		mes "Please make use of";
+		mes "the Kafra Services that are";
+		mes "available throughout all of";
+		mes "Rune Midgard. Thank you for";
+		mes "visiting the Kafra Headquarters.";
+		close2;
+		break;
+	case 2:
+		if (zeny < 20) {
+			mes "[Kafra Leilah]";
+			mes "Excuse me, but it";
+			mes "seems that you don't";
+			mes "have the 20 zeny to pay";
+			mes "the Storage access fee...";
+		}
+		mes "[Kafra Leilah]";
+		mes "Although this facility is";
+		mes "exclusively intended for";
+		mes "the training of Kafra Employee";
+		mes "and administrative functions,";
+		mes "I'll access your Storage for you.";
+		next;
+		set zeny,zeny-20;
+		set RESRVPTS, RESRVPTS + (20/5);
+		mes "[Kafra Leilah]";
+		mes "In the future, please";
+		mes "ask the Kafra Employee on";
+		mes "duty if you wish to use";
+		mes "any of the Kafra Services.";
+		mes "Thank you for your patronage.";
+		close2;
+		openstorage;
+		break;
+	case 3:
+		mes "[Kafra Leilah]";
+		mes "My apologies, but I'm";
+		mes "not on duty. I'd assist you";
+		mes "if I could, but actually don't";
+		mes "have any available Pushcarts.";
+		mes "Why don't you ask another Kafra";
+		mes "Employee for assistance?";
+		next;
+		mes "[Kafra Leilah]";
+		mes "Kafra Employees are";
+		mes "stationed all over the";
+		mes "Rune Midgard continent,";
+		mes "and you should be able to find";
+		mes "plenty outside in Al De Baran.";
+		close2;
+		break;
+	case 4:
+		mes "[Kafra Leilah]";
+		mes "^666666*Whew...*^000000";
+		mes "Great, because I'm";
+		mes "actually on my break";
+		mes "right now. Choosing";
+		mes "''Cancel'' was a good";
+		mes "move on your part.";
+		close2;
+		break;
+	}
+	cutin "",255;
+	end;
 }
 
-// South --------------------------------------------------
-aldebaran,143,119,4	script	Kafra::kaf_aldebaran	113,{
+// Central --------------------------------------------------
+aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{
 	cutin "kafra_05",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpP[0], 1200, 1200, 1800, 1700;
-	setarray @wrpD$[0], "Geffen", "Yuno" , "Izlude", "Coal Mine(Dead Pit)";
+	setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,1,20,600;
 
 	M_Save:
 		savepoint "aldebaran",143,109;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Al De Baran";
 }
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
index d833769ed..22314b8ee 100644
--- a/npc/kafras/kafras_com.txt
+++ b/npc/kafras/kafras_com.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.21
+//= 2.3
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=  When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
@@ -20,28 +22,36 @@
 //= Corrected savepoint for in town kafra.[kobra_k88]
 //= 2.2 New teleport destinations, prices [Lupus]
 //= 2.21 from Pharos, both warps are now 1200z [Evera]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message2.
 //=====================================================================
 
 
 // In Town ==============================================>\\
-comodo,200,148,4	script	Kafra::kaf_comodo	721,{
+comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "Umbala";
+	setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala";
 	setarray @wrpP[0], 1800, 1200, 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,1000;
 
 	M_Save:
 		savepoint "comodo",204,143;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in Pyros Lighthouse";
 }
 
 // Comodo Pharos Lighthouse (Beacon Island) ===================>\\
-cmd_fild07,135,134,4	script	Kafra::kaf_cmd_fild07	721,{
+cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo", "Morroc";
@@ -49,9 +59,15 @@ cmd_fild07,135,134,4	script	Kafra::kaf_cmd_fild07	721,{
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,1000;
 
 	M_Save:
 		savepoint "cmd_fild07",127,134;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the town of Comodo";
 }
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index c482f9039..a93a3cf0e 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.5
+//= 2.6
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option.  Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: =================================
 //= v1.1 Now using functions. Added teleport service for Orc Dungeon
 //= and Coal Mine Kafras.
@@ -24,94 +26,111 @@
 //= 2.4 Now Baby Merchant can pass Merch Job Quest w/o probs [Lupus]
 //= 2.41 Removed useless warp points, already nullified by func call [Evera]
 //= 2.5 Allowed Culvert save point [Evera]
+//= 2.6 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
+//=	Removed Ant Hell Kafra Employees.
 //===============================================================
 
-
-//<============================= Ant Hell ==============================>\\
-// Mocfild04 -----------------------------------------
-moc_fild04,230,329,3	script	Kafra::kaf_moc_fild04	115,{
-
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
-		savepoint "moc_fild04",231,339;
-		callfunc "F_KafEnd",0,1;
-}
-
-// Mocfild15 --------------------------------------------
-moc_fild15,264,260,3	script	Kafra::kaf_moc_fild15	115,{
-
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
-		savepoint "moc_fild15",266,271;
-		callfunc "F_KafEnd",0,1;
-}
-
 //<============================= Byalan Island ============================>\\
-izlu2dun,106,58,8	script	Kafra::kaf_izlu2dun	115,{
+izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
 
 	cutin "kafra_03",2;
 	if(BaseJob==Job_Novice && job_merchant_q3>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
-	callfunc "F_Kafra",0,2,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",0,2,1,120,1200;
 
 	M_Save:
 		savepoint "izlu2dun",87,170;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at Byalan Island";
 }
 
 
 //<============================ Culvert Sewers ============================>\\
-prt_fild05,290,224,1	script	Kafra::prt_fild05	114,{
+prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{
 	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,1,1;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",0,1,1,40,0;
 
 	M_Save:
 		savepoint "prt_fild05",274,243;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
 }
 
 
 //<=========================== Coal Mine (Dead Pitt) =======================>\\
-mjolnir_02,83,361,4	script	Kafra::kaf_mjolnir_02	114,{
-	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,6,1;
+mjolnir_02,83,362,4	script	Kafra Employee::kaf_mjolnir_02	116,{
+	cutin "kafra_02",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,6,1,100,0;
 
 	M_Save:
 		savepoint "mjolnir_02",98,352;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at Mjolnir Dead Pit";
 }
 
 
 //<=============================== Morroc Ruins ============================>\\
-moc_ruins,61,156,5	script	Kafra::moc_ruins	114,{
+moc_ruins,61,156,5	script	Kafra Employee::moc_ruins	114,{
 	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,2,1;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",5,2,1,90,1200;
 
 	M_Save:
 		savepoint "moc_ruins",41,141;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1," at the Pyramids";
 }
 
 
 //<================================ Orc Dungeon ============================>\\
-gef_fild10,73,340,4	script	Kafra::kaf_gef_fild10	115,{
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,6,1;
+gef_fild10,73,340,5	script	Kafra Employee::kaf_gef_fild10	116,{
+	cutin "kafra_02",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",0,6,1,130,0;
 
 	M_Save:
 		savepoint "gef_fild10",54,326;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at the Orc Dungeon";
 }
 
 //<============================== Treasure Island ==========================>\\
-alb2trea,59,69,1	script	Kafra::kaf_alb2trea	117,{
+alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
 	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,2,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",0,2,1,50,0;
 
 	M_Save:
 		savepoint "alb2trea",92,64;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,0,"at Sunken Ship";
 }
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index d05e2b02e..2e1ae6fcf 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,71 +13,66 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New warps and prices [Evera]
 //= 2.3 Can't save outside city [Evera]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
+//=	Removed North and West Kafra
 //=====================================================================
 
 
 // South =====================================
-geffen,120,62,8	script	Kafra::kaf_geffen	115,{
+geffen,120,62,0	script	Kafra::kaf_geffen	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,0,0,30,750;
 
 	M_Save:
 		savepoint "geffen",119,40;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
 // East ==============================================
-geffen,203,123,3	script	Kafra::geffen2	114,{
+geffen,203,123,2	script	Kafra::geffen2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",5,0,0,30,750;
 
 	M_Save:
 		savepoint "geffen",200,124;
-		callfunc "F_KafEnd",0,1;
-}
-
-// North ==============================================
-geffen,116,202,3	script	Kafra::geffen3	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "geffen",110,199;
-		callfunc "F_KafEnd",0,1;
-}
-
-// West =========================================
-geffen,37,116,6	script	Kafra::geffen4	117,{
-	cutin "kafra_01",2;
-	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "geffen",43,108;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
 
 // Function: Sets variables for Geffen Kafras -------------------
 function	script	F_KafSetGef	{
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(Dead Pit)";
+	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
 	setarray @wrpP[0], 1200, 1200, 1200, 1700;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	setarray @viewpX[0], 120, 203, 116, 37;
-	setarray @viewpY[0], 62, 123, 202, 116;
+	setarray @viewpX[0], 120, 203;
+	setarray @viewpY[0], 62, 123;
 	return;
 }
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
index ef9332b80..8362f26b5 100644
--- a/npc/kafras/kafras_izl.txt
+++ b/npc/kafras/kafras_izl.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.21
+//= 2.3
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,16 +13,19 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New teleport destinations, prices [Lupus]
 //= 2.21 Warps to Prontera rather than Payon now [Evera]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message2.
 //=====================================================================
 
-
-izlude,134,87,3	script	Kafra::kaf_izlude	117,{
+izlude,134,87,3	script	Kafra Employee::kaf_izlude	117,{
 	cutin "kafra_01",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
@@ -32,9 +35,15 @@ izlude,134,87,3	script	Kafra::kaf_izlude	117,{
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,1,40,820;
 
 	M_Save:
-		savepoint "izlude",96,107;
-		callfunc "F_KafEnd",0,1;
+		savepoint "izlude",94,103;
+		callfunc "F_KafEnd",0,1,"in the city of Izlude";
 }
diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt
index 3b0c8f793..d7578ce6f 100644
--- a/npc/kafras/kafras_mor.txt
+++ b/npc/kafras/kafras_mor.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,63 +13,58 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New teleport destinations, prices [Lupus]
 //= 2.3 Can't save outside city [Evera[
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
+//=	removed West and East Kafra
 //=====================================================================
 
 
 // South ================================
-morocc,156,97,4	script	Kafra::kaf_morocc	115,{
-	cutin "kafra_03",2;
+morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{
+	cutin "kafra_05",2;
 	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,60,930;
 
 	M_Save:
 		savepoint "morocc",156,46;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
 // North =================================
-morocc,162,271,4	script	Kafra::kaf_morocc2	114,{
+morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",5,0,0,60,930;
 
 	M_Save:
 		savepoint "morocc",157,272;
-		callfunc "F_KafEnd",0,1;
-}
-
-// West  =================================
-morocc,28,167,6	script	Kafra::kaf_morocc3	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "morocc",31,164;
-		callfunc "F_KafEnd",0,1;
-}
-
-// East =================================
-morocc,292,211,4	script	Kafra::kaf_morocc4	112,{
-	cutin "kafra_06",2;
-	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "morocc",294,207;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
 // Function: Sets variables for Morroc Kafras --------------------------------
 function	script	F_KafSetMoc	{
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Lighthouse";
+	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
 	setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
index 1ab7f61b3..4a1955e2f 100644
--- a/npc/kafras/kafras_new.txt
+++ b/npc/kafras/kafras_new.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.8
+//= 3.0
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option.  Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==============================================
 //= v1.1 Now using functions
 //= v2.1 Added Niflheim Kafra by Dizzy
@@ -28,131 +30,195 @@
 //= 2.7c Added missing kafra in Lighthalzen, thanks to Muad_Dib [Vicious]
 //= 2.8 Removed warps from Umbala and Gonryun, thanks Drakee [Evera]
 //= 2.9 Fixed an incorrect savepoint (inside the hotel) the map was wrong.
-
+//= 3.0 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
 //==========================================================================
 
 // Amatsu ------------------------------------------------------------------
-amatsu,102,149,4	script	Kafra::kaf_amatsu	116,{
+amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",3,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "amatsu",116,94;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Amatsu";
 }
 
 // Ayothaya ----------------------------------------------------------------
-ayothaya,212,169,5	script	Kafra::kaf_ayothaya	116,{
+ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",4,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "ayothaya",149,69;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Ayotaya";
 }
 
 // Einbech -----------------------------------------------------------------
 
-einbech,181,132,4	script	Kafra::kaf_einbech	860,{
+einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
 	cutin "kafra_08",2;
-	callfunc "F_Kafra",0,4,1;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,4,1,40,850;
 
 	M_Save:
 		savepoint "einbech",182,124;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the town of Einbech";
 }
 
 // Einbroch (North-East) ---------------------------------------------------
-einbroch,242,205,5	script	Kafra::kaf_einbroch	115,{
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,4,1;
+einbroch,242,205,5	script	::kaf_einbroch	860,{
+	cutin "kafra_08",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,4,1,50,800;
 
 	M_Save:
 		savepoint "einbroch",238,198;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
 // Einbroch (East) ---------------------------------------------------------
-einbroch,59,203,5	script	Kafra::kaf_einbroch2	117,{
-	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,4,1;
+einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
+	cutin "kafra_09",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,4,1,50,800;
 
 	M_Save:
 		savepoint "einbroch",240,197;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
 // Gonryun -----------------------------------------------------------------
-gonryun,159,122,4	script	Kafra::kaf_gonryun	116,{
+gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",0,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "gonryun",160,62;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Kunlun";
 }
 
 // Lighthalzen--------------------------------------------------------------
 
 //Outside the hotel
-lighthalzen,164,100,4	script	Kafra::kaf_lighthalzen	860,{
+lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
 	cutin "kafra_08",2;
-	callfunc "F_Kafra",0,4,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,4,1,40,800;
 
 	M_Save:
 		savepoint "lighthalzen",158,94;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 // Entrance
-lighthalzen,191,320,4	script	Kafra::kaf_lighthalzen2	861,{
+lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{
 	cutin "kafra_09",2;
-	callfunc "F_Kafra",0,4,1;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,4,1,40,800;
 
 	M_Save:
 		savepoint "lighthalzen",194,313;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 //Inside the hotel
-lhz_in02,237,284,4	script	Kafra::kaf_lhz_in02	861,{
+lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
 	cutin "kafra_09",2;
-	callfunc "F_Kafra",0,4,1;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,4,1,40,800;
 
 	M_Save:
 		savepoint "lhz_in02",278,215;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 // Louyang -----------------------------------------------------------------
-louyang,210,104,5	script	Kafra::kaf_louyang	117,{
+louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
 	cutin "kafra_01",2;
-	callfunc "F_Kafra",4,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "louyang",217,92;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Louyang";
 }
 
 // Umbala Kafra ------------------------------------------------------------
-umbala,128,133,4	script	Kafra::kaf_umbala	115,{
-	cutin "kafra_03",2;
+umbala,128,133,4	script	Kafra Employee::kaf_umbala	721,{
+	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo";
 	setarray @wrpP[0], 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,0;
 	M_Save:
 		savepoint "umbala",126,131;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Umbala";
 }
 
 // Niflheim ----------------------------------------------------------------
-niflheim,202,180,3	script	Kafra::kaf_niflheim	791,{
-	callfunc "F_Kafra",1,2,1;
-//this SAVE isn't used. Niflheim Kafra doesn't SAVE
+niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
+	callfunc "F_Kafra",1,2,1,150,0;
+
 	M_Save:
 		savepoint "niflheim",192,182;
-		callfunc "F_KafEnd",1,1;
+		callfunc "F_KafEnd",1,1,"in the city of Niflheim";
 }
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
index 52959f7f9..57c9b88f4 100644
--- a/npc/kafras/kafras_pay.txt
+++ b/npc/kafras/kafras_pay.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.32
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option.  Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==============================================
 //= v1.1 Now using functions
 //= v2.1b Minor changes to function calls.  Using arguments.
@@ -21,40 +23,59 @@
 //= 2.3 1 New Kafra, fixed save menus
 //= 2.31 New prices [Evera]
 //= 2.32 Minor fix to Payon Archer Kafra [SinSloth]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //==========================================================================
 
 
 // Main Town, South ----------------------------------------------------------
-payon,181,104,4	script	Kafra::kaf_payon	113,{
+payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,1,60,930;
 
 	M_Save:
 		savepoint "payon",160,58;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
 // Main Town, Middle North --------------------------------------------------
 payon,175,226,4	script	Kafra::kaf_payon2	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "The Kafra services are";
+	mes "always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,1,60,930;
 
 	M_Save:
 		savepoint "payon",257,242;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
 // Archer Village ------------------------------------------------------------
 pay_arche,55,123,0	script	Kafra::kaf_payon3	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,5,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,5,1,90,1200;
 
 	M_Save:
 		savepoint "pay_arche",49,144;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at the Payon Dungeon";
 }
 
 
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
index 773505036..5b85950bb 100644
--- a/npc/kafras/kafras_pron.txt
+++ b/npc/kafras/kafras_pron.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.5
+//= 2.7
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
@@ -24,61 +26,93 @@
 //= 2.41 New prices [Evera]
 //= 2.5 Can't save outside city [Evera]
 //= 2.6 Fixed central Kafra position (146,86 -> 146,98) [L0ne_W0lf]
+//= 2.7 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
 //=====================================================================
 
 
 // North ==================================
-prontera,152,326,4	script	Kafra::kaf_prontera	112,{
+prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{
 	cutin "kafra_06",2;
-	callfunc "F_Kafra",0,1,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation~";
+	mes "The Kafra Services are";
+	mes "always here to support";
+	mes "you. So how can I be";
+	mes "of service today?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 M_Save:
 	savepoint "prontera",157,327;
-	callfunc "F_KafEnd",0,1;
+	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // SOUTH ======================================
-prontera,151,29,8	script	Kafra::kaf_prontera2	116,{
-	cutin "kafra_02",2;
+prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{
+	cutin "kafra_03",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "prontera",150,33;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 //WEST=========================================
-prontera,29,207,6	script	Kafra::kaf_prontera3	113,{
+prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "prontera",33,208;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // East ===========================================
-prontera,282,200,4	script	Kafra::kaf_prontera4	115,{
-	cutin "kafra_03",2;
+prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{
+	cutin "kafra_04",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "prontera",281,203;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // Center ===========================================
-prontera,146,89,6	script	Kafra::kaf_prontera5	117,{
+prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 M_Save:
 	savepoint "prontera",116,73;
-	callfunc "F_KafEnd",0,1;
+	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
index fe3897656..dee43ef12 100644
--- a/npc/kafras/kafras_yun.txt
+++ b/npc/kafras/kafras_yun.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,46 +13,65 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 Now only warps to Aldebaran [Evera]
 //= 2.3 Updated a kafra location. [Musashiden]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //=====================================================================
 
 
 // Center ------------------------------------------------------------------
-yuno,152,187,4	script	Kafra::kaf_yuno	113,{
-	cutin "kafra_05",2;
+yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{
+	cutin "kafra_08",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",158,125;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
 // South East --------------------------------------------------------------
-yuno,327,108,4	script	Kafra::kaf_yuno2	113,{
-	cutin "kafra_05",2;
+yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{
+	cutin "kafra_08",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",328,101;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
 // East --------------------------------------------------------------------
-yuno,277,221,4	script	Kafra::kaf_yuno3	117,{
-	cutin "kafra_01",2;
+yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
+	cutin "kafra_09",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",274,229;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
 
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index e34367421..9e99bdc3d 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,277 +1,187 @@
 //===== eAthena Script ======================================= 
 //= Dye Maker
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1 
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 Spell Checked [Nexon] 
+//= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //============================================================ 
 
-
-
-// Dye Maker JavaDullihan =======================
-morocc_in,146,99,2	script	Dye Maker JavaDullihan	122,{
-	mes "[Dye Maker JavaDullihan]";
-	mes "Oh... What a Beautiful day today.";
-	mes "This is a perfect day to make Dyestuffs";
+morocc_in,146,99,3	script	Java Dullihan	58,{
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_Weight < 200) {
+		mes "- Wait a moment! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please come back later -";
+		mes "- after you put some items into kafra storage. -";
+		close;
+	}
+	mes "[Dye Maker Java Dullihan]";
+	mes "Wow...";
+	mes "Such a nice day. Days like this are perfect to make dyes.";
 	next;
-	menu "-Talk",M_Talk,"-Make Dyestuffs",M_Make,"-Cancel",M_End;
-	
-	M_Talk:
-		mes "[Dye Maker JavaDullihan]";
-		mes "I don't have much to say...";
-		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "But if you want to know about my past, I'm sure I have a few stories to tell.";
-		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "Would you like to here some?";
+	switch(select("Talk:Make Dyestuffs:Cancel")) {
+	case 1:
+		mes "[Dye Maker Java Dullihan]";
+		mes "Erm, I don't really have much to say to you. But, if you would like me to tell you about my life, I can do that. It's a little long and boring, but would you like to listen?";
 		next;
-		menu "-Sure, why not.",sM_0a,"-Maybe some other time.",sM_0b;
-		
-		sM_0a:
-			mes "[Dye Maker JavaDullihan]";
-			mes "My father had been making dyestuffs since I was young... ..";
-			mes "I can still picture him making dyestuffs all day long.";
+		if (select("Listen:Don't Listen") == 1) {
+			mes "[Dye Maker Java Dullihan]";
+			mes "As long as I can remember, my father has been making dyes. He used to spend countless hours making dyes of different colors. Even when my mother passed away, he never stopped.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Even during the time of my mother's passing, my father kept making dyestuffs without end.";
-			mes "This made me angry at him.  How could he keep making dyestuffs at a time like that?";
+			mes "[Dye Maker Java Dullihan]";
+			mes "At one point in my life, I became rebellious and ran away from home. I didn't want to be stuck to the family business and wanted to try other things.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "I just couldn't understand what my father was thinking.  I became very disappointed in him.";
-			mes "My fathers actions made me despise Dye Making, so I ran away from home.  I survived by doing a variety of odd jobs.";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Anyways...";
+			mes "I eventually wound up back home to carry on the family tradition, making dyes for 15 years already. I guess it was really in my blood.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "However, as you can see, I ended up becoming a Dye Maker just like my father.";
-			mes "It's been 15 years since I first started making these goddamn things...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Something I realized these days is that now I can understand my father. Why my father devoted everything to making dyes...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Now that I've been doing this for as long as I have... I think I can finally understand why my father fell in love with his job.";
+			mes "[Dye Maker Java Dullihan]";
+			mes "In the middle of all that tedious and hard work, he probably felt the magic of those colors passing on so many dreams for other people.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Why he sacrificed everything he had for this job...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "It was probably for those dreams that he tried so hard to make dyes for his customers...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Maybe it was because of how the colors got more and more beautiful each time...";
-			mes "Maybe he wanted to find his own perfect color...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Heh... How do I know this? Well, that's the way I feel right now. Since a couple years ago, I've been able to hear what the colors were saying...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "I now have his feel for the colors... because... I am working with the same passion he had when he was living.";
-			mes "I am able to feel the colors from within my soul.  I know it's hard to understand, but you will see what I mean.";
-			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Father, I make these dyes for you....";
-			close;
-
-		sM_0b:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hahahaha... I guess I can't blame ya, who wants to here about a plain old dye maker's life anyhow.... Hahahaha...";
+			mes "[Dye Maker Java Dullian]";
+			mes "Just watch. Someday, I'm going to succeed in making the color my father wanted to, but never got the chance to make.";
 			close;
+		}
+		mes "[Dye Maker Java Dullihan]";
+		mes "Ahahahaha...";
+		mes "Well, I guess no one would want to listen to a measly dyemaker's story anyway. Hahaha....";
+		close;
 
-	M_Make:
-		mes "[Dye Maker JavaDullihan]";
-		mes "Alright! I will make the exact color you want.  The cost of the dyestuff will depend on its quality.";
-		mes "Don't not be itimitaded by the prices, they are all my Masterpieces.";
+	case 2:
+		mes "[Dye Maker Java Dullihan]";
+		mes "Great! If you want it, I'll make it for you. I promise I'll make you the color you want. But what color dye would you like to make? The fee is different depending on the color.";
 		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "So what color do you want?";
+		mes "[Dye Maker Java Dullihan]";
+		mes "Why, do you ask? Just remember that there are colors that are easy to make, and those that require more effort and work. Please don't think the fee is too expensive.";
 		next;
-		menu 	"-Scarlet Dyestuffs",sM_Scarlet, "-Lemon Dyestuffs",sM_Lemon, "-Cobaltblue Dyestuffs",sM_Cobaltblue,
-			"-Darkgreen Dyestuffs",sM_Darkgreen, "-Orange Dyestuffs",sM_Orange, "-Violet Dyestuffs",sM_Violet,
-			"-White Dyestuffs",sM_White, "-Black Dyestuffs",sM_Black;
-		
-		sM_Scarlet:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Scarlet Dyestuffs, I need ^0000ff30 Red Herbs, 1 Counteragent and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make0, "Cancel",sm_Cancel;
-			
-			sm_Make0:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				set Zeny, Zeny - 3000;
-				delitem 507,30;
-				delitem 973,1;
-				delitem 713,1;
-				getitem 975,1;
-				mes "Missing text.";
-				mes "Under development";
-				close;
-
-		sM_Lemon:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Um... to make a Lemon Dyestuffs I need ^0000ff30 Yellow Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make1,"Cancel",sm_Cancel;
-			
-			sm_Make1:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(508) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 508,30;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3000;
-				getitem 976,1;
-				close;
-
-		sM_Cobaltblue:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Cobaltblue Dyestuffs, I need ^0000ff20 Blue Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "Blue Herbs are a little bit difficult to work with, so the cost of labor will be 3500 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make2,"Cancel",sm_Cancel;
-			
-			sm_Make2:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 20) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3500) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,20;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3500;
-				getitem 978,1;
-				close;
-
-		sM_Darkgreen:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Darkgreen Dyestuffs, I need ^0000ff5 Blue Herbs, 20 Green Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "There are a lot of ingredients so please try to remember them all.  The cost of labore will be 5000 Zeny.  Are you still interested?";
-			mes "Ok are you ready?";
-			next;
-			menu "Make Dyestuffs",sm_Make3,"Cancel",sm_Cancel;
-
-			sm_Make3:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 5) || (countitem(511) < 20) || (countitem(508) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713)<1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,5;
-				delitem 511,20;
-				delitem 508,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 979,1;
-				close;
-
-		sM_Orange:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Orange Dyestuffs, I need ^0000ff20 Red Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "The cost of labor is 5000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make4,"Cancel",sm_Cancel;
-
-			sm_Make4:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 20) || (countitem(508) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 507,20;
-				delitem 508,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 980,1;
-				close;
-
-		sM_Violet:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Violet Dyestuffs, I need ^0000ff10 Blue Herbs, 30 Red Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 5000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make5,"Cancel",sm_Cancel;
-
-			sm_Make5:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 10) || (countitem(507) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,10;
-				delitem 507,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 981,1;
-				close;
-
-		sM_White:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Umm... To make a White Dyestuffs, I need ^0000ff30 White Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make6,"Cancel",sm_Cancel;
-
-			sm_Make6:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(509) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 509,30;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3000;
-				getitem 982,1;
-				close;
-
-		sM_Black:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Black Dyestuffs, I need ^0000ff30 Red, Yellow, and Green Herbs, 5 Blue Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "This is the most difficult and time consuming dye to make, so I will have to charge a 7000 Zeny labor fee.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make7,"Cancel",sm_Cancel;
-
-			sm_Make7:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 30) || (countitem(508) < 30) || (countitem(511) < 30) || (countitem(510) < 5) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713)<1)) goto sl_LowItems;
-				if(Zeny < 7000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 507,30;
-				delitem 508,30;
-				delitem 511,30;
-				delitem 510,5;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 7000;
-				getitem 983,1;
-				close;
-
-
-			sl_LowItems:
-				mes "Hmm... you don't have enough of the items needed for the dyestuffs.  Come back when you do.";
-				close;
-
-			sl_LowZeny:
-				mes "You don't have enough zeny.  I need to make a living ya know....";
-				close;
+		mes "[Dye Maker Java Dullihan]";
+		mes "The color of the dye is special, made with all my heart and soul.";
+		next;
+		switch(select("Scarlet Dyestuffs:Lemon Dyestuffs:Cobaltblue Dyestuffs:Darkgreen Dyestuffs:Orange Dyestuffs:Violet Dyestuffs:White Dyestuffs:Black Dyestuffs:Cancel")) {
+		case 1: callsub S_MakeDye,1,1; break;
+		case 2: callsub S_MakeDye,2,1; break;
+		case 3: callsub S_MakeDye,3,2; break;
+		case 4: callsub S_MakeDye,4,3; break;
+		case 5: callsub S_MakeDye,5,4; break;
+		case 6: callsub S_MakeDye,6,4; break;
+		case 7: callsub S_MakeDye,7,4; break;
+		case 8: callsub S_MakeDye,8,4; break;
+		case 9:
+			mes "[Dye Maker Java Dullihan]";
+			mes "Eeeehhhh!! What's this? You change your mind now!? So disappointing...";
+			close;
+		}
 
-			sm_Cancel:
-				mes "[Dye Maker JavaDullihan]";
-				mes "How could you have change your mind so quickly?... oh boy...";
-				close;
-	M_End:
+	case 3:
+		mes "[Dye Maker Java Dullihan]";
+		mes "I'm not bragging or anything. But I have the skills to make dyestuff. If you ever need dyestuff, please come to me. I'll make them for you at a reasonable price.";
+		close;
+	}
+
+S_MakeDye:
+	mes "[Dye Maker Java Dullihan]";
+	switch(getarg(0)) {
+	case 1:
+		mes "Mmm... I need 30 Red Herbs, 1 Counteragent, and 1 Empty Bottle to make Red Dyestuffs. The fee is only 3000 zeny to make it.";
+		setarray .@items[0], 507,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,975;
+		break;
+	case 2:
+		mes "Mmm... I need 30 Yellow Herbs, 1 Couneragent, and 1 Empty Bottle to make Lemon Dyestuffs. The fee is only 3000 zeny to make it.";
+		setarray .@items[0], 508,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,976;
+		break;
+	case 3:
+		mes "Mmm... I need 20 Blue Herbs, 1 Counteragent, and 1 Empty Bottle to make Cobaltblue Dyestuff. It's hard to use the Blue Herb, so the fee is going to be 3500 zeny.";
+		setarray .@items[0], 510,20, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3500;
+		set .@dyestuff,978;
+		break;
+	case 4:
+		mes "Mmm... I need 5 Blue Herbs, 20 Green Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Darkgreen Dyestuffs. Don't get all of the materials confused. The fee is only 5000 zeny.";
+		setarray .@items[0], 510,5, 511,20, 508,20, 974,1, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,979;
+		break;
+	case 5:
+		mes "Mmm... I need 20 Red Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Orange Dyestuff. The fee is going to be 5000 zeny.";
+		setarray .@items[0], 507,20, 508,20, 974,1, 0,0, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,980;
+		break;
+	case 6:
+		mes "Mmm... I need 10 Blue Herbs, 30 Red Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Violet Dyestuffs. The fee will be 5000 zeny.";
+		setarray .@items[0], 510,10, 507,30, 974,1, 0,0, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,981;
+		break;
+	case 7:
+		mes "Mmm... I need 30 White Herbs, 1 Counteragent, and 1 Empty bottle to make White Dyestuffs. The fee will be 3000 zeny.";
+		setarray .@items[0], 509,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,982;
+		break;
+	case 8:
+		mes "Mmm... I need 30 of each Red, Yellow, and Green Herb, 5 Blue Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle. The process takes longer and more effort than the others, so it is going to be 7000 zeny.";
+		setarray .@items[0], 507,30, 508,30, 511,30, 510,5, 974,1;
+		set .@cost,7000;
+		set .@dyestuff,983;
+		break;
+	}
+	next;
+	mes "[Dye Maker Java Dullihan]";
+	switch(getarg(1)) {
+	case 1: mes "Ah! I think you would have everything ready. Would you like to start the process?"; break;
+	case 2: mes "Okay! I believe you would have everything ready. Would you like to start the process?"; break;
+	case 3: mes "Okay! I believe you would have everything ready. Shall we begin the process?"; break;
+	case 4: mes "Okay! I believe you would have everything prepared. Would you like to start the process?"; break;
+	}
+	next;
+	if (select("Make Dyestuffs:Cancel") == 1) {
+		if (.@item[0] < .@item[1] || .@item[2] < .@item[3] || .@item[4] < .@item[5] || .@item[6] < .@item[7] || .@item[8] < .@item[9] || countitem(973)== 0 || countitem(713) == 0 || Zeny < .@cost) {
+			mes "[Dye Maker Java Dullihan]";
+			mes "Hmmm. Not enough...";
+			mes "I don't think I'll be able to make the color you want with those materials. Why don't you go get some more materials...?";
+			close;
+		}
+		delitem .@item[0],.@item[1];
+		delitem .@item[2],.@item[3];
+		delitem .@item[4],.@item[5];
+		delitem .@item[6],.@item[7];
+		delitem .@item[8],.@item[9];
+		delitem 973,1; //Counteragent
+		delitem 713,1; //Empty Bottle
+		set zeny,zeny-.@cost;
+		getitem .@dyestuff,1;
+		mes "[Dye Maker Java Dullihan]";
+		mes "Hmm... It came out pretty well. A very rich color. Of course I'll be trying harder to make a more charming color...";
+		next;
+		mes "[Dye Maker Java Dullihan]";
+		mes "Well, then. Stop by whenever you need more dyes.";
 		close;
-}
+	}
+	mes "[Dye Maker Java Dullihan]";
+	mes "Eeeehhhh!! What's this?";
+	mes "You change your mind now!? So disappointing...";
+	return;
+}
\ No newline at end of file
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index da8ec57ec..82cb21986 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,158 +1,152 @@
 //===== eAthena Script ======================================= 
 //= Hair Dyer
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
 //= Hair Dyer with standard palletes
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-
-
-
-// HairDyer Jovovich -----------------------------------------------------
-prt_in,243,168,4	script	HairDyer Jovovich	91,{
-	mes "[HairDyer Jovovich]";
-	mes "Welcome to my Hair Dying shop.";
+prt_in,243,168,4	script	Jovovich	91,{
+	mes "[Hairdresser Jovovich]";
+	mes "Welcome~!";
+	mes "How may I help you?";
 	next;
-	mes "[HairDyer Jovovich]";
-	mes "Oh my..... your hair does not look like it's in good condition.  I think it needs some special care.  Come have a seat.";
-	qMenu0:
+	mes "[Hairdresser Jovovich]";
+	if (sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	else {
+		if (rand(20) > 11) {
+			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "Would you let me treat your hair? Please?";
+		}
+		else mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?";
+	}
 	next;
-	menu "-Dye Hair.",M_0, "-Price List",M_1, "-Hair Tips",M_2, "-Cancel",M_End;
-
-	M_0:
-		mes "[HairDyer Jovovich]";
-		mes "Hohoho~ That's a good choice~~ Any time is a good time to change your hair color.";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "Please choose a color that suits you";
-		next;
-		menu	"-Red please.",sM_a, "-Yellow please.",sM_b,  "-Violet please.",sM_c, "-Orange please.",sM_d, "-Green please.",sM_e,
-			"-Blue please.",sM_f, "-White please.",sM_g, "-Black please.",sM_h, "-Sorry, I changed my mind.",M_End;
-
-		sM_a:
-			mes "[HairDyer Jovovich]";
-			if(countitem(975) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			set Zeny, Zeny - 1000;
-			delitem 975,1;
-			mes "Ok. I will dye you hair red.";
-			setlook 6,8;
-
+	while(1) {
+		switch(select("Dye Hair:Tips and Information:Cancel")) {
+		case 1:
+			mes "[Hairdresser Jovovich]";
+			mes "Yes yes, good choice~";
+			mes "Well then, this is your chance for a make-over, your chance to blossom in beauty! Choose the color you would like.";
+			next;
+			while(1) {
+				if (.@choose_success == 1) {
+					mes "[Hairdresser Jovovich]";
+					mes "What do you think? Did you want a different color?";
+					next;
+					if (select("Yes:No") == 1) {
+						mes "[Hairdresser Jovovich]";
+						mes "Okay! Choose the color that you would like.";
+						next;
+					}
+					else  {
+						mes "[Hairdresser Jovovich]";
+						mes "Hmm, I'm sort of disappointed. I wanted to do a better job. But I promise I'll do it better next time. Please come again~";
+						close;
+					}
+				}
+
+				while(1) {
+					switch(select("Red, please.:Yellow, please.:Violet, please.:Orange, please.:Green, please.:Blue, please.:White, please.:Black, please.:Actually, I like my hair as it is.")) {
+					case 1: set .@headpalette,8; break;
+					case 2: set .@headpalette,1; break;
+					case 3: set .@headpalette,2; break;
+					case 4: set .@headpalette,3; break;
+					case 5: set .@headpalette,4; break;
+					case 6: set .@headpalette,5; break;
+					case 7: set .@headpalette,6; break;
+					case 8: set .@headpalette,7; break;
+					case 9:
+						if (.@choose_success != 0) {
+							mes "[Hairdresser Jovovich]";
+							mes "You must like your hair color~";
+							close;
+						}
+						mes "[Hairdresser Jovovich]";
+						mes "Eehh~? You're not going to dye your hair? I'm a little sad...";
+						close;
+					}
+
+					if (.@headpalette == getlook(7)) {
+						mes "[Hairdresser Jovovich]";
+						mes "Eh? But that's the hair color you already have. Please choose a different color.";
+						next;
+					}
+					else {
+						switch(.@headpalette) {
+						case 1: callsub S_NoDye,976,"yellow";
+						case 2: callsub S_NoDye,978,"violet";
+						case 3: callsub S_NoDye,979,"orange";
+						case 4: callsub S_NoDye,980,"green";
+						case 5: callsub S_NoDye,981,"blue";
+						case 6: callsub S_NoDye,982,"white"; 
+						case 7: callsub S_NoDye,983,"black";
+						Case 8: callsub S_NoDye,975,"red";
+						}
+						if (zeny < 1000) {
+							mes "[Hairdresser Jovovich]";
+							mes "The fee is 1000 zeny. Do you not have enough...?";
+							close;
+						}
+
+						switch(.@headpalette) {
+						case 1: delitem 976,1; //Lemon_Dyestuffs
+						case 2: delitem 978,1; //Violet_Dyestuffs
+						case 3: delitem 979,1; //Orange_Dyestuffs
+						case 4: delitem 980,1; //Darkgreen_Dyestuffs
+						case 5: delitem 981,1; //Cobaltblue_Dyestuffs
+						case 6: delitem 982,1; //White_Dyestuffs
+						case 7: delitem 983,1; //Black_Dyestuffs
+						case 8: delitem 975,1; //Scarlet_Dyestuffs
+						}
+						set Zeny,Zeny-1000;
+						setlook 6,.@headpalette;
+						set .@choose_success,1;
+						break;
+					}
+
+				}
+
+			}
+
+		case 2:
+			mes "[Hairdresser Jovovich]";
+			mes "When you're feeling down , when you get dumped, when you want to impress someone, or even when you just want to stand out...";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "For that special place and time, wouldn't you want a hairstyle of your very own? As long as you have the appropriate dyestuff, I will make your hair look wonderful.";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "And try not to worry too much about the fee. Acquiring beauty is the same as acquiring everything. Hehe~";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "* Fees and Information *";
+			mes "- 1 Dyestuff item of the color of hair you want.";
+			mes "- 1000 zeny fee.";
+			break;
+
+		case 3:
+			mes "[Hairdresser Jovovich]";
+			mes "Men or Women...";
+			mes "Everyone has the right and obligation to be beautiful.";
 			close;
+		}
 
-		sM_b:
-			mes "[HairDyer Jovovich]";
-			if(countitem(976) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair yellow.";
-			setlook 6,1;
-			delitem 976,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_c:
-			mes "[HairDyer Jovovich]";
-			if(countitem(981) < 1) goto  sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Violet.";
-			setlook 6,2;
-			delitem 981,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_d:
-			mes "[HairDyer Jovovich]";
-			if(countitem(980) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Orange.";
-			setlook 6,3;
-			delitem 980,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_e:
-			mes "[HairDyer Jovovich]";
-			if(countitem(979) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Green.";
-			setlook 6,4;
-			delitem 979,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_f:
-			mes "[HairDyer Jovovich]";
-			if(countitem(978) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair blue.";
-			setlook 6,5;
-			delitem 978,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_g:
-			mes "[HairDyer Jovovich]";
-			if(countitem(982) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair white.";
-			setlook 6,6;
-			delitem 982,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_h:
-			mes "[HairDyer Jovovich]";
-			if(countitem(983) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair black.";
-			setlook 6,7;
-			delitem 983,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sL_NoDye:
-			mes "For me to dye your hair, I'll need the appropriate Dyestuff.  Please check my price list for the information.";
-			close;
-
-		sL_Zeny:
-			mes "I'm sorry but you don't have enough money.";
-			close;
-
-	M_1:
-		mes "[HairDyer Jovovich]";
-		mes "Here is the list of colors you can choose from and their prices:";
-		mes " - Red: 1000 zeny, 1 Scarlet Dyestuff";
-		mes " - Yellow: 1000 zeny, 1 Lemon Dyestuff";
-		mes " - Violet: 1000 zeny, 1 Violet Dyestuff";
-		mes " - Orange: 1000 zeny, 1 Orange Dyestuff";
-		mes " - Green: 1000 zeny, 1 DarkGreen Dyestuff";
-		mes " - Blue: 1000 zeny, 1 CobaltBlue Dyestuff";
-		mes " - White: 1000 zeny, 1 White Dyestuff";
-		mes " - Black: 1000 zeny, 1 Black Dyestuff";
-		goto qMenu0;
-
-	M_2:
-		mes "[HairDyer Jovovich]";
-		mes "When your just feeling gloomy, of if you just got dumped... if you want to look hot, or when you just need to look better.....";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "Change the color of your hair and your bound to regain your confidence and add an extra bounce to your step!!";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "For the small price of 1000 zeny and a Dyestuff, I can give you the haircolor you've been dreaming of!";
-		next;
-		goto qMenu0;
+	}
 
-	M_End:
-		mes "[HairDyer Jovovich]";
-		mes "I think... every human being has the right to become beautiful......";
+S_NoDye:
+	if (countitem(getarg(0)) == 0) {
+		mes "[Hairdresser Jovovich]";
+		mes "Eh?! But you need the item '"+getitemname(getarg(0))+"' to dye your hair "+getarg(1)+"...";
 		close;
-}
+	}
+}
\ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index dafee7de8..b2e645f5c 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.0b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //=	Moved all Cooking related NPCs to their own section.
 //=	Re-alphabetized sections. Some of them were out of place.
 //=	Removed commented out shops.
+//= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================
@@ -86,6 +87,7 @@ cmd_fild07,277,85,4	shop	Armor Dealer	101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-
 ein_in01,106,27,4	shop	One Hand Weapon Dealer	850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1
 ein_in01,109,27,4	shop	Two Hand Weapon Dealer	850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1
 ein_in01,119,26,4	shop	Weapon Dealer	855,1247:-1,1248:-1,1249:-1,13000:-1
+ein_in01,189,15,1	shop	Tool Dealer	850,1750:-1,1753:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
 einbroch,138,66,4	shop	Flu Mask Dealer#ein	850,5114:-1,2218:-1
 einbroch,82,199,4	shop	Paddler#ein	855,512:-1,645:-1,1750:-1,501:-1
 //Official Gunslingers shops.
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 8dd319a63..70fb39edd 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -133,21 +133,24 @@ npc: npc/quests/Bard_Quest.txt
 npc: npc/guides/guides_alb.txt
 npc: npc/guides/guides_alde.txt
 npc: npc/guides/guides_ama.txt
-npc: npc/guides/guides_com.txt
+npc: npc/guides/guides_ayo.txt
+npc: npc/guides/guides_cmd.txt
 npc: npc/guides/guides_einbe.txt
 npc: npc/guides/guides_einbr.txt
 npc: npc/guides/guides_gef.txt
+npc: npc/guides/guides_gon.txt
+npc: npc/guides/guides_hu.txt
 npc: npc/guides/guides_izl.txt
+npc: npc/guides/guides_juno.txt
 npc: npc/guides/guides_louyang.txt
 npc: npc/guides/guides_lhz.txt
-npc: npc/guides/guides_mor.txt
+npc: npc/guides/guides_moc.txt
+npc: npc/guides/guides_nif.txt
 npc: npc/guides/guides_pay.txt
 npc: npc/guides/guides_pron.txt
-npc: npc/guides/guides_yun.txt
-npc: npc/guides/guides_umb.txt
-npc: npc/guides/guides_nif.txt
-npc: npc/guides/guides_hu.txt
 npc: npc/guides/guides_rachel.txt
+npc: npc/guides/guides_um.txt
+
 // --------------------------------------------------------------
 // ---------------- Kafras & Cool Event Corp. -------------------
 npc: npc/kafras/functions_kafras.txt