From 9843755dd719de1aa7c7e63c71de792238a50fcc Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 31 Jul 2017 23:36:47 +0000
Subject: [PATCH] GM-Shop rework.

---
 .../game/data/buylists/custom/0009938.xml     |  21 ++++
 .../dist/game/data/html/admin/gmshops.htm     |  22 +---
 .../data/html/admin/gmstore/appearance.htm    |  53 --------
 .../game/data/html/admin/gmstore/books.htm    |   6 -
 .../game/data/html/admin/gmstore/castles.htm  |  23 ----
 .../data/html/admin/gmstore/consumables.htm   |  17 +--
 .../game/data/html/admin/gmstore/craft.htm    |  39 ------
 .../game/data/html/admin/gmstore/events.htm   |  26 ----
 .../game/data/html/admin/gmstore/fortress.htm |  21 ----
 .../data/html/admin/gmstore/gear/armor.htm    |  66 ++--------
 .../admin/gmstore/gear/armors/r-pvp-pve.htm   |  54 --------
 .../data/html/admin/gmstore/gear/armors/r.htm | 105 ----------------
 .../data/html/admin/gmstore/gear/belts.htm    |   6 -
 .../html/admin/gmstore/gear/bracelets.htm     |   6 -
 .../data/html/admin/gmstore/gear/jewels.htm   |  49 +-------
 .../data/html/admin/gmstore/gear/jewels/r.htm |  62 ---------
 .../data/html/admin/gmstore/gear/talisman.htm |  23 ----
 .../gear/weapons-limited/limited-main.htm     |  30 -----
 .../admin/gmstore/gear/weapons-mw/mw-main.htm |  46 -------
 .../gmstore/gear/weapons-pvp/pvp-main.htm     |  51 --------
 .../data/html/admin/gmstore/gear/weapons.htm  |  77 +-----------
 .../html/admin/gmstore/gear/weapons/boss.htm  |  74 -----------
 .../admin/gmstore/gear/weapons/dragon.htm     |  73 -----------
 .../admin/gmstore/gear/weapons/infinity.htm   |  32 -----
 .../html/admin/gmstore/gear/weapons/r.htm     | 118 ------------------
 .../html/admin/gmstore/gear/weapons/s.htm     |  37 ------
 .../html/admin/gmstore/gear/weapons/s80.htm   |  23 ----
 .../game/data/html/admin/gmstore/hair.htm     |  28 -----
 .../data/html/admin/gmstore/lifestones.htm    |  25 ----
 .../game/data/html/admin/gmstore/scrolls.htm  |   4 -
 .../game/data/html/admin/gmstore/style.htm    |   8 +-
 .../data/html/admin/gmstore/territory.htm     |  29 -----
 32 files changed, 41 insertions(+), 1213 deletions(-)
 create mode 100644 L2J_Mobius_Classic/dist/game/data/buylists/custom/0009938.xml
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/appearance.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/castles.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/events.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/fortress.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r-pvp-pve.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels/r.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/talisman.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-limited/limited-main.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-mw/mw-main.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-pvp/pvp-main.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/boss.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/dragon.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/infinity.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/r.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s80.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/hair.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/lifestones.htm
 delete mode 100644 L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/territory.htm

diff --git a/L2J_Mobius_Classic/dist/game/data/buylists/custom/0009938.xml b/L2J_Mobius_Classic/dist/game/data/buylists/custom/0009938.xml
new file mode 100644
index 0000000000..6e354cc6cd
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/buylists/custom/0009938.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="1835" price="0" /> <!-- Soulshot (No-grade) -->
+	<item id="1463" price="0" /> <!-- Soulshot (D-grade) -->
+	<item id="1464" price="0" /> <!-- Soulshot (C-grade) -->
+	<item id="1465" price="0" /> <!-- Soulshot (B-grade) -->
+	<item id="1466" price="0" /> <!-- Soulshot (A-grade) -->
+	<item id="2509" price="0" /> <!-- Spiritshot (No-grade) -->
+	<item id="2510" price="0" /> <!-- Spiritshot (D-grade) -->
+	<item id="2511" price="0" /> <!-- Spiritshot (C-grade) -->
+	<item id="2512" price="0" /> <!-- Spiritshot (B-grade) -->
+	<item id="2513" price="0" /> <!-- Spiritshot (A-grade) -->
+	<item id="3947" price="0" /> <!-- Blessed Spiritshot (No-grade) -->
+	<item id="3948" price="0" /> <!-- Blessed Spiritshot (D-grade) -->
+	<item id="3949" price="0" /> <!-- Blessed Spiritshot (C-grade) -->
+	<item id="3950" price="0" /> <!-- Blessed Spiritshot (B-grade) -->
+	<item id="3951" price="0" /> <!-- Blessed Spiritshot (A-grade) -->
+	<item id="6645" price="0" /> <!-- Beast Soulshot -->
+	<item id="6646" price="0" /> <!-- Beast Spiritshot -->
+	<item id="6647" price="0" /> <!-- Blessed Beast Spiritshot -->
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmshops.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmshops.htm
index de606c0544..dc377791be 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmshops.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmshops.htm
@@ -18,25 +18,13 @@
 </tr>
 <tr>
 <td align=center><button action="bypass -h admin_html gmstore/gear/bracelets.htm" value="Bracelets" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_buy 9913" value="Shirts" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_html gmstore/gear/talisman.htm" value="Talismans" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr>
-<tr>
 <td align=center><button action="bypass -h admin_html gmstore/gear/belts.htm" value="Belts" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_buy 9909" value="Cloaks" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
 <td align=center><button action="bypass -h admin_html gmstore/style.htm" value="Style" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
 </tr>
 </table>
 <br>
 <table width=260>
 <tr>
-<td align=center><button action="bypass -h admin_html gmstore/territory.htm" value="Territory" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_html gmstore/castles.htm" value="Castles" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_html gmstore/fortress.htm" value="Fortress" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
-</table>
-<br>
-<table width=260>
-<tr>
 <td align=center><button action="bypass -h admin_html gmstore/consumables.htm" value="Consumables" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
 <td align=center><button action="bypass -h admin_html gmstore/scrolls.htm" value="Scrolls" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
 <td align=center><button action="bypass -h admin_html gmstore/craft.htm" value="Craft Area" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
@@ -51,16 +39,8 @@
 </tr>
 <tr>
 <td align=center><button action="bypass -h admin_buy 9916" value="Currency" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_html gmstore/events.htm" value="Event Items" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_buy 10004" value="Rune's" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr>
-</table>
-<br>
-<table width=260>
-<tr>
-<td align=center><button action="bypass -h admin_html gmstore/lifestones.htm" value="Life Stones" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align=center><button action="bypass -h admin_buy 9903" value="Elemental" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
 <td align=center><button action="bypass -h admin_html gmstore/books.htm" value="Books" width=85 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/appearance.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/appearance.htm
deleted file mode 100644
index 49d098b3eb..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/appearance.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr><td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=180><center>GM Shop - Appearance Stones</center></td>
-<td width=40><button value="Back" action="bypass -h admin_html gmstore/style.htm" width=40 height=15 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
-</center>
-<br><br>
-<center>
-<table width=260>
-<tr>
-<td align=center><button action="bypass -h admin_buy 1" value="Weapon Appearance" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 2" value="Weapon Restoration" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 3" value="Armor Appearance" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 4" value="Armor Restoration" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 5" value="Equip Restoration" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 6" value="Visual sets" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-</table><br><br><br>
-<table width=260>
-<tr>
-<td align=center><button action="bypass -h admin_buy 21" value="Swords" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 22" value="Big Swords" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 23" value="Daggers" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 24" value="Duals" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 25" value="Fists" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 26" value="Spears" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 27" value="Bows" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 28" value="Crossbows" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 29" value="Blunts" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 30" value="Big Blunts" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_buy 31" value="Dual Daggers" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_buy 32" value="Dual Blunts" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-</table><br>
-<button action="bypass -h admin_buy 33" value="Other" width=120 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/books.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/books.htm
index 68cd18ff38..0f29a54fae 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/books.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/books.htm
@@ -16,12 +16,6 @@
 </center>
 <br><br>
 <center>
-<button action="bypass -h admin_buy 9901" value="Forgotten Scrolls" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 <button action="bypass -h admin_buy 9905" value="Divine Inspiration" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 <br1>
-<button action="bypass -h admin_buy 9906" value="Transform Sealbooks" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9921" value="Fly Transform Books" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/castles.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/castles.htm
deleted file mode 100644
index cac3271c7e..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/castles.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Castle Items</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9993" value="Seeds" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9994" value="Siege Guards" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/consumables.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/consumables.htm
index 241890a680..409b4c429f 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/consumables.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/consumables.htm
@@ -38,24 +38,15 @@
 <button action="bypass -h admin_buy 9927" value="Old Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9929" value="Elixirs" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 3175709" value="New Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 3175710" value="Brooch Stone" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
 <button action="bypass -h admin_buy 9939" value="Gems/Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
+</tr>
+<tr>
 <td align=center>
 <button action="bypass -h admin_buy 9948" value="Henna Dyes" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
+<td align=center>
+</td>
 </tr>
 </table>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/craft.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/craft.htm
index 9c9bf8731e..9131e3c4ad 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/craft.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/craft.htm
@@ -33,30 +33,6 @@
 <button action="bypass -h admin_buy 9943" value="Parts A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9941" value="Recipes S Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9940" value="Parts S Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9933" value="Recipes S80 Dynasty" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9934" value="Parts S80 Dynasty" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9935" value="Recipes S80 Icarus" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9936" value="Parts S80 Icarus" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
 </table>
 <br>
 <table width=260>
@@ -72,21 +48,6 @@
 </td>
 </tr>
 </table>
-<br>
-<table width=260>
-<tr>
-<td align=center>Gracia Section:</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9968" value="Gracia Designs" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9969" value="Gracia Materials" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
 <table width=260>
 <tr>
 <td align=center>Old Section:</td>
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/events.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/events.htm
deleted file mode 100644
index b27c1ba339..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/events.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Event Items</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9977" value="Misc Event Items" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9976" value="Transformation Sticks" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9972" value="Santa Weapons" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9973" value="Baguette Weapons" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/fortress.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/fortress.htm
deleted file mode 100644
index d0f3a1f0dd..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/fortress.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Fortress Items</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9989" value="Miscellaneous" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armor.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armor.htm
index c7d30259f2..a0c818f7f0 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armor.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armor.htm
@@ -6,7 +6,7 @@
 <button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td width=180>
-<center>GM Shop - Armors</center>
+<center>GM Shop - Armor</center>
 </td>
 <td width=40>
 <button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
@@ -16,88 +16,36 @@
 </center>
 <br><br>
 <center>
-Armor Sets<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9951" value="No Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9955" value="A Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9951" value="No Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9952" value="D Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9956" value="S Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9952" value="D Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9953" value="C Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9957" value="S80 Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9953" value="C Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9954" value="B Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9958" value="S84 Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9954" value="B Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/armors/r.htm" value="R Grade Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/armors/r-pvp-pve.htm" value="R Grade (PvP/PvE)" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-Special Sets<br1>
-<table width=260>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9959" value="Apella Sets" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9926" value="Sigils" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-Masterwork Sets<br1>
-<table width=260>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 10000" value="B Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 10003" value="S80 Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9955" value="A Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 10001" value="A Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9959" value="Apella" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 11006" value="S84 Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 10002" value="S Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/armor.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center></td>
 </tr>
 </table>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r-pvp-pve.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r-pvp-pve.htm
deleted file mode 100644
index abaae1517f..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r-pvp-pve.htm
+++ /dev/null
@@ -1,54 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - R Grade Armors</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/armor.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br>
-<center>
-<font color="LEVEL">Armor Sets (Bloody/Dark)</font>
-<br1>
-	<table width=300 bgcolor="444444">
-		<tr>
-			<td align=center>Bloody (PvE)</td>
-			<td align=center>Dark (PvP)</td>
-		</tr>
-	</table>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11077" value="Bloody (Normal)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11080" value="Dark (Normal)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11078" value="Bloody (Attack)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11081" value="Dark (Attack)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11079" value="Bloody (Defense)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11082" value="Dark (Defense)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r.htm
deleted file mode 100644
index 9bc6725344..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/armors/r.htm
+++ /dev/null
@@ -1,105 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - R Grade Armors</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/armor.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br>
-<center>
-<font color="LEVEL">Standard Armor Sets</font>
-<br1>
-	<table width=300 bgcolor="444444">
-		<tr>
-			<td align=center>Normal</td>
-			<td align=center>Blessed</td>
-		</tr>
-	</table>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11031" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11032" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11033" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11034" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11035" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11036" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11037" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11038" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-<font color="LEVEL">Improved Armor Sets</font>
-<br1>
-	<table width=300 bgcolor="444444">
-		<tr>
-			<td align=center>Normal</td>
-			<td align=center>Blessed</td>
-		</tr>
-	</table>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11061" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11062" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11063" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11064" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11065" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11066" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11067" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11068" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/belts.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/belts.htm
index f1ed15e15d..42f579b92c 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/belts.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/belts.htm
@@ -18,10 +18,4 @@
 <center>
 <button action="bypass -h admin_buy 9910" value="Belts" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 <br1>
-<button action="bypass -h admin_buy 9911" value="Magic Pins" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9912" value="Magic Pouches" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 11070" value="Awakening Belts" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/bracelets.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/bracelets.htm
index 8026d126a8..6b694bf806 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/bracelets.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/bracelets.htm
@@ -16,12 +16,6 @@
 </center>
 <br><br>
 <center>
-<button action="bypass -h admin_buy 11069" value="Awakening Bracelets" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9914" value="Talisman Bracelets" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 <button action="bypass -h admin_buy 10005" value="Agathion Bracelets" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 <br1>
-<button action="bypass -h admin_buy 10008" value="Zodiac Agathion Bracelets" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 9ebf3e3d8d..79ecd541ba 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -16,72 +16,35 @@
 </center>
 <br><br>
 <center>
-Jewels by Grade<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9960" value="No Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9964" value="A Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9960" value="No Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9961" value="D Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9965" value="S Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9961" value="D Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9962" value="C Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9966" value="S80 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9962" value="C Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9963" value="B Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9908" value="S84 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9963" value="B Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-Boss Jewels<br1>
-<table width=260>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9917" value="Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11083" value="Blessed Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-Other Jewels<br1>
-<table width=260>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9999" value="Masterwork Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9964" value="A Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9917" value="Boss" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels/r.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels/r.htm
deleted file mode 100644
index d689209acc..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/jewels/r.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - R Grade Jewels</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/jewels.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br>
-<center>
-<font color="LEVEL">Standard Jewels</font>
-<br1>
-	<table width=300 bgcolor="444444">
-		<tr>
-			<td align=center>Normal</td>
-			<td align=center>Blessed</td>
-		</tr>
-	</table>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11039" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11043" value="Immortal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11040" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11044" value="Twilight" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11041" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11045" value="Seraph" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11042" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11046" value="Eternal" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/talisman.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/talisman.htm
deleted file mode 100644
index 03c8febbf7..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/talisman.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Talismans</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9915" value="Talismans" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 11072" value="Awakening Talismans" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-limited/limited-main.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-limited/limited-main.htm
deleted file mode 100644
index 035670ebbb..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-limited/limited-main.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Limited Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9974" value="Limited (60 Mins)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9975" value="Limited (4 Hours)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-mw/mw-main.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-mw/mw-main.htm
deleted file mode 100644
index bf0e528b9d..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-mw/mw-main.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - MW Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 10995" value="MW - B-Grade" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 10998" value="MW - S80 Dynasty" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 10996" value="MW - A-Grade" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 10999" value="MW - S80 Icarus" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 10997" value="MW - S-Grade" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11000" value="MW - S84 Vesper" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-pvp/pvp-main.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-pvp/pvp-main.htm
deleted file mode 100644
index b549aba84e..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons-pvp/pvp-main.htm
+++ /dev/null
@@ -1,51 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - PVP Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9985" value="PVP - A Grade" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11004" value="PVP - S84 Low" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9984" value="PVP - S Grade" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11005" value="PVP - S84 High" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9982" value="PVP - S80 Dynasty" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 9981" value="PVP - S84 Vesper" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 9983" value="PVP - S80 Icarus" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons.htm
index ae4c16b1ca..65fe04f4c9 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons.htm
@@ -19,107 +19,32 @@
 <table width=260>
 <tr>
 <td align=center>
-Standard</td>
-<td align=center>
-Special</td>
-</tr>
-<tr>
-<td align=center>
 <button action="bypass -h admin_html gmstore/gear/weapons/ng.htm" value="No Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 9923" value="S80 Dynasty" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
 </tr>
 <tr>
 <td align=center>
 <button action="bypass -h admin_html gmstore/gear/weapons/d.htm" value="D Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 9924" value="S80 Icarus" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
 </tr>
 <tr>
 <td align=center>
 <button action="bypass -h admin_html gmstore/gear/weapons/c.htm" value="C Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 9907" value="S80 Vesper" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
 </tr>
 <tr>
 <td align=center>
 <button action="bypass -h admin_html gmstore/gear/weapons/b.htm" value="B Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 11002" value="S84 Low" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
 </tr>
 <tr>
 <td align=center>
 <button action="bypass -h admin_buy 9997" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-<td align=center>
-<button action="bypass -h admin_buy 11003" value="S84 High" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9998" value="S Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11001" value="R85 Triumph" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons/r.htm" value="R Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons/boss.htm" value="Boss Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-Other Weapons<br1>
-<table width=260>
-<tr>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons-limited/limited-main.htm" value="Limited Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons/infinity.htm" value="Infinity Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons-mw/mw-main.htm" value="Weapons (MW)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_html gmstore/gear/weapons-pvp/pvp-main.htm" value="Weapons (PvP)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11075" value="Weapons R99 (PVE)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11076" value="Weapons R99 (PVP)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 34" value="Shadow Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 35" value="Kelbim Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 36" value="Legacy Weapons" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
+<button action="bypass -h admin_buy 11060" value="Infinity" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/boss.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/boss.htm
deleted file mode 100644
index 23c4893590..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/boss.htm
+++ /dev/null
@@ -1,74 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Boss Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<font color="LEVEL">Dragon Weapons</font>
-<br1>
-<table width=290 bgcolor="444444">
-<tr>
-<td align=center>Antharas</td>
-<td align=center>Valakas</td>
-<td align=center>Lindvior</td>
-</tr>
-</table>
-<table width=290>	
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11047" value="Antharas (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11048" value="Valakas (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11049" value="Lindvior (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11050" value="Antharas (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11051" value="Valakas (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11052" value="Lindvior (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11053" value="Antharas (High" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11054" value="Valakas (High)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11055" value="Lindvior (High)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11056" value="Antharas (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11057" value="Valakas (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11058" value="Lindvior (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/dragon.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/dragon.htm
deleted file mode 100644
index 1d52f2019c..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/dragon.htm
+++ /dev/null
@@ -1,73 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Dragon Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<table width=290>
-		<tr>
-			<td align=center>Antharas</td>
-			<td align=center>Valakas</td>
-			<td align=center>Lindvior</td>
-		</tr>
-	</table>
-<table width=290>	
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11047" value="Antharas (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11048" value="Valakas (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11049" value="Lindvior (Low)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11050" value="Antharas (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11051" value="Valakas (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11052" value="Lindvior (Mid)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11053" value="Antharas (High)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11054" value="Valakas (High)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11055" value="Lindvior (High)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11056" value="Antharas (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11057" value="Valakas (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11058" value="Lindvior (Top)" width=90 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/infinity.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/infinity.htm
deleted file mode 100644
index 3d8aa08a7a..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/infinity.htm
+++ /dev/null
@@ -1,32 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Infinity Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<table width=290>	
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11060" value="Infinity Weapons (Normal)" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11059" value="Infinity Weapons (Awaken)" width=180 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/r.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/r.htm
deleted file mode 100644
index 7432580b95..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/r.htm
+++ /dev/null
@@ -1,118 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - R Grade Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br>
-<center>
-<table width=290>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11007" value="Requiem (N)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11008" value="Requiem (B)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11009" value="Requiem (N+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11010" value="Requiem (B+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11027" value="Requiem (N+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11011" value="Requiem (B+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11012" value="Apocalypse (N)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11013" value="Apocalypse (B)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11014" value="Apocalypse (N+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11015" value="Apocalypse (B+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11028" value="Apocalypse (N+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11016" value="Apocalypse (B+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-		<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11017" value="Specter (N)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11018" value="Specter (B)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11019" value="Specter (N+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11020" value="Specter (B+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11029" value="Specter (N+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11021" value="Specter (B+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-		<tr>
-			<td>
-<button action="bypass -h admin_buy 11022" value="Amaranthine (N)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11023" value="Amaranthine (B)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11024" value="Amaranthine (N+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11025" value="Amaranthine (B+SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-<tr>
-<td align=center>
-<button action="bypass -h admin_buy 11030" value="Amaranthine (N+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td align=center>
-<button action="bypass -h admin_buy 11026" value="Amaranthine (B+2SA)" width=140 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-<br>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s.htm
deleted file mode 100644
index facec94138..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - S Grade Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9045" value="Single Handed Swords" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9046" value="Double Handed Swords" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9047" value="Dual Swords" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9048" value="Daggers" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9049" value="Bows" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9050" value="Fists" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9051" value="Polearms" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9052" value="Single Handed Blunts" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9053" value="Double Handed Blunts" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s80.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s80.htm
deleted file mode 100644
index 3cce8c9d40..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/gear/weapons/s80.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - S80 Grade Weapons</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmstore/gear/weapons.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9923" value="Dynasty" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9924" value="Icarus" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/hair.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/hair.htm
deleted file mode 100644
index b045697a98..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/hair.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Hair Accessory</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9919" value="Castle Circlets" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9944" value="Other Circlets" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9920" value="Hair Accessory1" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 99711" value="Hair Accessory2" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-						
-</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/lifestones.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/lifestones.htm
deleted file mode 100644
index c9920da55f..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/lifestones.htm
+++ /dev/null
@@ -1,25 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-    <table width=260>
-        <tr>
-            <td width=40>
-                <button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-            </td>
-            <td width=180>
-                <center>GM Shop - Life Stones Menu</center>
-            </td>
-            <td width=40>
-                <button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-            </td>
-        </tr>
-    </table>
-</center>
-<br><br>
-<center>
-	<button action="bypass -h admin_buy 9902" value="Life Stones (Old)" width=150 height=21 back="L2UI_ct1.button_df"fore="L2UI_ct1.button_df">
-<br1>
-	<button action="bypass -h admin_buy 11074" value="Life Stones (Awakening)" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>			
-</center>
-</body>
-</html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/scrolls.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/scrolls.htm
index a12c1e297a..b614486614 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/scrolls.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/scrolls.htm
@@ -20,8 +20,4 @@
 <br1>
 <button action="bypass -h admin_buy 9931" value="Scrolls (Item Enchant)" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 <br1>
-<button action="bypass -h admin_buy 9945" value="Scrolls (Event Buffs)" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 11073" value="Scrolls (Skill Enchant)" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/style.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/style.htm
index 76d0dd7f42..d4689c2061 100644
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/style.htm
+++ b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/style.htm
@@ -18,12 +18,6 @@
 <center>
 <button action="bypass -h admin_buy 9919" value="Circlets (Castle)" width=150 height=21 back="L2UI_ct1.button_df"fore="L2UI_ct1.button_df">
 <br1>
-<button action="bypass -h admin_buy 9944" value="Circlets (Random)" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9920" value="Hair Accessories I" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 11084" value="Hair Accessories II" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_html gmstore/appearance.htm" value="Appearance Stones" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9920" value="Hair Accessories" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 <br1>						
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/territory.htm b/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/territory.htm
deleted file mode 100644
index b4296b0ee8..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/html/admin/gmstore/territory.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<html><title>Shop</title><body>
-<center>
-<table width=260>
-<tr>
-<td width=40>
-<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-<td width=180>
-<center>GM Shop - Territory Items</center>
-</td>
-<td width=40>
-<button value="Back" action="bypass -h admin_html gmshops.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-</td>
-</tr>
-</table>
-</center>
-<br><br>
-<center>
-<button action="bypass -h admin_buy 9990" value="Territory Weapons" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9991" value="Territory Wards" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9992" value="Territory Flags" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9970" value="Mercenary Transforms" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-<button action="bypass -h admin_buy 9971" value="Disguise Scrolls" width=150 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
-<br1>
-</center></body></html>
\ No newline at end of file