From e571d7d02d44ba948bcc693a51e3560412231ec6 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Sat, 2 Dec 2023 18:36:50 +0000
Subject: Setzer

---
 graphics/images/login_wallpaper.png                | Bin 2885666 -> 2962428 bytes
 graphics/images/login_wallpaper_fall.png           | Bin 977300 -> 965499 bytes
 graphics/images/login_wallpaper_spring.png         | Bin 963599 -> 950244 bytes
 graphics/images/login_wallpaper_summer.png         | Bin 783356 -> 778710 bytes
 graphics/images/login_wallpaper_winter.png         | Bin 952127 -> 940782 bytes
 .../items/equipment/charms/assassin-amulet.png     | Bin 2866 -> 888 bytes
 graphics/items/equipment/charms/manapearl.png      | Bin 4966 -> 1425 bytes
 graphics/items/equipment/head/knit-cap.png         | Bin 8254 -> 928 bytes
 graphics/items/equipment/rings/assassin-ring.png   | Bin 2793 -> 880 bytes
 .../items/equipment/weapon/dagger-shortsword.png   | Bin 633 -> 0 bytes
 .../items/equipment/weapon/sword-shortsword.png    | Bin 0 -> 633 bytes
 graphics/particles/hex-facet-outline-50.png        | Bin 9469 -> 605 bytes
 graphics/particles/hex-facet-outline.png           | Bin 9419 -> 549 bytes
 graphics/particles/snowflake-7x7.png               | Bin 588 -> 130 bytes
 graphics/sprites/equipment/head/assassin-mask.png  | Bin 4914 -> 2693 bytes
 .../sprites/equipment/head/blue-wolf-helmet.png    | Bin 7336 -> 5274 bytes
 graphics/sprites/equipment/head/captain-hat.png    | Bin 12395 -> 3042 bytes
 graphics/sprites/equipment/weapons/beheader.png    | Bin 47670 -> 0 bytes
 graphics/sprites/equipment/weapons/beheader.xml    |  80 ------------------
 .../sprites/equipment/weapons/dagger-setzer.png    | Bin 0 -> 31067 bytes
 .../sprites/equipment/weapons/dagger-setzer.xml    |  79 ++++++++++++++++++
 .../sprites/equipment/weapons/dragon-sword.png     | Bin 72564 -> 0 bytes
 .../sprites/equipment/weapons/dragon-sword.xml     |  11 ---
 graphics/sprites/equipment/weapons/jackal.png      | Bin 70078 -> 0 bytes
 graphics/sprites/equipment/weapons/jackal.xml      |  84 -------------------
 graphics/sprites/equipment/weapons/lidersword.png  | Bin 45435 -> 0 bytes
 graphics/sprites/equipment/weapons/lidersword.xml  |  89 ---------------------
 graphics/sprites/equipment/weapons/sandcutter.png  | Bin 35706 -> 0 bytes
 graphics/sprites/equipment/weapons/sandcutter.xml  |  80 ------------------
 .../sprites/equipment/weapons/sword-beheader.png   | Bin 0 -> 47670 bytes
 .../sprites/equipment/weapons/sword-beheader.xml   |  80 ++++++++++++++++++
 .../sprites/equipment/weapons/sword-dragon.png     | Bin 0 -> 73054 bytes
 .../sprites/equipment/weapons/sword-dragon.xml     |  11 +++
 .../sprites/equipment/weapons/sword-jackal.png     | Bin 0 -> 72181 bytes
 .../sprites/equipment/weapons/sword-jackal.xml     |  84 +++++++++++++++++++
 graphics/sprites/equipment/weapons/sword-lider.png | Bin 0 -> 45435 bytes
 graphics/sprites/equipment/weapons/sword-lider.xml |  89 +++++++++++++++++++++
 .../sprites/equipment/weapons/sword-sandcutter.png | Bin 0 -> 35706 bytes
 .../sprites/equipment/weapons/sword-sandcutter.xml |  80 ++++++++++++++++++
 graphics/sprites/icons/feather-outline.png         | Bin 11331 -> 374 bytes
 graphics/sprites/icons/hidden-outline.png          | Bin 10222 -> 224 bytes
 graphics/sprites/icons/invisible-outline.png       | Bin 12866 -> 1360 bytes
 .../sprites/icons/spell-attack-generic-outline.png | Bin 13329 -> 338 bytes
 .../sprites/icons/spell-cooldown-ar-outline.png    | Bin 14293 -> 406 bytes
 graphics/sprites/icons/spell-cooldown-ar.png       | Bin 14093 -> 202 bytes
 graphics/sprites/icons/spell-cooldown-ench.png     | Bin 1405 -> 909 bytes
 graphics/sprites/icons/spell-cooldown-koy.png      | Bin 1369 -> 875 bytes
 graphics/sprites/icons/spell-cooldown-mg.png       | Bin 1538 -> 1043 bytes
 graphics/sprites/icons/spell-cooldown-mt.png       | Bin 1480 -> 985 bytes
 graphics/sprites/icons/spell-cooldown-outline.png  | Bin 12175 -> 340 bytes
 .../sprites/icons/spell-cooldown-r-outline.png     | Bin 13491 -> 281 bytes
 graphics/sprites/icons/spell-cooldown-r.png        | Bin 13459 -> 246 bytes
 graphics/sprites/icons/spell-cooldown-upmarmu.png  | Bin 4851 -> 528 bytes
 graphics/sprites/icons/spell-cooldown.png          | Bin 12157 -> 328 bytes
 graphics/tiles/crypt1.png                          | Bin 248055 -> 232351 bytes
 graphics/tiles/mushrooms_x2.png                    | Bin 18256 -> 12948 bytes
 graphics/tiles/mushrooms_x3.png                    | Bin 38433 -> 33472 bytes
 graphics/tiles/woodland_ground2.png                | Bin 309788 -> 290527 bytes
 graphics/tiles/woodland_inn_1.png                  | Bin 190349 -> 178508 bytes
 graphics/tiles/woodland_inn_2.png                  | Bin 135055 -> 119553 bytes
 graphics/tiles/woodland_inn_x2.png                 | Bin 34357 -> 27599 bytes
 graphics/tiles/woodland_inn_x3.png                 | Bin 68684 -> 60551 bytes
 graphics/tiles/woodland_inn_x4.png                 | Bin 7889 -> 7574 bytes
 items/equip-1hand/item0536_ShortSword.xml          |   2 +-
 items/equip-1hand/item0571_Setzer.xml              |   3 +-
 items/equip-1hand/item0576_Beheader.xml            |   2 +-
 items/equip-1hand/item0578_SandCutter.xml          |   2 +-
 items/equip-1hand/item0584_Jackal.xml              |   2 +-
 items/equip-1hand/item0590_DragonSword.xml         |   2 +-
 license.md                                         |   4 +-
 70 files changed, 431 insertions(+), 353 deletions(-)
 delete mode 100644 graphics/items/equipment/weapon/dagger-shortsword.png
 create mode 100644 graphics/items/equipment/weapon/sword-shortsword.png
 delete mode 100644 graphics/sprites/equipment/weapons/beheader.png
 delete mode 100644 graphics/sprites/equipment/weapons/beheader.xml
 create mode 100644 graphics/sprites/equipment/weapons/dagger-setzer.png
 create mode 100644 graphics/sprites/equipment/weapons/dagger-setzer.xml
 delete mode 100644 graphics/sprites/equipment/weapons/dragon-sword.png
 delete mode 100644 graphics/sprites/equipment/weapons/dragon-sword.xml
 delete mode 100644 graphics/sprites/equipment/weapons/jackal.png
 delete mode 100644 graphics/sprites/equipment/weapons/jackal.xml
 delete mode 100644 graphics/sprites/equipment/weapons/lidersword.png
 delete mode 100644 graphics/sprites/equipment/weapons/lidersword.xml
 delete mode 100644 graphics/sprites/equipment/weapons/sandcutter.png
 delete mode 100644 graphics/sprites/equipment/weapons/sandcutter.xml
 create mode 100644 graphics/sprites/equipment/weapons/sword-beheader.png
 create mode 100644 graphics/sprites/equipment/weapons/sword-beheader.xml
 create mode 100644 graphics/sprites/equipment/weapons/sword-dragon.png
 create mode 100644 graphics/sprites/equipment/weapons/sword-dragon.xml
 create mode 100644 graphics/sprites/equipment/weapons/sword-jackal.png
 create mode 100644 graphics/sprites/equipment/weapons/sword-jackal.xml
 create mode 100644 graphics/sprites/equipment/weapons/sword-lider.png
 create mode 100644 graphics/sprites/equipment/weapons/sword-lider.xml
 create mode 100644 graphics/sprites/equipment/weapons/sword-sandcutter.png
 create mode 100644 graphics/sprites/equipment/weapons/sword-sandcutter.xml

diff --git a/graphics/images/login_wallpaper.png b/graphics/images/login_wallpaper.png
index 4f8fec08..4af40bba 100644
Binary files a/graphics/images/login_wallpaper.png and b/graphics/images/login_wallpaper.png differ
diff --git a/graphics/images/login_wallpaper_fall.png b/graphics/images/login_wallpaper_fall.png
index 36791fc7..ee52d0a7 100644
Binary files a/graphics/images/login_wallpaper_fall.png and b/graphics/images/login_wallpaper_fall.png differ
diff --git a/graphics/images/login_wallpaper_spring.png b/graphics/images/login_wallpaper_spring.png
index 7379e778..7cf4b43a 100644
Binary files a/graphics/images/login_wallpaper_spring.png and b/graphics/images/login_wallpaper_spring.png differ
diff --git a/graphics/images/login_wallpaper_summer.png b/graphics/images/login_wallpaper_summer.png
index a8c3b414..f27371f8 100644
Binary files a/graphics/images/login_wallpaper_summer.png and b/graphics/images/login_wallpaper_summer.png differ
diff --git a/graphics/images/login_wallpaper_winter.png b/graphics/images/login_wallpaper_winter.png
index e8b3fa01..90995318 100644
Binary files a/graphics/images/login_wallpaper_winter.png and b/graphics/images/login_wallpaper_winter.png differ
diff --git a/graphics/items/equipment/charms/assassin-amulet.png b/graphics/items/equipment/charms/assassin-amulet.png
index e0a496a0..bf7caae7 100644
Binary files a/graphics/items/equipment/charms/assassin-amulet.png and b/graphics/items/equipment/charms/assassin-amulet.png differ
diff --git a/graphics/items/equipment/charms/manapearl.png b/graphics/items/equipment/charms/manapearl.png
index 2965777f..16dad06a 100644
Binary files a/graphics/items/equipment/charms/manapearl.png and b/graphics/items/equipment/charms/manapearl.png differ
diff --git a/graphics/items/equipment/head/knit-cap.png b/graphics/items/equipment/head/knit-cap.png
index ceafba2e..ef0b8d21 100644
Binary files a/graphics/items/equipment/head/knit-cap.png and b/graphics/items/equipment/head/knit-cap.png differ
diff --git a/graphics/items/equipment/rings/assassin-ring.png b/graphics/items/equipment/rings/assassin-ring.png
index 81ed5805..f47655f2 100644
Binary files a/graphics/items/equipment/rings/assassin-ring.png and b/graphics/items/equipment/rings/assassin-ring.png differ
diff --git a/graphics/items/equipment/weapon/dagger-shortsword.png b/graphics/items/equipment/weapon/dagger-shortsword.png
deleted file mode 100644
index 762ffa7f..00000000
Binary files a/graphics/items/equipment/weapon/dagger-shortsword.png and /dev/null differ
diff --git a/graphics/items/equipment/weapon/sword-shortsword.png b/graphics/items/equipment/weapon/sword-shortsword.png
new file mode 100644
index 00000000..762ffa7f
Binary files /dev/null and b/graphics/items/equipment/weapon/sword-shortsword.png differ
diff --git a/graphics/particles/hex-facet-outline-50.png b/graphics/particles/hex-facet-outline-50.png
index 711f6828..b9567852 100644
Binary files a/graphics/particles/hex-facet-outline-50.png and b/graphics/particles/hex-facet-outline-50.png differ
diff --git a/graphics/particles/hex-facet-outline.png b/graphics/particles/hex-facet-outline.png
index c68dd9e2..b5cf58fb 100644
Binary files a/graphics/particles/hex-facet-outline.png and b/graphics/particles/hex-facet-outline.png differ
diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png
index 221b4d08..839f6c93 100644
Binary files a/graphics/particles/snowflake-7x7.png and b/graphics/particles/snowflake-7x7.png differ
diff --git a/graphics/sprites/equipment/head/assassin-mask.png b/graphics/sprites/equipment/head/assassin-mask.png
index d385c6ad..a0c92b7a 100644
Binary files a/graphics/sprites/equipment/head/assassin-mask.png and b/graphics/sprites/equipment/head/assassin-mask.png differ
diff --git a/graphics/sprites/equipment/head/blue-wolf-helmet.png b/graphics/sprites/equipment/head/blue-wolf-helmet.png
index 7bf4bc9b..fde366b9 100644
Binary files a/graphics/sprites/equipment/head/blue-wolf-helmet.png and b/graphics/sprites/equipment/head/blue-wolf-helmet.png differ
diff --git a/graphics/sprites/equipment/head/captain-hat.png b/graphics/sprites/equipment/head/captain-hat.png
index 6428de46..9116692e 100644
Binary files a/graphics/sprites/equipment/head/captain-hat.png and b/graphics/sprites/equipment/head/captain-hat.png differ
diff --git a/graphics/sprites/equipment/weapons/beheader.png b/graphics/sprites/equipment/weapons/beheader.png
deleted file mode 100644
index ba576dbb..00000000
Binary files a/graphics/sprites/equipment/weapons/beheader.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/beheader.xml b/graphics/sprites/equipment/weapons/beheader.xml
deleted file mode 100644
index 75fe84fd..00000000
--- a/graphics/sprites/equipment/weapons/beheader.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/beheader.png" width="64" height="64"/>
-  <action name="default" imageset="sword">
-  </action>
-  <action name="stand" imageset="sword">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="sword">
-    <animation direction="down">
-      <sequence start="1" end="6" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" delay="75"/>
-    </animation>
-  </action>
-  <action name="sit" imageset="sword">
-    <animation direction="down">
-      <frame index="7"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="sword">
-    <animation direction="down">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="up">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="right">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="sword">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.png b/graphics/sprites/equipment/weapons/dagger-setzer.png
new file mode 100644
index 00000000..2e9120cc
Binary files /dev/null and b/graphics/sprites/equipment/weapons/dagger-setzer.png differ
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.xml b/graphics/sprites/equipment/weapons/dagger-setzer.xml
new file mode 100644
index 00000000..99da95d8
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/dagger-setzer.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" ?>
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/dagger-setzer.png" width="64" height="64" />
+  <action name="default" imageset="sword" />
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0" />
+    </animation>
+    <animation direction="left">
+      <frame index="18" />
+    </animation>
+    <animation direction="up">
+      <frame index="36" />
+    </animation>
+    <animation direction="right">
+      <frame index="54" />
+    </animation>
+  </action>
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75" />
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75" />
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75" />
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75" />
+    </animation>
+  </action>
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7" />
+    </animation>
+    <animation direction="left">
+      <frame index="25" />
+    </animation>
+    <animation direction="up">
+      <frame index="43" />
+    </animation>
+    <animation direction="right">
+      <frame index="61" />
+    </animation>
+  </action>
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+  </action>
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75" />
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.png b/graphics/sprites/equipment/weapons/dragon-sword.png
deleted file mode 100644
index 91a27abd..00000000
Binary files a/graphics/sprites/equipment/weapons/dragon-sword.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.xml b/graphics/sprites/equipment/weapons/dragon-sword.xml
deleted file mode 100644
index 1f980832..00000000
--- a/graphics/sprites/equipment/weapons/dragon-sword.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Micksha
-Copyright (C) 2020 Evol Online -->
-<sprite>
-    <imageset name="base"
-              src="graphics/sprites/equipment/weapons/dragon-sword.png"
-              width="128"
-              height="128"/>
-
-    <include file="equipment/weapons/lidersword.xml"/>
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/jackal.png b/graphics/sprites/equipment/weapons/jackal.png
deleted file mode 100644
index ee74ee54..00000000
Binary files a/graphics/sprites/equipment/weapons/jackal.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/jackal.xml b/graphics/sprites/equipment/weapons/jackal.xml
deleted file mode 100644
index d8cdf3f9..00000000
--- a/graphics/sprites/equipment/weapons/jackal.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<!-- (C) The Mana World Brazil Team -->
-<sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/jackal.png" width="128" height="128" />
-
-  <action name="default" imageset="sword">
-  </action>
-
-  <action name="stand" imageset="sword">
-    <animation direction="down">
-      <frame index="0" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="left">
-      <frame index="16" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="up">
-      <frame index="32" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="right">
-      <frame index="48" offsetX ="0" offsetY ="32" />
-    </animation>
-  </action>
-
-  <action name="walk" imageset="sword">
-    <animation direction="down">
-      <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-  </action>
-
-  <action name="sit" imageset="sword">
-    <animation direction="down">
-      <frame index="7" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="left">
-      <frame index="23" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="up">
-      <frame index="39" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="right">
-      <frame index="55" offsetX ="0" offsetY ="32" />
-    </animation>
-  </action>
-
-  <action name="dead" imageset="sword">
-    <animation direction="down">
-      <frame index="12" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="left">
-      <frame index="12" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="up">
-      <frame index="12" offsetX ="0" offsetY ="32" />
-    </animation>
-    <animation direction="right">
-      <frame index="12" offsetX ="0" offsetY ="32" />
-    </animation>
-  </action>
-
-  <action name="attack" imageset="sword">
-    <animation direction="down">
-      <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75"/>
-    </animation>
-  </action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/lidersword.png b/graphics/sprites/equipment/weapons/lidersword.png
deleted file mode 100644
index f3ca961c..00000000
Binary files a/graphics/sprites/equipment/weapons/lidersword.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/lidersword.xml b/graphics/sprites/equipment/weapons/lidersword.xml
deleted file mode 100644
index 2002cf58..00000000
--- a/graphics/sprites/equipment/weapons/lidersword.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="lider" src="graphics/sprites/equipment/weapons/lidersword.png" width="128" height="128"/>
-
-  <action name="default" imageset="lider">
-  </action>
-
-  <action name="stand" imageset="lider">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54" offsetX="0" offsetY="32"/>
-    </animation>
-  </action>
-
-  <action name="walk" imageset="lider">
-    <animation direction="down">
-      <sequence start="1" end="6" offsetX="0" offsetY="32" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" offsetX="0" offsetY="32" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" offsetX="0" offsetY="32" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" offsetX="0" offsetY="32" delay="75"/>
-    </animation>
-  </action>
-  
-  <action name="attack" imageset="lider">
-    <animation direction="down">
-      <sequence start="9" end="12" offsetX="0" offsetY="32" delay="75"/>
-      <end />
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" offsetX="0" offsetY="32" delay="75"/>
-      <end />
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" offsetX="0" offsetY="32" delay="75"/>
-      <end />
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" offsetX="0" offsetY="32" delay="75"/>
-      <end />
-    </animation>
-  </action>
-
-  <action name="sit" imageset="lider">
-    <animation direction="down">
-      <frame index="7" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61" offsetX="0" offsetY="32"/>
-    </animation>
-  </action>
-
-  <action name="dead" imageset="lider">
-    <animation direction="down">
-      <frame index="8" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="left">
-      <frame index="8" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="up">
-      <frame index="8" offsetX="0" offsetY="32"/>
-    </animation>
-    <animation direction="right">
-      <frame index="8" offsetX="0" offsetY="32"/>
-    </animation>
-  </action>
-
-
-
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/sandcutter.png b/graphics/sprites/equipment/weapons/sandcutter.png
deleted file mode 100644
index fc1e909e..00000000
Binary files a/graphics/sprites/equipment/weapons/sandcutter.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/sandcutter.xml b/graphics/sprites/equipment/weapons/sandcutter.xml
deleted file mode 100644
index b61cebda..00000000
--- a/graphics/sprites/equipment/weapons/sandcutter.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/sandcutter.png" width="64" height="64"/>
-  <action name="default" imageset="sword">
-  </action>
-  <action name="stand" imageset="sword">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="sword">
-    <animation direction="down">
-      <sequence start="1" end="6" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" delay="75"/>
-    </animation>
-  </action>
-  <action name="sit" imageset="sword">
-    <animation direction="down">
-      <frame index="7"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="sword">
-    <animation direction="down">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="up">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-    <animation direction="right">
-      <frame index="8" offsetX="0" offsetY="0"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="sword">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-beheader.png b/graphics/sprites/equipment/weapons/sword-beheader.png
new file mode 100644
index 00000000..ba576dbb
Binary files /dev/null and b/graphics/sprites/equipment/weapons/sword-beheader.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-beheader.xml b/graphics/sprites/equipment/weapons/sword-beheader.xml
new file mode 100644
index 00000000..ee887553
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-beheader.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-beheader.png" width="64" height="64"/>
+  <action name="default" imageset="sword">
+  </action>
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75"/>
+    </animation>
+  </action>
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.png b/graphics/sprites/equipment/weapons/sword-dragon.png
new file mode 100644
index 00000000..ccf40930
Binary files /dev/null and b/graphics/sprites/equipment/weapons/sword-dragon.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.xml b/graphics/sprites/equipment/weapons/sword-dragon.xml
new file mode 100644
index 00000000..b46fda5c
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-dragon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/sword-dragon.png"
+              width="128"
+              height="128"/>
+
+    <include file="equipment/weapons/sword-lider.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.png b/graphics/sprites/equipment/weapons/sword-jackal.png
new file mode 100644
index 00000000..0d578e2b
Binary files /dev/null and b/graphics/sprites/equipment/weapons/sword-jackal.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.xml b/graphics/sprites/equipment/weapons/sword-jackal.xml
new file mode 100644
index 00000000..9360042d
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-jackal.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!-- (C) The Mana World Brazil Team -->
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-jackal.png" width="128" height="128" />
+
+  <action name="default" imageset="sword">
+  </action>
+
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="16" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="32" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="48" offsetX ="0" offsetY ="32" />
+    </animation>
+  </action>
+
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+  </action>
+
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="23" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="39" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="55" offsetX ="0" offsetY ="32" />
+    </animation>
+  </action>
+
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="12" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="12" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="12" offsetX ="0" offsetY ="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="12" offsetX ="0" offsetY ="32" />
+    </animation>
+  </action>
+
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75"/>
+    </animation>
+  </action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-lider.png b/graphics/sprites/equipment/weapons/sword-lider.png
new file mode 100644
index 00000000..f3ca961c
Binary files /dev/null and b/graphics/sprites/equipment/weapons/sword-lider.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-lider.xml b/graphics/sprites/equipment/weapons/sword-lider.xml
new file mode 100644
index 00000000..7581c078
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-lider.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="lider" src="graphics/sprites/equipment/weapons/sword-lider.png" width="128" height="128"/>
+
+  <action name="default" imageset="lider">
+  </action>
+
+  <action name="stand" imageset="lider">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="left">
+      <frame index="18" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="up">
+      <frame index="36" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="54" offsetX="0" offsetY="32"/>
+    </animation>
+  </action>
+
+  <action name="walk" imageset="lider">
+    <animation direction="down">
+      <sequence start="1" end="6" offsetX="0" offsetY="32" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" offsetX="0" offsetY="32" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" offsetX="0" offsetY="32" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" offsetX="0" offsetY="32" delay="75"/>
+    </animation>
+  </action>
+  
+  <action name="attack" imageset="lider">
+    <animation direction="down">
+      <sequence start="9" end="12" offsetX="0" offsetY="32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" offsetX="0" offsetY="32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" offsetX="0" offsetY="32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" offsetX="0" offsetY="32" delay="75"/>
+      <end />
+    </animation>
+  </action>
+
+  <action name="sit" imageset="lider">
+    <animation direction="down">
+      <frame index="7" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="left">
+      <frame index="25" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="up">
+      <frame index="43" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="61" offsetX="0" offsetY="32"/>
+    </animation>
+  </action>
+
+  <action name="dead" imageset="lider">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="32"/>
+    </animation>
+  </action>
+
+
+
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-sandcutter.png b/graphics/sprites/equipment/weapons/sword-sandcutter.png
new file mode 100644
index 00000000..fc1e909e
Binary files /dev/null and b/graphics/sprites/equipment/weapons/sword-sandcutter.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-sandcutter.xml b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
new file mode 100644
index 00000000..d200855f
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-sandcutter.png" width="64" height="64"/>
+  <action name="default" imageset="sword">
+  </action>
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75"/>
+    </animation>
+  </action>
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="0"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/icons/feather-outline.png b/graphics/sprites/icons/feather-outline.png
index 47eeb709..a67dc40c 100644
Binary files a/graphics/sprites/icons/feather-outline.png and b/graphics/sprites/icons/feather-outline.png differ
diff --git a/graphics/sprites/icons/hidden-outline.png b/graphics/sprites/icons/hidden-outline.png
index f1011b7c..55ba2af2 100644
Binary files a/graphics/sprites/icons/hidden-outline.png and b/graphics/sprites/icons/hidden-outline.png differ
diff --git a/graphics/sprites/icons/invisible-outline.png b/graphics/sprites/icons/invisible-outline.png
index f40f4b2c..b0f7e960 100644
Binary files a/graphics/sprites/icons/invisible-outline.png and b/graphics/sprites/icons/invisible-outline.png differ
diff --git a/graphics/sprites/icons/spell-attack-generic-outline.png b/graphics/sprites/icons/spell-attack-generic-outline.png
index a6232f87..2ba150ac 100644
Binary files a/graphics/sprites/icons/spell-attack-generic-outline.png and b/graphics/sprites/icons/spell-attack-generic-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-ar-outline.png b/graphics/sprites/icons/spell-cooldown-ar-outline.png
index 5441acd9..4114d66c 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ar-outline.png and b/graphics/sprites/icons/spell-cooldown-ar-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-ar.png b/graphics/sprites/icons/spell-cooldown-ar.png
index 04058e16..730ec630 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ar.png and b/graphics/sprites/icons/spell-cooldown-ar.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-ench.png b/graphics/sprites/icons/spell-cooldown-ench.png
index 5950f38d..da364c59 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ench.png and b/graphics/sprites/icons/spell-cooldown-ench.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-koy.png b/graphics/sprites/icons/spell-cooldown-koy.png
index 8efece99..cde985e6 100644
Binary files a/graphics/sprites/icons/spell-cooldown-koy.png and b/graphics/sprites/icons/spell-cooldown-koy.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-mg.png b/graphics/sprites/icons/spell-cooldown-mg.png
index 31e46a53..7777ac77 100644
Binary files a/graphics/sprites/icons/spell-cooldown-mg.png and b/graphics/sprites/icons/spell-cooldown-mg.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-mt.png b/graphics/sprites/icons/spell-cooldown-mt.png
index 84fe8322..215de45a 100644
Binary files a/graphics/sprites/icons/spell-cooldown-mt.png and b/graphics/sprites/icons/spell-cooldown-mt.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-outline.png b/graphics/sprites/icons/spell-cooldown-outline.png
index bc16cb7b..3b794b56 100644
Binary files a/graphics/sprites/icons/spell-cooldown-outline.png and b/graphics/sprites/icons/spell-cooldown-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-r-outline.png b/graphics/sprites/icons/spell-cooldown-r-outline.png
index af56eda5..22d3cf1e 100644
Binary files a/graphics/sprites/icons/spell-cooldown-r-outline.png and b/graphics/sprites/icons/spell-cooldown-r-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-r.png b/graphics/sprites/icons/spell-cooldown-r.png
index 67555ebf..d09821d2 100644
Binary files a/graphics/sprites/icons/spell-cooldown-r.png and b/graphics/sprites/icons/spell-cooldown-r.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png
index 231e9599..8b87f1b8 100644
Binary files a/graphics/sprites/icons/spell-cooldown-upmarmu.png and b/graphics/sprites/icons/spell-cooldown-upmarmu.png differ
diff --git a/graphics/sprites/icons/spell-cooldown.png b/graphics/sprites/icons/spell-cooldown.png
index c34d1669..3deda6d8 100644
Binary files a/graphics/sprites/icons/spell-cooldown.png and b/graphics/sprites/icons/spell-cooldown.png differ
diff --git a/graphics/tiles/crypt1.png b/graphics/tiles/crypt1.png
index 6f94f827..7e52973a 100644
Binary files a/graphics/tiles/crypt1.png and b/graphics/tiles/crypt1.png differ
diff --git a/graphics/tiles/mushrooms_x2.png b/graphics/tiles/mushrooms_x2.png
index 5ea36de5..1f6550eb 100644
Binary files a/graphics/tiles/mushrooms_x2.png and b/graphics/tiles/mushrooms_x2.png differ
diff --git a/graphics/tiles/mushrooms_x3.png b/graphics/tiles/mushrooms_x3.png
index c6ed64bc..051cdeeb 100644
Binary files a/graphics/tiles/mushrooms_x3.png and b/graphics/tiles/mushrooms_x3.png differ
diff --git a/graphics/tiles/woodland_ground2.png b/graphics/tiles/woodland_ground2.png
index 66a40507..0673ddf9 100644
Binary files a/graphics/tiles/woodland_ground2.png and b/graphics/tiles/woodland_ground2.png differ
diff --git a/graphics/tiles/woodland_inn_1.png b/graphics/tiles/woodland_inn_1.png
index 7c3e01d9..7277c5e7 100644
Binary files a/graphics/tiles/woodland_inn_1.png and b/graphics/tiles/woodland_inn_1.png differ
diff --git a/graphics/tiles/woodland_inn_2.png b/graphics/tiles/woodland_inn_2.png
index f1669dc9..b136a0cb 100644
Binary files a/graphics/tiles/woodland_inn_2.png and b/graphics/tiles/woodland_inn_2.png differ
diff --git a/graphics/tiles/woodland_inn_x2.png b/graphics/tiles/woodland_inn_x2.png
index b7792e6c..664f3295 100644
Binary files a/graphics/tiles/woodland_inn_x2.png and b/graphics/tiles/woodland_inn_x2.png differ
diff --git a/graphics/tiles/woodland_inn_x3.png b/graphics/tiles/woodland_inn_x3.png
index a6c54641..1983d0ec 100644
Binary files a/graphics/tiles/woodland_inn_x3.png and b/graphics/tiles/woodland_inn_x3.png differ
diff --git a/graphics/tiles/woodland_inn_x4.png b/graphics/tiles/woodland_inn_x4.png
index ab42f34f..57002386 100644
Binary files a/graphics/tiles/woodland_inn_x4.png and b/graphics/tiles/woodland_inn_x4.png differ
diff --git a/items/equip-1hand/item0536_ShortSword.xml b/items/equip-1hand/item0536_ShortSword.xml
index 7c858630..2cd48e94 100644
--- a/items/equip-1hand/item0536_ShortSword.xml
+++ b/items/equip-1hand/item0536_ShortSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
+  <item id="536" image="equipment/weapon/sword-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item0571_Setzer.xml b/items/equip-1hand/item0571_Setzer.xml
index 69b3e3e3..2f09171e 100644
--- a/items/equip-1hand/item0571_Setzer.xml
+++ b/items/equip-1hand/item0571_Setzer.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="900" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="unisex">equipment/weapons/dagger-setzer.xml</sprite>
     <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
     <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound>
     <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound>
diff --git a/items/equip-1hand/item0576_Beheader.xml b/items/equip-1hand/item0576_Beheader.xml
index 14127ab4..b8ee7350 100644
--- a/items/equip-1hand/item0576_Beheader.xml
+++ b/items/equip-1hand/item0576_Beheader.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Double Damage +50% / No bow / Base Attack Delay +1150 / Weapon Level 1" req-int="0" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="1" weight="2000" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/beheader.xml</sprite>
+    <sprite gender="unisex">equipment/weapons/sword-beheader.xml</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
diff --git a/items/equip-1hand/item0578_SandCutter.xml b/items/equip-1hand/item0578_SandCutter.xml
index fc38f90e..b93f6ae2 100644
--- a/items/equip-1hand/item0578_SandCutter.xml
+++ b/items/equip-1hand/item0578_SandCutter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3% / Weapon Level 2" attack="160" level="80" type="equip-1hand" attack-action="attack" attack-range="1" weight="1500" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
+    <sprite gender="unisex">equipment/weapons/sword-sandcutter.xml</sprite>
     <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
     <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
     <sound event="miss">weapons/swords/sword-miss1.ogg</sound>
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
index 5376dfa1..5ade59f2 100644
--- a/items/equip-1hand/item0584_Jackal.xml
+++ b/items/equip-1hand/item0584_Jackal.xml
@@ -17,7 +17,7 @@
 	critical-hit-effect-id="30"
 	weight="1000"
 	sellProtected="true">
-	<sprite>equipment/weapons/jackal.xml</sprite>
+	<sprite>equipment/weapons/sword-jackal.xml</sprite>
 	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
index 699d228b..c47a37e3 100644
--- a/items/equip-1hand/item0590_DragonSword.xml
+++ b/items/equip-1hand/item0590_DragonSword.xml
@@ -20,7 +20,7 @@
 	critical-hit-effect-id="30"
 	weight="1000"
 	sellProtected="true">
-	<sprite>equipment/weapons/dragon-sword.xml</sprite>
+	<sprite>equipment/weapons/sword-dragon.xml</sprite>
 	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
diff --git a/license.md b/license.md
index 49078f0f..975987e9 100644
--- a/license.md
+++ b/license.md
@@ -709,13 +709,13 @@ File | Artists | Licenses
 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2
+`graphics/sprites/equipment/weapons/sword-beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/sword-deadsword.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/sword-long.png` | ChefChelios, Wushin | GPLv2
+`graphics/sprites/equipment/weapons/sword-sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/sword-short.png` | ChefChelios, Wushin | GPLv2, CC BY-SA 3.0
 `graphics/sprites/equipment/weapons/wand-deathshand.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/wand.png` | :grey_question:, Wushin | GPLv2
-`graphics/sprites/equipment/weapons/beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/equipment/weapons/sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2
 
 #### Chest
-- 
cgit v1.2.3-70-g09d2