diff --git a/trunk/dist/game/data/html/teleporter/30233.htm b/trunk/dist/game/data/html/teleporter/30233.htm
index 034aced467..39b2ab0130 100644
--- a/trunk/dist/game/data/html/teleporter/30233.htm
+++ b/trunk/dist/game/data/html/teleporter/30233.htm
@@ -3,9 +3,9 @@
 Or miss home terribly. Or need to go help a dying friend. Or really missing seeing the sea.<br>
 That said, do you need to get somewhere?<br>
 (If your <font color="LEVEL">main class</font> is <font color="LEVEL">Lv. 76</font> or below, you can teleport for free.)<br>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_Chat 1">"Teleport me, please."</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_showTeleports">"Teleport me, please."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 002">"I want to exchange some Dimension Diamonds."</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest NoblesseTeleport">[Noblesse Only] "Teleport me, please."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_showNoblesSelect">[Noblesse Only] "Teleport me, please."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest TeleportToRaceTrack" msg="811;Monster Racetrack">"I want to go to the Arena and Monster Race Track for free."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest TeleportToFantasy" msg="811;Fantasy Isle">"I want to go to Fantasy Isle for free."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest CharacterBirthday">"I need to call Alegria."</Button>
diff --git a/trunk/dist/game/data/teleporters/Esmeralda.xml b/trunk/dist/game/data/teleporters/Esmeralda.xml
new file mode 100644
index 0000000000..451db5f28f
--- /dev/null
+++ b/trunk/dist/game/data/teleporters/Esmeralda.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/teleporterData.xsd">
+	<npc id="30233"> <!-- Esmeralda -->
+		<teleport type="NORMAL">
+			<location npcStringId="1010023" x="146798" y="25796" z="-2012" feeCount="6900" /> <!-- Town of Aden -->
+			<location npcStringId="1010013" x="82958" y="53213" z="-1495" feeCount="33000" /> <!-- Town of Oren -->
+			<location npcStringId="1010022" x="105918" y="109759" z="-3165" feeCount="6100" /> <!-- Hardin's Private Academy -->
+			<location npcStringId="1010744" x="124904" y="61992" z="-3920" feeCount="1300" /> <!-- Enchanted Valley (Lv. 100) -->	
+			<location npcStringId="1010014" x="85391" y="16228" z="-3672" feeCount="13000" /> <!-- Ivory Tower -->
+			<location npcStringId="1010585" x="142065" y="81300" z="-3000" feeCount="2000" /> <!-- Forest of Mirrors (Lv. 40) -->			
+			<location npcStringId="1010136" x="172458" y="90314" z="-1984" feeCount="6300" /> <!-- Anghel Waterfall -->
+		</teleport>
+		<teleport type="NOBLES_TOKEN">
+			<location npcStringId="1010506" x="-87334" y="142252" z="-3645" feeId="13722" feeCount="1" /> <!-- Gludin Arena -->
+			<location npcStringId="1010507" x="73579" y="142709" z="-3763" feeId="13722" feeCount="1" /> <!-- Giran Arena -->
+			<location npcStringId="1010586" x="166080" y="75574" z="-2992" feeId="13722" feeCount="1" /> <!-- The Center of the Forest of Mirrors -->
+			<location npcStringId="1010617" x="114674" y="44150" z="-3376" feeId="13722" feeCount="1" /> <!-- The Center of the Enchanted Valley -->
+			<location npcStringId="1010130" x="114306" y="86573" z="-3112" feeId="13722" feeCount="1" /> <!-- Hunters Valley -->				
+			<location npcStringId="1010053" x="146434" y="46712" z="-3433" feeId="13722" feeCount="1" /> <!-- Coliseum -->
+		</teleport>
+		<teleport type="NOBLES_ADENA">
+			<location npcStringId="1010506" x="-87334" y="142252" z="-3645"  feeCount="1000" /> <!-- Gludin Arena -->
+			<location npcStringId="1010507" x="73579" y="142709" z="-3763"  feeCount="1000" /> <!-- Giran Arena -->
+			<location npcStringId="1010586" x="166080" y="75574" z="-2992"  feeCount="1000" /> <!-- The Center of the Forest of Mirrors -->
+			<location npcStringId="1010617" x="114674" y="44150" z="-3376"  feeCount="1000" /> <!-- The Center of the Enchanted Valley -->
+			<location npcStringId="1010130" x="114306" y="86573" z="-3112"  feeCount="1000" /> <!-- Hunters Valley -->				
+			<location npcStringId="1010053" x="146434" y="46712" z="-3433"  feeCount="1000" /> <!-- Coliseum -->
+		</teleport>
+	</npc>
+</list>
\ No newline at end of file