From 8e942892a9a36d7231b570dcb9d69fdf529f987b Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 4 Apr 2020 22:25:55 +0000
Subject: [PATCH] Fixed Fafurion respawn time and admin boss menu adjustments.
 Contributed by CostyKiller.

---
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../html/admin/{ => grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   1 +
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../scripts/ai/bosses/Fafurion/Fafurion.java  | 126 +++++++++++++++---
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   1 +
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../scripts/ai/bosses/Fafurion/Fafurion.java  | 126 +++++++++++++++---
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 .../dist/game/data/html/admin/charinfo.htm    |   2 +-
 .../data/html/admin/grandboss}/grandboss.htm  |   0
 .../{ => grandboss}/grandboss_antharas.htm    |   0
 .../admin/{ => grandboss}/grandboss_baium.htm |   0
 .../admin/{ => grandboss}/grandboss_core.htm  |   0
 .../admin/grandboss/grandboss_fafurion.htm    |  35 +++++
 .../admin/{ => grandboss}/grandboss_orfen.htm |   0
 .../{ => grandboss}/grandboss_queenant.htm    |   0
 .../{ => grandboss}/grandboss_valakas.htm     |   0
 155 files changed, 824 insertions(+), 59 deletions(-)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin => L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss}/grandboss.htm (90%)
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_Interlude/dist/game/data/html/admin => L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss}/grandboss.htm (90%)
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin => L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin => L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin => L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin => L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin => L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin => L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin => L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin => L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)
 rename {L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin => L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss}/grandboss.htm (100%)
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_antharas.htm (100%)
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_baium.htm (100%)
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_core.htm (100%)
 create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_orfen.htm (100%)
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_queenant.htm (100%)
 rename L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/{ => grandboss}/grandboss_valakas.htm (100%)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 90%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss.htm
index ce2e41d673..14182bb9c7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss.htm
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss.htm
@@ -28,5 +28,6 @@
 <button value="Queen Ant" action="bypass -h admin_grandboss 29001" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button value="Orfen" action="bypass -h admin_grandboss 29014" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button value="Core" action="bypass -h admin_grandboss 29006" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button value="Fafurion" action="bypass -h admin_grandboss 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 13983cac4e..c0d58bd844 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -20,12 +20,15 @@ import java.util.List;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
+import org.l2jmobius.gameserver.instancemanager.ZoneManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.zone.type.NoRestartZone;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 
@@ -43,8 +46,11 @@ public class Fafurion extends AbstractNpcAI
 	// Item
 	private static final int FONDUS_STONE = 80322;
 	// Locations
+	private static final Location ENTER_NPC_LOC = new Location(190856, 257112, -3328);
 	private static final Location RAID_ENTER_LOC = new Location(180059, 212896, -14727);
 	private static final Location FAFURION_SPAWN_LOC = new Location(180712, 210664, -14823, 22146);
+	// Zone
+	private static final NoRestartZone zone = ZoneManager.getInstance().getZoneById(85002, NoRestartZone.class); // Fafurion Nest zone
 	// Status
 	private static final int ALIVE = 0;
 	private static final int WAITING = 1;
@@ -59,24 +65,24 @@ public class Fafurion extends AbstractNpcAI
 		addTalkId(HEART_OF_TSUNAMI);
 		addFirstTalkId(HEART_OF_TSUNAMI);
 		addKillId(FAFURION_FINAL_FORM);
-		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
-		if (status == DEAD)
+		final long respawnTime = info.getLong("respawn_time");
+		// Unlock
+		if (getStatus() == DEAD)
 		{
-			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
+			final long time = respawnTime - System.currentTimeMillis();
 			if (time > 0)
 			{
 				startQuestTimer("unlock_fafurion", time, null, null);
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				setStatus(ALIVE);
 			}
 		}
-		else if (status != ALIVE)
+		else if (getStatus() != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			setStatus(ALIVE);
 		}
 	}
 	
@@ -88,7 +94,7 @@ public class Fafurion extends AbstractNpcAI
 		{
 			case "unlock_fafurion":
 			{
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				setStatus(ALIVE);
 				break;
 			}
 			case "warning":
@@ -105,38 +111,103 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (getStatus() == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					setStatus(FIGHTING);
 					final Npc bossInstance = addSpawn(FAFURION_FINAL_FORM, FAFURION_SPAWN_LOC.getX(), FAFURION_SPAWN_LOC.getY(), FAFURION_SPAWN_LOC.getZ(), FAFURION_SPAWN_LOC.getHeading(), false, 0, false);
 					startQuestTimer("resetRaid", RAID_DURATION * 60 * 60 * 1000, bossInstance, null);
 				}
 				break;
 			}
+			case "SKIP_WAITING":
+			{
+				if (getStatus() == WAITING)
+				{
+					cancelQuestTimer("warning", null, null);
+					cancelQuestTimer("beginning", null, null);
+					notifyEvent("beginning", null, null);
+					player.sendMessage(getClass().getSimpleName() + ": Skipping waiting time ...");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't skip waiting time right now!");
+				}
+				break;
+			}
+			case "RESPAWN_FAFURION":
+			{
+				if (getStatus() == DEAD)
+				{
+					setRespawn(0);
+					cancelQuestTimer("unlock_fafurion", null, null);
+					notifyEvent("unlock_fafurion", null, null);
+					player.sendMessage(getClass().getSimpleName() + ": Fafurion has been respawned.");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't respawn Fafurion while he is alive!");
+				}
+				break;
+			}
+			case "ABORT_FIGHT":
+			{
+				if (getStatus() == FIGHTING)
+				{
+					setStatus(ALIVE);
+					cancelQuestTimer("resetRaid", npc, null);
+					for (Creature creature : zone.getCharactersInside())
+					{
+						if (creature != null)
+						{
+							if (creature.isNpc())
+							{
+								if (creature.getId() == FAFURION_FINAL_FORM)
+								{
+									creature.teleToLocation(FAFURION_SPAWN_LOC);
+								}
+								else
+								{
+									creature.deleteMe();
+								}
+							}
+							else if (creature.isPlayer() && !creature.isGM())
+							{
+								creature.teleToLocation(ENTER_NPC_LOC);
+							}
+						}
+					}
+					player.sendMessage(getClass().getSimpleName() + ": Fight has been aborted!");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't abort fight right now!");
+				}
+				break;
+			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
-				if ((status > ALIVE) && (status < DEAD))
+				if ((getStatus() > ALIVE) && (getStatus() < DEAD))
 				{
 					for (PlayerInstance plr : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.EXCEEDED_THE_FAFURION_S_NEST_RAID_TIME_LIMIT, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					setStatus(ALIVE);
+					setRespawn(0);
 					npc.deleteMe();
+					
 				}
 				break;
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
 				}
 				else
 				{
-					if (((status > ALIVE) && (status < DEAD)) || (status == DEAD))
+					if (((getStatus() > ALIVE) && (getStatus() < DEAD)) || (getStatus() == DEAD))
 					{
 						return "34488-02.html";
 					}
@@ -178,9 +249,9 @@ public class Fafurion extends AbstractNpcAI
 						}
 					}
 				}
-				if (status == ALIVE)
+				if (getStatus() == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					setStatus(WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -198,15 +269,28 @@ public class Fafurion extends AbstractNpcAI
 			player.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 10000, true));
 		}
 		
-		GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+		setStatus(DEAD);
 		final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
-		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
-		GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info);
 		startQuestTimer("unlock_fafurion", respawnTime, null, null);
+		setRespawn(respawnTime);
 		return super.onKill(npc, killer, isSummon);
 	}
 	
+	private int getStatus()
+	{
+		return GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+	}
+	
+	private void setStatus(int status)
+	{
+		GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, status);
+	}
+	
+	private void setRespawn(long respawnTime)
+	{
+		GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID).set("respawn_time", System.currentTimeMillis() + respawnTime);
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, PlayerInstance player)
 	{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 90%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss.htm
index ce2e41d673..14182bb9c7 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss.htm
@@ -28,5 +28,6 @@
 <button value="Queen Ant" action="bypass -h admin_grandboss 29001" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button value="Orfen" action="bypass -h admin_grandboss 29014" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button value="Core" action="bypass -h admin_grandboss 29006" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button value="Fafurion" action="bypass -h admin_grandboss 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 12a6f024bc..772cef0b57 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -20,12 +20,15 @@ import java.util.List;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
+import org.l2jmobius.gameserver.instancemanager.ZoneManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.zone.type.NoRestartZone;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 
@@ -43,8 +46,11 @@ public class Fafurion extends AbstractNpcAI
 	// Item
 	private static final int FONDUS_STONE = 80322;
 	// Locations
+	private static final Location ENTER_NPC_LOC = new Location(190856, 257112, -3328);
 	private static final Location RAID_ENTER_LOC = new Location(180059, 212896, -14727);
 	private static final Location FAFURION_SPAWN_LOC = new Location(180712, 210664, -14823, 22146);
+	// Zone
+	private static final NoRestartZone zone = ZoneManager.getInstance().getZoneById(85002, NoRestartZone.class); // Fafurion Nest zone
 	// Status
 	private static final int ALIVE = 0;
 	private static final int WAITING = 1;
@@ -59,24 +65,24 @@ public class Fafurion extends AbstractNpcAI
 		addTalkId(HEART_OF_TSUNAMI);
 		addFirstTalkId(HEART_OF_TSUNAMI);
 		addKillId(FAFURION_FINAL_FORM);
-		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
-		if (status == DEAD)
+		final long respawnTime = info.getLong("respawn_time");
+		// Unlock
+		if (getStatus() == DEAD)
 		{
-			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
+			final long time = respawnTime - System.currentTimeMillis();
 			if (time > 0)
 			{
 				startQuestTimer("unlock_fafurion", time, null, null);
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				setStatus(ALIVE);
 			}
 		}
-		else if (status != ALIVE)
+		else if (getStatus() != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			setStatus(ALIVE);
 		}
 	}
 	
@@ -88,7 +94,7 @@ public class Fafurion extends AbstractNpcAI
 		{
 			case "unlock_fafurion":
 			{
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				setStatus(ALIVE);
 				break;
 			}
 			case "warning":
@@ -105,38 +111,103 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (getStatus() == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					setStatus(FIGHTING);
 					final Npc bossInstance = addSpawn(FAFURION_FINAL_FORM, FAFURION_SPAWN_LOC.getX(), FAFURION_SPAWN_LOC.getY(), FAFURION_SPAWN_LOC.getZ(), FAFURION_SPAWN_LOC.getHeading(), false, 0, false);
 					startQuestTimer("resetRaid", RAID_DURATION * 60 * 60 * 1000, bossInstance, null);
 				}
 				break;
 			}
+			case "SKIP_WAITING":
+			{
+				if (getStatus() == WAITING)
+				{
+					cancelQuestTimer("warning", null, null);
+					cancelQuestTimer("beginning", null, null);
+					notifyEvent("beginning", null, null);
+					player.sendMessage(getClass().getSimpleName() + ": Skipping waiting time ...");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't skip waiting time right now!");
+				}
+				break;
+			}
+			case "RESPAWN_FAFURION":
+			{
+				if (getStatus() == DEAD)
+				{
+					setRespawn(0);
+					cancelQuestTimer("unlock_fafurion", null, null);
+					notifyEvent("unlock_fafurion", null, null);
+					player.sendMessage(getClass().getSimpleName() + ": Fafurion has been respawned.");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't respawn Fafurion while he is alive!");
+				}
+				break;
+			}
+			case "ABORT_FIGHT":
+			{
+				if (getStatus() == FIGHTING)
+				{
+					setStatus(ALIVE);
+					cancelQuestTimer("resetRaid", npc, null);
+					for (Creature creature : zone.getCharactersInside())
+					{
+						if (creature != null)
+						{
+							if (creature.isNpc())
+							{
+								if (creature.getId() == FAFURION_FINAL_FORM)
+								{
+									creature.teleToLocation(FAFURION_SPAWN_LOC);
+								}
+								else
+								{
+									creature.deleteMe();
+								}
+							}
+							else if (creature.isPlayer() && !creature.isGM())
+							{
+								creature.teleToLocation(ENTER_NPC_LOC);
+							}
+						}
+					}
+					player.sendMessage(getClass().getSimpleName() + ": Fight has been aborted!");
+				}
+				else
+				{
+					player.sendMessage(getClass().getSimpleName() + ": You can't abort fight right now!");
+				}
+				break;
+			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
-				if ((status > ALIVE) && (status < DEAD))
+				if ((getStatus() > ALIVE) && (getStatus() < DEAD))
 				{
 					for (PlayerInstance plr : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.EXCEEDED_THE_FAFURION_S_NEST_RAID_TIME_LIMIT, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					setStatus(ALIVE);
+					setRespawn(0);
 					npc.deleteMe();
+					
 				}
 				break;
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
 				}
 				else
 				{
-					if (((status > ALIVE) && (status < DEAD)) || (status == DEAD))
+					if (((getStatus() > ALIVE) && (getStatus() < DEAD)) || (getStatus() == DEAD))
 					{
 						return "34488-02.html";
 					}
@@ -178,9 +249,9 @@ public class Fafurion extends AbstractNpcAI
 						}
 					}
 				}
-				if (status == ALIVE)
+				if (getStatus() == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					setStatus(WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -198,15 +269,28 @@ public class Fafurion extends AbstractNpcAI
 			player.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 10000, true));
 		}
 		
-		GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+		setStatus(DEAD);
 		final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
-		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
-		GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info);
 		startQuestTimer("unlock_fafurion", respawnTime, null, null);
+		setRespawn(respawnTime);
 		return super.onKill(npc, killer, isSummon);
 	}
 	
+	private int getStatus()
+	{
+		return GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+	}
+	
+	private void setStatus(int status)
+	{
+		GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, status);
+	}
+	
+	private void setRespawn(long respawnTime)
+	{
+		GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID).set("respawn_time", System.currentTimeMillis() + respawnTime);
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, PlayerInstance player)
 	{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm
index 8ec1f0256c..01c566a9ae 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_6.0_Fafurion/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm
index 8ec1f0256c..01c566a9ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm
index 23e1f71cfb..f392487cea 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/charinfo.htm
@@ -4,7 +4,7 @@
 <tr>
 <td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td width=180><center>Player: %name%</center></td>
-<td width=45><button value="Back" action="bypass -h admin_admin7" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass -h admin_show_characters 0" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <br>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss.htm
similarity index 100%
rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_antharas.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_antharas.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_antharas.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_baium.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_baium.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_baium.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_baium.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_core.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_core.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_core.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_core.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
new file mode 100644
index 0000000000..b7777248b3
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm
@@ -0,0 +1,35 @@
+<html><title>Admin GrandBoss</title><body>
+<center>
+<table width=270>
+<tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=180><center>Admin GrandBoss menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_grandboss" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>
+<br>
+<font color="LEVEL">Fafurion<font><br>
+	<table width="270" border="0" bgcolor="444444">
+		<tr>
+			<td>Status:</td>
+			<td><font color="%bossColor%">%bossStatus%</font></td>
+		</tr>
+		<tr>
+			<td>Respawn time:</td>
+			<td>%respawnTime%</td>
+		</tr>
+		<tr>
+			<td>Players inside:</td>
+			<td>%playersInside%</td>
+		</tr>
+	</table>
+<br>
+<br>
+<button value="Respawn Fafurion" action="bypass -h admin_grandboss_respawn 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Skip waiting time" action="bypass -h admin_grandboss_skip 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Abort Fight" action="bypass -h admin_grandboss_abort 19740" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Heart of Tsunami" action="bypass -h admin_move_to 190856 257112 -3328" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+<button value="Teleport to Fafurion Nest" action="bypass -h admin_move_to 180059 212896 -14727" width=200 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td><br1>
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_orfen.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_orfen.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_orfen.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_queenant.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_queenant.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_queenant.htm
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_valakas.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_valakas.htm
similarity index 100%
rename from L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss_valakas.htm
rename to L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_valakas.htm