diff --git a/Cargo.lock b/Cargo.lock
index c82c059..c8c9dd0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,19 +4,13 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -166,13 +160,13 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "assets_manager"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadb8d5c3ec796630a35133c038842b02bcfc2a8a324349fc24fd6db5d679474"
+checksum = "16c242549da57042726709f322919e546a55b4fab244291b400d49fa39b25bc3"
 dependencies = [
  "ahash 0.8.11",
  "bincode",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "log",
  "ron",
  "serde",
@@ -193,13 +187,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -240,9 +234,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "az"
@@ -259,7 +253,7 @@ dependencies = [
  "addr2line",
  "cfg-if",
  "libc",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
  "windows-targets 0.52.6",
@@ -271,12 +265,6 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -365,9 +353,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
 dependencies = [
  "shlex",
 ]
@@ -563,7 +551,7 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -586,7 +574,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -597,7 +585,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -651,7 +639,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -699,7 +687,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -720,7 +708,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -741,7 +729,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -796,9 +784,9 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
 dependencies = [
  "simd-adler32",
 ]
@@ -818,12 +806,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -890,9 +878,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -905,9 +893,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -915,15 +903,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -932,38 +920,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1022,9 +1010,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "half"
@@ -1058,6 +1046,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1177,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "humantime"
@@ -1226,9 +1220,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1239,7 +1233,6 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -1309,12 +1302,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "rayon",
 ]
 
@@ -1356,9 +1349,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1441,9 +1434,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libredox"
@@ -1533,16 +1526,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -1550,6 +1533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -1657,7 +1641,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1712,18 +1696,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "openssl-probe"
@@ -1733,9 +1717,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "ordered-float"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
 dependencies = [
  "num-traits",
 ]
@@ -1834,26 +1818,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -1868,15 +1832,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "png"
-version = "0.17.13"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1902,9 +1866,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -2054,9 +2018,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2074,9 +2038,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2086,9 +2050,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2097,9 +2061,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "resolv-conf"
@@ -2132,7 +2096,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "bitflags 2.6.0",
  "serde",
  "serde_derive",
@@ -2150,7 +2114,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "blake2b_simd",
  "constant_time_eq",
 ]
@@ -2184,9 +2148,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
 dependencies = [
  "once_cell",
  "ring",
@@ -2224,19 +2188,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-platform-verifier"
@@ -2299,9 +2262,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -2328,9 +2291,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2374,7 +2337,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2397,14 +2360,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2588,7 +2551,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2616,9 +2579,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2633,22 +2596,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2718,7 +2681,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2766,9 +2729,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.21"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
@@ -2777,27 +2740,6 @@ dependencies = [
  "winnow",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -2824,7 +2766,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2952,9 +2894,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -3012,9 +2954,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "vek"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
+checksum = "86dce3b89992dbfee9b6f46d8a98a4a5ecf79f93f3b077fad3cc2759ebe92214"
 dependencies = [
  "approx",
  "num-integer",
@@ -3026,7 +2968,7 @@ dependencies = [
 [[package]]
 name = "veloren-client"
 version = "0.16.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "authc",
  "byteorder",
@@ -3052,7 +2994,7 @@ dependencies = [
 [[package]]
 name = "veloren-client-i18n"
 version = "0.13.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "deunicode",
  "fluent",
@@ -3070,7 +3012,7 @@ dependencies = [
 [[package]]
 name = "veloren-common"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "approx",
  "bitflags 2.6.0",
@@ -3110,7 +3052,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-assets"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "assets_manager",
  "dot_vox",
@@ -3125,7 +3067,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-base"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "directories-next",
  "tracing",
@@ -3134,7 +3076,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-ecs"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "specs",
  "tracing",
@@ -3144,7 +3086,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-i18n"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "hashbrown 0.14.5",
  "rand",
@@ -3154,7 +3096,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-net"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "bincode",
  "flate2",
@@ -3172,7 +3114,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-state"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3194,7 +3136,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-systems"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "itertools",
  "ordered-float",
@@ -3212,7 +3154,7 @@ dependencies = [
 [[package]]
 name = "veloren-network"
 version = "0.3.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "async-channel",
  "async-trait",
@@ -3237,7 +3179,7 @@ dependencies = [
 [[package]]
 name = "veloren-network-protocol"
 version = "0.6.1"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "async-trait",
  "bitflags 2.6.0",
@@ -3251,7 +3193,7 @@ dependencies = [
 [[package]]
 name = "veloren-world"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf"
+source = "git+https://gitlab.com/veloren/veloren?branch=master#8d28ca7710d50215db6b76ab8bc9181c3e712ed4"
 dependencies = [
  "arr_macro",
  "bincode",
@@ -3334,7 +3276,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -3356,7 +3298,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3462,7 +3404,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3473,7 +3415,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3645,9 +3587,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -3689,7 +3631,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e923028..4dd86ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ toml = "0.8.14"
 serde = { version = "1.0.203", features = ["derive"] }
 log = "0.4.22"
 env_logger = "0.11.3"
-vek = "0.17.0"
+vek = { version = "0.17.0", features = ["repr_simd"] }
 hashbrown = { version = "0.14.5", features = ["equivalent"] }
 
 [patch.crates-io]
diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron
index 9d1d1f7..fbf33ea 100644
--- a/assets/common/abilities/ability_set_manifest.ron
+++ b/assets/common/abilities/ability_set_manifest.ron
@@ -658,6 +658,15 @@
         secondary: Simple(None, "common.abilities.custom.crab.triplestrike"),
         abilities: [],
     ),
+    Custom("Karkatha"): (
+        primary: Simple(None, "common.abilities.custom.karkatha.triplestrike"),
+        secondary: Simple(None, "common.abilities.custom.karkatha.leap"),
+        abilities: [
+            Simple(None, "common.abilities.custom.karkatha.spinleap"),
+            Simple(None, "common.abilities.custom.karkatha.summoncrabs"),            
+            Simple(None, "common.abilities.custom.karkatha.riposte"),                        
+        ],
+    ),    
     /// TODO: Organize the rest into further catagories and give purple tier droppers+ custom skillsets
     Custom("Turret"): (
         primary: Simple(None, "common.abilities.custom.turret.arrows"),
@@ -1010,6 +1019,11 @@
         secondary: Simple(None, "common.abilities.music.shamisen"),
         abilities: [],
     ),
+    Custom("Kora"): (
+        primary: Simple(None, "common.abilities.music.kora"),
+        secondary: Simple(None, "common.abilities.music.kora"),
+        abilities: [],
+    ),    
     Tool(Debug): (
         primary: Simple(None, "common.abilities.debug.forwardboost"),
         secondary: Simple(None, "common.abilities.debug.upboost"),
@@ -1126,7 +1140,6 @@
         primary: Simple(None, "common.abilities.custom.cursekeeper.beam"),
         secondary: Simple(None, "common.abilities.custom.cursekeeper.trap"),
         abilities: [
-            Simple(None, "common.abilities.custom.cursekeeper.summonmogwai"),
             Simple(None, "common.abilities.custom.cursekeeper.summonbesieger"),
             Simple(None, "common.abilities.custom.cursekeeper.summonpursuer"),
             Simple(None, "common.abilities.custom.cursekeeper.summonshamanicspirit"),
@@ -1170,4 +1183,52 @@
         secondary: Simple(None, "common.abilities.custom.biped_large_cultist.bow.basic"),
         abilities: [],
     ),
+    Custom("Bloodmoon Bat"): (
+        primary: Simple(None, "common.abilities.vampire.bloodmoon_bat.shockwave_1"),
+        secondary: Simple(None, "common.abilities.vampire.bloodmoon_bat.shockwave_2"),
+        abilities: [
+            Simple(None, "common.abilities.vampire.bloodmoon_bat.teleport"),
+            Simple(None, "common.abilities.vampire.bloodmoon_bat.heal"),
+            Simple(None, "common.abilities.vampire.bloodmoon_bat.singlestrike"),
+            Simple(None, "common.abilities.vampire.bloodmoon_bat.lifestealbeam"),
+        ],
+    ),
+    Custom("Strigoi Claws"): (
+        primary: Simple(None, "common.abilities.vampire.strigoi.singlestrike"),
+        secondary: Simple(None, "common.abilities.vampire.strigoi.projectiles"),
+        abilities: [],
+    ),
+    Custom("Vampire Bat"): (
+        primary: Simple(None, "common.abilities.vampire.vampire_bat.upboost"),
+        secondary: Simple(None, "common.abilities.vampire.vampire_bat.shockwave_2"),
+        abilities: [
+            Simple(None, "common.abilities.vampire.vampire_bat.drop"),
+            Simple(None, "common.abilities.vampire.vampire_bat.teleport"),
+        ],
+    ),
+    Custom("Bloodmoon Heiress"): (
+        primary: Simple(None, "common.abilities.vampire.bloodmoon_heiress.singlestrike"),
+        secondary: Simple(None, "common.abilities.vampire.bloodmoon_heiress.dash"),
+        abilities: [
+            Simple(None, "common.abilities.vampire.bloodmoon_heiress.teleport"),
+            Simple(None, "common.abilities.vampire.bloodmoon_heiress.shockwave_2"),
+            Simple(None, "common.abilities.vampire.bloodmoon_heiress.summon"),
+            Simple(None, "common.abilities.vampire.bloodmoon_heiress.shockwave_1"),            
+        ],
+    ),
+    Custom("Harlequin"): (
+        primary: Simple(None, "common.abilities.vampire.harlequin.stab"),
+        secondary: Simple(None, "common.abilities.vampire.harlequin.throw"),
+        abilities: [],
+    ),
+    Custom("Bloodservant"): (
+        primary: Simple(None, "common.abilities.vampire.bloodservant.doublestrike"),
+        secondary: Simple(None, "common.abilities.vampire.bloodservant.doublestrike"),
+        abilities: [],
+    ),
+    Custom("Executioner"): (
+        primary: Simple(None, "common.abilities.vampire.executioner.doublestrike"),
+        secondary: Simple(None, "common.abilities.vampire.executioner.doublestrike"),
+        abilities: [],
+    ),
 })
diff --git a/assets/common/abilities/adlet/elder/leap.ron b/assets/common/abilities/adlet/elder/leap.ron
index f8f6193..bf0436f 100644
--- a/assets/common/abilities/adlet/elder/leap.ron
+++ b/assets/common/abilities/adlet/elder/leap.ron
@@ -23,5 +23,5 @@ LeapMelee(
     ),
     forward_leap_strength: 30.0,
     vertical_leap_strength: 15.0,
-    specifier: Some(ElderLeap),
-)
\ No newline at end of file
+    specifier: Some(LeapWhoosh),
+)
diff --git a/assets/common/abilities/adlet/elder/trap.ron b/assets/common/abilities/adlet/elder/trap.ron
index 5195c28..f08ef5b 100644
--- a/assets/common/abilities/adlet/elder/trap.ron
+++ b/assets/common/abilities/adlet/elder/trap.ron
@@ -5,10 +5,10 @@ BasicRanged(
     projectile: (
         kind: Hazard(
             is_sticky: true,
-            duration: 10,
+            duration: 20,
         ),
         attack: Some((
-            damage: 25,
+            damage: 15,
             energy: 0,
         )),
     ),
diff --git a/assets/common/abilities/adlet/elder/triplestrike.ron b/assets/common/abilities/adlet/elder/triplestrike.ron
index 37f941c..0836dae 100644
--- a/assets/common/abilities/adlet/elder/triplestrike.ron
+++ b/assets/common/abilities/adlet/elder/triplestrike.ron
@@ -8,15 +8,15 @@ ComboMelee2(
                     knockback: 5,
                     energy_regen: 0,
                 ),
-                range: 2.5,
+                range: 3.0,
                 angle: 30.0,
             ),
-            buildup_duration: 0.65,
-            swing_duration: 0.25,
+            buildup_duration: 0.85,
+            swing_duration: 0.4,
             hit_timing: 0.5,
             recover_duration: 0.4,
             movement: (
-                swing: Some(Forward(1.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -28,11 +28,11 @@ ComboMelee2(
                     knockback: 5,
                     energy_regen: 0,
                 ),
-                range: 2.5,
+                range: 3.0,
                 angle: 30.0,
             ),
             buildup_duration: 0.75,
-            swing_duration: 0.25,
+            swing_duration: 0.4,
             hit_timing: 0.5,
             recover_duration: 0.4,
             ori_modifier: 0.7,
@@ -45,15 +45,15 @@ ComboMelee2(
                     knockback: 5,
                     energy_regen: 0,
                 ),
-                range: 2.5,
+                range: 3.0,
                 angle: 30.0,
             ),
-            buildup_duration: 0.65,
-            swing_duration: 0.15,
+            buildup_duration: 0.85,
+            swing_duration: 0.35,
             hit_timing: 0.5,
             recover_duration: 0.4,
             movement: (
-                swing: Some(Forward(1.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/axe/cleave.ron b/assets/common/abilities/axe/cleave.ron
index c3c96c2..944a036 100644
--- a/assets/common/abilities/axe/cleave.ron
+++ b/assets/common/abilities/axe/cleave.ron
@@ -13,7 +13,7 @@ ChargedMelee(
                 damage: 20,
                 poise: 5,
                 knockback: 0,
-                energy_regen: 20,
+                energy_regen: 25,
             ))),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/axe/triple_chop.ron b/assets/common/abilities/axe/triple_chop.ron
index 90881d4..8dfe48c 100644
--- a/assets/common/abilities/axe/triple_chop.ron
+++ b/assets/common/abilities/axe/triple_chop.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 7,
+                    energy_regen: 8,
                 ),
                 range: 3.0,
                 angle: 30.0,
@@ -23,7 +23,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 7,
+                    energy_regen: 8,
                 ),
                 range: 3.0,
                 angle: 30.0,
@@ -40,7 +40,7 @@ ComboMelee2(
                     damage: 8,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 7,
+                    energy_regen: 9,
                 ),
                 range: 3.0,
                 angle: 10.0,
diff --git a/assets/common/abilities/bowsimple/basic.ron b/assets/common/abilities/bowsimple/basic.ron
index 7eec20d..4fdd300 100644
--- a/assets/common/abilities/bowsimple/basic.ron
+++ b/assets/common/abilities/bowsimple/basic.ron
@@ -1,11 +1,11 @@
 BasicRanged(
     energy_cost: 0,
-    buildup_duration: 0.5,
-    recover_duration: 0.3,
+    buildup_duration: 1.3,
+    recover_duration: 0.9,
     projectile: (
         kind: Pointed,
         attack: Some((
-            damage: 3.5,
+            damage: 8.5,
             knockback: Some(5),
             energy: 4,
             buff: Some((
diff --git a/assets/common/abilities/custom/birdlargefire/firerain.ron b/assets/common/abilities/custom/birdlargefire/firerain.ron
index 688c842..1958769 100644
--- a/assets/common/abilities/custom/birdlargefire/firerain.ron
+++ b/assets/common/abilities/custom/birdlargefire/firerain.ron
@@ -13,12 +13,12 @@ RepeaterRanged(
             terrain: Some((2, Black))
         ),
         attack: Some((
-            damage: 31,
+            damage: 27,
             energy: 20,
             buff: Some((
                 kind: Burning,
                 dur_secs: 4,
-                strength: DamageFraction(1.0),
+                strength: DamageFraction(0.7),
                 chance: 1.0,
             )),
         )),
diff --git a/assets/common/abilities/custom/birdlargefire/heat_laser.ron b/assets/common/abilities/custom/birdlargefire/heat_laser.ron
index a509626..0e5fbdc 100644
--- a/assets/common/abilities/custom/birdlargefire/heat_laser.ron
+++ b/assets/common/abilities/custom/birdlargefire/heat_laser.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.5,
-    recover_duration: 0.3,
+    buildup_duration: 0.8,
+    recover_duration: 0.4,
     beam_duration: 1.0,
-    damage: 30.0,
+    damage: 23.7,
     tick_rate: 1.0,
     range: 120.0,
     max_angle: 1.0,
diff --git a/assets/common/abilities/custom/birdlargefire/legstrike.ron b/assets/common/abilities/custom/birdlargefire/legstrike.ron
index 0fbbdd3..f55c1e8 100644
--- a/assets/common/abilities/custom/birdlargefire/legstrike.ron
+++ b/assets/common/abilities/custom/birdlargefire/legstrike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 35,
+                    damage: 27,
                     poise: 0,
                     knockback: 15,
                     energy_regen: 0,
@@ -11,8 +11,8 @@ ComboMelee2(
                 range: 6.0,
                 angle: 90.0,
             ),
-            buildup_duration: 0.1,
-            swing_duration: 0.1,
+            buildup_duration: 0.4,
+            swing_duration: 0.25,
             hit_timing: 0.5,
             recover_duration: 0.1,
             movement: (
diff --git a/assets/common/abilities/custom/birdlargefire/shortstrike.ron b/assets/common/abilities/custom/birdlargefire/shortstrike.ron
index 8e91e42..d620b2e 100644
--- a/assets/common/abilities/custom/birdlargefire/shortstrike.ron
+++ b/assets/common/abilities/custom/birdlargefire/shortstrike.ron
@@ -11,8 +11,8 @@ ComboMelee2(
                 range: 6.0,
                 angle: 90.0,
             ),
-            buildup_duration: 0.2,
-            swing_duration: 0.1,
+            buildup_duration: 0.3,
+            swing_duration: 0.2,
             hit_timing: 0.5,
             recover_duration: 0.1,
             movement: (
diff --git a/assets/common/abilities/custom/birdlargefire/triplestrike.ron b/assets/common/abilities/custom/birdlargefire/triplestrike.ron
index 6059d51..f024be6 100644
--- a/assets/common/abilities/custom/birdlargefire/triplestrike.ron
+++ b/assets/common/abilities/custom/birdlargefire/triplestrike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 20,
+                    damage: 18,
                     poise: 0,
                     knockback: 5,
                     energy_regen: 0,
@@ -12,7 +12,7 @@ ComboMelee2(
                 angle: 30.0,
             ),
             buildup_duration: 0.8,
-            swing_duration: 0.1,
+            swing_duration: 0.25,
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
@@ -43,7 +43,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 26,
+                    damage: 24,
                     poise: 0,
                     knockback: 10,
                     energy_regen: 0,
@@ -52,7 +52,7 @@ ComboMelee2(
                 angle: 30.0,
             ),
             buildup_duration: 0.8,
-            swing_duration: 0.3,
+            swing_duration: 0.35,
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
diff --git a/assets/common/abilities/custom/claygolem/dashstrike.ron b/assets/common/abilities/custom/claygolem/dashstrike.ron
index 7b0e381..0774467 100644
--- a/assets/common/abilities/custom/claygolem/dashstrike.ron
+++ b/assets/common/abilities/custom/claygolem/dashstrike.ron
@@ -12,8 +12,8 @@ ComboMelee2(
                 angle: 60.0,
             ),
             buildup_duration: 2.0,
-            swing_duration: 0.8,
-            hit_timing: 0.5,
+            swing_duration: 1.0,
+            hit_timing: 0.45,
             recover_duration: 3.0,
             movement: (
                 buildup: Some(Forward(1.0)),
diff --git a/assets/common/abilities/custom/claygolem/strike.ron b/assets/common/abilities/custom/claygolem/strike.ron
index e206a0d..75fecb0 100644
--- a/assets/common/abilities/custom/claygolem/strike.ron
+++ b/assets/common/abilities/custom/claygolem/strike.ron
@@ -12,8 +12,8 @@ ComboMelee2(
                 angle: 60.0,
             ),
             buildup_duration: 1.4,
-            swing_duration: 0.1,
-            hit_timing: 0.5,
+            swing_duration: 0.35,
+            hit_timing: 0.45,
             recover_duration: 0.5,
             movement: (
                 swing: Some(Forward(0.5)),
diff --git a/assets/common/abilities/custom/claysteed/basic.ron b/assets/common/abilities/custom/claysteed/basic.ron
index 08e98ec..3732413 100644
--- a/assets/common/abilities/custom/claysteed/basic.ron
+++ b/assets/common/abilities/custom/claysteed/basic.ron
@@ -6,7 +6,7 @@ BasicMelee(
     recover_duration: 0.85,
     melee_constructor: (
         kind: Bash(
-            damage:20.0,
+            damage:26.0,
             poise: 28.0,
             knockback: 15.0,
             energy_regen: 0.0,
diff --git a/assets/common/abilities/custom/claysteed/shockwave.ron b/assets/common/abilities/custom/claysteed/shockwave.ron
index e7a491d..07d9a75 100644
--- a/assets/common/abilities/custom/claysteed/shockwave.ron
+++ b/assets/common/abilities/custom/claysteed/shockwave.ron
@@ -8,7 +8,7 @@ Shockwave(
     knockback: (strength: 20.0, direction: TowardsUp),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
-    shockwave_speed: 25.0,
+    shockwave_speed: 15.0,
     shockwave_duration: 2.0,
     dodgeable: Jump,
     move_efficiency: 0.0,
diff --git a/assets/common/abilities/custom/cloudwyvern/lightningshockwave.ron b/assets/common/abilities/custom/cloudwyvern/lightningshockwave.ron
index cf7a87f..4927a3e 100644
--- a/assets/common/abilities/custom/cloudwyvern/lightningshockwave.ron
+++ b/assets/common/abilities/custom/cloudwyvern/lightningshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.0,
     damage: 20.0,
diff --git a/assets/common/abilities/custom/cloudwyvern/lightningthrower.ron b/assets/common/abilities/custom/cloudwyvern/lightningthrower.ron
index 570e034..f0ae07c 100644
--- a/assets/common/abilities/custom/cloudwyvern/lightningthrower.ron
+++ b/assets/common/abilities/custom/cloudwyvern/lightningthrower.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.3,
-    recover_duration: 1.5,
+    buildup_duration: 0.9,
+    recover_duration: 2.0,
     beam_duration: 2.0,
-    damage: 22.5,
+    damage: 12.5,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
diff --git a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron
index 6059d51..9559250 100644
--- a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron
@@ -16,7 +16,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -36,7 +36,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -56,7 +56,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(1.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/custom/cursekeeper/beam.ron b/assets/common/abilities/custom/cursekeeper/beam.ron
index fc4419c..3124d38 100644
--- a/assets/common/abilities/custom/cursekeeper/beam.ron
+++ b/assets/common/abilities/custom/cursekeeper/beam.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.3,
     recover_duration: 1.5,
     beam_duration: 2.0,
-    damage: 20.0,
+    damage: 10.0,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 2,
     energy_drain: 0,
-    ori_rate: 0.5,
+    ori_rate: 0.42,
     specifier: Poison,
 )
diff --git a/assets/common/abilities/custom/cursekeeper/poisonbomb.ron b/assets/common/abilities/custom/cursekeeper/poisonbomb.ron
index 679aa81..51090f3 100644
--- a/assets/common/abilities/custom/cursekeeper/poisonbomb.ron
+++ b/assets/common/abilities/custom/cursekeeper/poisonbomb.ron
@@ -1,6 +1,6 @@
 BasicRanged(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 1.3,
     recover_duration: 0.3,
     projectile: (
         kind: Explosive(
@@ -10,7 +10,7 @@ BasicRanged(
             terrain: Some((5, Black)),
         ),
         attack: Some((
-            damage: 32,
+            damage: 29,
             knockback: Some(10),
             energy: 0,
             buff: Some((
@@ -23,7 +23,7 @@ BasicRanged(
     ),
     projectile_body: Object(SpitPoison),
     projectile_light: None,
-    projectile_speed: 25.0,
+    projectile_speed: 10.0,
     num_projectiles: Value(2),
     projectile_spread: 0.1,
     move_efficiency: 0.3,
diff --git a/assets/common/abilities/custom/cyclops/doublestrike.ron b/assets/common/abilities/custom/cyclops/doublestrike.ron
index f026ad2..b4f42d0 100644
--- a/assets/common/abilities/custom/cyclops/doublestrike.ron
+++ b/assets/common/abilities/custom/cyclops/doublestrike.ron
@@ -28,7 +28,7 @@ ComboMelee2(
                     knockback: 10,
                     energy_regen: 0,
                 ),
-                range: 8.0,
+                range: 7.0,
                 angle: 45.0,
                 damage_effect: Some(Buff((
                     kind: Crippled,
diff --git a/assets/common/abilities/custom/dagon/dagonbombs.ron b/assets/common/abilities/custom/dagon/dagonbombs.ron
index 471d7ff..a193b02 100644
--- a/assets/common/abilities/custom/dagon/dagonbombs.ron
+++ b/assets/common/abilities/custom/dagon/dagonbombs.ron
@@ -1,7 +1,7 @@
 BasicRanged(
     energy_cost: 0,
-    buildup_duration: 0.5,
-    recover_duration: 1.5,
+    buildup_duration: 1.0,
+    recover_duration: 2.0,
     projectile: (
         kind: Explosive(
             radius: 5,
@@ -10,7 +10,7 @@ BasicRanged(
             terrain: Some((25, Black)),
         ),
         attack: Some((
-            damage: 32,
+            damage: 46,
             knockback: Some(15),
             energy: 0,
             buff: Some((
@@ -23,7 +23,7 @@ BasicRanged(
     ),
     projectile_body: Object(DagonBomb),
     projectile_light: None,
-    projectile_speed: 20.0,
+    projectile_speed: 15.0,
     num_projectiles: Value(1),
     projectile_spread: 0.0,
     move_efficiency: 0.3,
diff --git a/assets/common/abilities/custom/dagon/seaurchins.ron b/assets/common/abilities/custom/dagon/seaurchins.ron
index e5300db..a428e72 100644
--- a/assets/common/abilities/custom/dagon/seaurchins.ron
+++ b/assets/common/abilities/custom/dagon/seaurchins.ron
@@ -4,7 +4,7 @@ SpriteSummon(
     recover_duration: 0.9,
     sprite: SeaUrchin,
     del_timeout: Some((4, 5)),
-    summon_distance: (5, 3.1),
+    summon_distance: (8, 6.1),
     sparseness: 0.2,
     angle: 360,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/dagon/steambeam.ron b/assets/common/abilities/custom/dagon/steambeam.ron
index 5ea8687..18b97f3 100644
--- a/assets/common/abilities/custom/dagon/steambeam.ron
+++ b/assets/common/abilities/custom/dagon/steambeam.ron
@@ -1,9 +1,9 @@
 BasicBeam(
-    buildup_duration: 0.3,
+    buildup_duration: 1.0,
     recover_duration: 1.0,
     beam_duration: 1.0,
-    damage: 22.5,
-    tick_rate: 5.0,
+    damage: 12.0,
+    tick_rate: 3.0,
     range: 12.0,
     max_angle: 15.0,
     damage_effect: Some(Buff((
diff --git a/assets/common/abilities/custom/dagon/steamwave.ron b/assets/common/abilities/custom/dagon/steamwave.ron
index 3920651..8b6aa21 100644
--- a/assets/common/abilities/custom/dagon/steamwave.ron
+++ b/assets/common/abilities/custom/dagon/steamwave.ron
@@ -1,15 +1,15 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 0.5,
-    damage: 20.0,
+    damage: 25.0,
     poise_damage: 10,
     knockback: (strength: 18.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
-    shockwave_speed: 15.0,
-    shockwave_duration: 2.0,
+    shockwave_speed: 7.0,
+    shockwave_duration: 3.0,
     dodgeable: Jump,
     move_efficiency: 0.0,
     damage_kind: Crushing,
diff --git a/assets/common/abilities/custom/dullahan/melee.ron b/assets/common/abilities/custom/dullahan/melee.ron
index 21043c2..6bd16a0 100644
--- a/assets/common/abilities/custom/dullahan/melee.ron
+++ b/assets/common/abilities/custom/dullahan/melee.ron
@@ -18,7 +18,7 @@ ComboMelee2(
                 ))),
             ),
             buildup_duration: 0.7,
-            swing_duration: 0.2,
+            swing_duration: 0.3,
             hit_timing: 0.4,
             recover_duration: 0.3,
             movement: (
diff --git a/assets/common/abilities/custom/dwarves/flamekeeper/flamethrower.ron b/assets/common/abilities/custom/dwarves/flamekeeper/flamethrower.ron
index ed436be..1bf66c0 100644
--- a/assets/common/abilities/custom/dwarves/flamekeeper/flamethrower.ron
+++ b/assets/common/abilities/custom/dwarves/flamekeeper/flamethrower.ron
@@ -1,5 +1,5 @@
 BasicBeam(
-    buildup_duration: 0.1,
+    buildup_duration: 0.5,
     recover_duration: 1.5,
     beam_duration: 1.0,
     damage: 10.0,
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 0,
     energy_drain: 0,
-    ori_rate: 5.0,
+    ori_rate: 4.0,
     specifier: Flamethrower,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/dwarves/forgemaster/flamethrower.ron b/assets/common/abilities/custom/dwarves/forgemaster/flamethrower.ron
index ed436be..be49a61 100644
--- a/assets/common/abilities/custom/dwarves/forgemaster/flamethrower.ron
+++ b/assets/common/abilities/custom/dwarves/forgemaster/flamethrower.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.1,
     recover_duration: 1.5,
     beam_duration: 1.0,
-    damage: 10.0,
+    damage: 7.0,
     tick_rate: 3.0,
     range: 80.0,
     max_angle: 20.0,
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 0,
     energy_drain: 0,
-    ori_rate: 5.0,
+    ori_rate: 3.6,
     specifier: Flamethrower,
 )
\ No newline at end of file
diff --git a/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron b/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron
index 15c8d00..0545ac4 100644
--- a/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron
+++ b/assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron
@@ -3,7 +3,7 @@ Shockwave(
     buildup_duration: 1.2,
     swing_duration: 0.4,
     recover_duration: 1.2,
-    damage: 20.0,
+    damage: 35.0,
     poise_damage: 10,
     knockback: (strength: 30.0, direction: Away),
     shockwave_angle: 360.0,
diff --git a/assets/common/abilities/custom/dwarves/iron_dwarf/singlestrike.ron b/assets/common/abilities/custom/dwarves/iron_dwarf/singlestrike.ron
index da3ed62..c3c1202 100644
--- a/assets/common/abilities/custom/dwarves/iron_dwarf/singlestrike.ron
+++ b/assets/common/abilities/custom/dwarves/iron_dwarf/singlestrike.ron
@@ -11,8 +11,8 @@ ComboMelee2(
                 range: 2.5,
                 angle: 60.0,
             ),
-            buildup_duration: 0.5,
-            swing_duration: 0.07,
+            buildup_duration: 0.8,
+            swing_duration: 0.27,
             hit_timing: 0.5,
             recover_duration: 0.5,
             movement: (
diff --git a/assets/common/abilities/custom/dwarves/snaretongue/beam.ron b/assets/common/abilities/custom/dwarves/snaretongue/beam.ron
index 4700f93..bb54832 100644
--- a/assets/common/abilities/custom/dwarves/snaretongue/beam.ron
+++ b/assets/common/abilities/custom/dwarves/snaretongue/beam.ron
@@ -2,13 +2,13 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.5,
     beam_duration: 1.0,
-    damage: 30.0,
+    damage: 10.0,
     tick_rate: 3.0,
     range: 80.0,
     max_angle: 15.0,
     damage_effect: Some(Buff((
         kind: Wet,
-        dur_secs: 60.0,
+        dur_secs: 20.0,
         strength: Value(0.5),
         chance: 1.0,
     ))),
diff --git a/assets/common/abilities/custom/dwarves/snaretongue/heal.ron b/assets/common/abilities/custom/dwarves/snaretongue/heal.ron
index 80705e9..9b569be 100644
--- a/assets/common/abilities/custom/dwarves/snaretongue/heal.ron
+++ b/assets/common/abilities/custom/dwarves/snaretongue/heal.ron
@@ -6,7 +6,7 @@ BasicAura(
     auras: [
         (
             kind: Regeneration,
-            strength: 200.0,
+            strength: 45.0,
             duration: Some(4),
             category: Magical,
         ),
diff --git a/assets/common/abilities/custom/dwarves/snaretongue/tongue.ron b/assets/common/abilities/custom/dwarves/snaretongue/tongue.ron
index b920119..5289514 100644
--- a/assets/common/abilities/custom/dwarves/snaretongue/tongue.ron
+++ b/assets/common/abilities/custom/dwarves/snaretongue/tongue.ron
@@ -11,10 +11,10 @@ ComboMelee2(
                 range: 2.5,
                 angle: 40.0,
             ),
-            buildup_duration: 0.3,
-            swing_duration: 0.2,
+            buildup_duration: 0.5,
+            swing_duration: 0.4,
             hit_timing: 0.4,
-            recover_duration: 0.3,
+            recover_duration: 0.5,
             movement: (
                 swing: Some(Forward(0.0)),
             ),
diff --git a/assets/common/abilities/custom/flamewyvern/fireshockwave.ron b/assets/common/abilities/custom/flamewyvern/fireshockwave.ron
index 9210d61..c4eae02 100644
--- a/assets/common/abilities/custom/flamewyvern/fireshockwave.ron
+++ b/assets/common/abilities/custom/flamewyvern/fireshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.0,
     damage: 20.0,
diff --git a/assets/common/abilities/custom/flamewyvern/flamethrower.ron b/assets/common/abilities/custom/flamewyvern/flamethrower.ron
index d5763bc..b93a672 100644
--- a/assets/common/abilities/custom/flamewyvern/flamethrower.ron
+++ b/assets/common/abilities/custom/flamewyvern/flamethrower.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.3,
-    recover_duration: 1.5,
+    buildup_duration: 0.9,
+    recover_duration: 2.0,
     beam_duration: 2.0,
-    damage: 22.5,
+    damage: 12.5,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
diff --git a/assets/common/abilities/custom/flamewyvern/triplestrike.ron b/assets/common/abilities/custom/flamewyvern/triplestrike.ron
index eb90889..7f17b1e 100644
--- a/assets/common/abilities/custom/flamewyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/flamewyvern/triplestrike.ron
@@ -16,7 +16,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -36,7 +36,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -56,7 +56,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(1.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/custom/frostwyvern/frostthrower.ron b/assets/common/abilities/custom/frostwyvern/frostthrower.ron
index 3bf5464..cd84c26 100644
--- a/assets/common/abilities/custom/frostwyvern/frostthrower.ron
+++ b/assets/common/abilities/custom/frostwyvern/frostthrower.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.3,
-    recover_duration: 1.5,
+    buildup_duration: 0.9,
+    recover_duration: 2.0,
     beam_duration: 2.0,
-    damage: 22.5,
+    damage: 12.5,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
diff --git a/assets/common/abilities/custom/frostwyvern/iceshockwave.ron b/assets/common/abilities/custom/frostwyvern/iceshockwave.ron
index 16fff38..686b610 100644
--- a/assets/common/abilities/custom/frostwyvern/iceshockwave.ron
+++ b/assets/common/abilities/custom/frostwyvern/iceshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.0,
     damage: 20.0,
diff --git a/assets/common/abilities/custom/frostwyvern/triplestrike.ron b/assets/common/abilities/custom/frostwyvern/triplestrike.ron
index 689005b..d9f1c6d 100644
--- a/assets/common/abilities/custom/frostwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/frostwyvern/triplestrike.ron
@@ -16,7 +16,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -36,7 +36,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -56,7 +56,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(1.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/custom/gravewarden/laser.ron b/assets/common/abilities/custom/gravewarden/laser.ron
index c7cea76..d190825 100644
--- a/assets/common/abilities/custom/gravewarden/laser.ron
+++ b/assets/common/abilities/custom/gravewarden/laser.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.75,
     recover_duration: 0.8,
     beam_duration: 0.25,
-    damage: 10.5,
+    damage: 11.5,
     tick_rate: 2.0,
     range: 40.0,
     max_angle: 1.0,
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 0,
     energy_drain: 0,
-    ori_rate: 0.07,
+    ori_rate: 0.5,
     specifier: Gravewarden,
 )
diff --git a/assets/common/abilities/custom/gravewarden/rocket.ron b/assets/common/abilities/custom/gravewarden/rocket.ron
index 08d0159..a6d036e 100644
--- a/assets/common/abilities/custom/gravewarden/rocket.ron
+++ b/assets/common/abilities/custom/gravewarden/rocket.ron
@@ -1,6 +1,6 @@
 BasicRanged(
     energy_cost: 0,
-    buildup_duration: 1.2,
+    buildup_duration: 1.4,
     recover_duration: 1.0,
     projectile: (
         kind: Explosive(
diff --git a/assets/common/abilities/custom/gravewarden/shockwave.ron b/assets/common/abilities/custom/gravewarden/shockwave.ron
index 0959389..e607689 100644
--- a/assets/common/abilities/custom/gravewarden/shockwave.ron
+++ b/assets/common/abilities/custom/gravewarden/shockwave.ron
@@ -6,7 +6,7 @@ Shockwave(
     damage: 75.0,
     poise_damage: 50,
     knockback: (strength: 30.0, direction: TowardsUp),
-    shockwave_angle: 180.0,
+    shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
     shockwave_speed: 15.0,
     shockwave_duration: 3.5,
diff --git a/assets/common/abilities/custom/gravewarden/strike.ron b/assets/common/abilities/custom/gravewarden/strike.ron
index 25b3c43..b917da9 100644
--- a/assets/common/abilities/custom/gravewarden/strike.ron
+++ b/assets/common/abilities/custom/gravewarden/strike.ron
@@ -3,16 +3,16 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Bash(
-                    damage: 30,
+                    damage: 40.5,
                     poise: 50,
                     knockback: 10.0,
                     energy_regen: 0,
                 ),
-                range: 4.0,
+                range: 6.0,
                 angle: 45.0,
             ),
             buildup_duration: 1.2,
-            swing_duration: 0.1,
+            swing_duration: 0.3,
             hit_timing: 0.4,
             recover_duration: 1.0,
             movement: (
diff --git a/assets/common/abilities/custom/hydra/multi_bite.ron b/assets/common/abilities/custom/hydra/multi_bite.ron
index ce160e1..018987e 100644
--- a/assets/common/abilities/custom/hydra/multi_bite.ron
+++ b/assets/common/abilities/custom/hydra/multi_bite.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 15,
+                    damage: 18,
                     poise: 9,
                     knockback: 1,
                     energy_regen: 0,
@@ -23,7 +23,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 16,
+                    damage: 20,
                     poise: 11,
                     knockback: 7,
                     energy_regen: 0,
diff --git a/assets/common/abilities/custom/hydra/poison.ron b/assets/common/abilities/custom/hydra/poison.ron
index bb24dbd..dbea982 100644
--- a/assets/common/abilities/custom/hydra/poison.ron
+++ b/assets/common/abilities/custom/hydra/poison.ron
@@ -3,12 +3,12 @@ Shockwave(
     buildup_duration: 0.6,
     swing_duration: 0.3,
     recover_duration: 0.3,
-    damage: 30.0,
+    damage: 35.0,
     poise_damage: 0,
     knockback: (strength: 0.0, direction: Away),
     shockwave_angle: 140.0,
     shockwave_vertical_angle: 360.0,
-    shockwave_speed: 3.0,
+    shockwave_speed: 2.5,
     shockwave_duration: 7.0,
     dodgeable: No,
     move_efficiency: 0.0,
@@ -18,7 +18,7 @@ Shockwave(
     damage_effect: Some(Buff((
         kind: Poisoned,
         dur_secs: 5.0,
-        strength: Value(25.0),
+        strength: Value(8.0),
         chance: 1.0,
     ))),
     timing: PostBuildup,
diff --git a/assets/common/abilities/custom/hydra/poison_ball.ron b/assets/common/abilities/custom/hydra/poison_ball.ron
index 8f62d28..06903f2 100644
--- a/assets/common/abilities/custom/hydra/poison_ball.ron
+++ b/assets/common/abilities/custom/hydra/poison_ball.ron
@@ -14,7 +14,7 @@ BasicRanged(
         )),
     ),
     projectile_body: Object(PoisonBall),
-    projectile_speed: 150.0,
+    projectile_speed: 30.0,
     num_projectiles: PerHead(1),
     projectile_spread: 0.5,
     move_efficiency: 0.3,
diff --git a/assets/common/abilities/custom/hydra/poison_wave.ron b/assets/common/abilities/custom/hydra/poison_wave.ron
index 7b75c6d..a62ce85 100644
--- a/assets/common/abilities/custom/hydra/poison_wave.ron
+++ b/assets/common/abilities/custom/hydra/poison_wave.ron
@@ -1,14 +1,14 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.4,
     swing_duration: 0.3,
     recover_duration: 2.0,
-    damage: 30.0,
+    damage: 33.0,
     poise_damage: 10,
     knockback: (strength: 14.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,
-    shockwave_speed: 15.0,
+    shockwave_speed: 5.0,
     shockwave_duration: 3.0,
     dodgeable: Jump,
     move_efficiency: 0.0,
@@ -17,8 +17,8 @@ Shockwave(
     ori_rate: 1.0,
     damage_effect: Some(Buff((
         kind: Poisoned,
-        dur_secs: 20.0,
-        strength: Value(10.0),
+        dur_secs: 5.0,
+        strength: Value(6.0),
         chance: 1.0,
     ))),
     timing: PostBuildup,
diff --git a/assets/common/abilities/custom/hydra/tail_swipe.ron b/assets/common/abilities/custom/hydra/tail_swipe.ron
index 495a4ef..ee64741 100644
--- a/assets/common/abilities/custom/hydra/tail_swipe.ron
+++ b/assets/common/abilities/custom/hydra/tail_swipe.ron
@@ -3,7 +3,7 @@ ChargedMelee(
     energy_drain: 0,
     melee_constructor: (
         kind: Bash(
-            damage: 8.0,
+            damage: 10.0,
             poise: 5.0,
             knockback: 10.0,
             energy_regen: 0.0,
@@ -21,7 +21,7 @@ ChargedMelee(
         multi_target: Some(Normal),
     ),
     charge_duration: 1.5,
-    swing_duration: 0.8,
+    swing_duration: 1.2,
     hit_timing: 0.2,
     recover_duration: 0.2,
 )
diff --git a/assets/common/abilities/custom/jiangshi/poisonshockwave.ron b/assets/common/abilities/custom/jiangshi/poisonshockwave.ron
index ac9779e..46b3982 100644
--- a/assets/common/abilities/custom/jiangshi/poisonshockwave.ron
+++ b/assets/common/abilities/custom/jiangshi/poisonshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.5,
     damage: 25.0,
@@ -8,7 +8,7 @@ Shockwave(
     knockback: (strength: 18.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 360.0,
-    shockwave_speed: 15.0,
+    shockwave_speed: 5.0,
     shockwave_duration: 2.0,
     dodgeable: Roll,
     move_efficiency: 0.0,
diff --git a/assets/common/abilities/custom/karkatha/leap.ron b/assets/common/abilities/custom/karkatha/leap.ron
new file mode 100644
index 0000000..9b95dd4
--- /dev/null
+++ b/assets/common/abilities/custom/karkatha/leap.ron
@@ -0,0 +1,21 @@
+LeapMelee(
+    energy_cost: 0,
+    buildup_duration: 0.45,
+    movement_duration: 0.3,
+    swing_duration: 0.1,
+    recover_duration: 1.5,
+    melee_constructor: (
+        kind: Slash(
+            damage: 32.0,
+            poise: 60.0,
+            knockback: 10.0,
+            energy_regen: 0.0,
+        ),
+        range: 4.75,
+        angle: 180.0,
+        multi_target: Some(Normal),
+    ),
+    forward_leap_strength: 45.0,
+    vertical_leap_strength: 10.0,
+    specifier: Some(LeapWhoosh),
+)
diff --git a/assets/common/abilities/custom/karkatha/riposte.ron b/assets/common/abilities/custom/karkatha/riposte.ron
new file mode 100644
index 0000000..7226244
--- /dev/null
+++ b/assets/common/abilities/custom/karkatha/riposte.ron
@@ -0,0 +1,17 @@
+RiposteMelee(
+    energy_cost: 0,
+    buildup_duration: 0.3,
+    swing_duration: 0.9,
+    recover_duration: 0.3,
+    block_strength: 50.0,
+    melee_constructor: (
+        kind: Slash(
+            damage: 20,
+            poise: 30,
+            knockback: 15,
+            energy_regen: 0,
+        ),
+        range: 4.0,
+        angle: 60.0,
+    ),
+)
diff --git a/assets/common/abilities/custom/karkatha/spinleap.ron b/assets/common/abilities/custom/karkatha/spinleap.ron
new file mode 100644
index 0000000..eb674d6
--- /dev/null
+++ b/assets/common/abilities/custom/karkatha/spinleap.ron
@@ -0,0 +1,21 @@
+LeapMelee(
+    energy_cost: 0,
+    buildup_duration: 0.95,
+    movement_duration: 0.4,
+    swing_duration: 0.3,
+    recover_duration: 1.5,
+    melee_constructor: (
+        kind: Bash(
+            damage: 42.0,
+            poise: 60.0,
+            knockback: 24.0,
+            energy_regen: 0.0,
+        ),
+        range: 6.75,
+        angle: 180.0,
+        multi_target: Some(Normal),
+    ),
+    forward_leap_strength: 45.0,
+    vertical_leap_strength: 18.0,
+    specifier: Some(LeapSwoosh),
+)
diff --git a/assets/common/abilities/custom/karkatha/summoncrabs.ron b/assets/common/abilities/custom/karkatha/summoncrabs.ron
new file mode 100644
index 0000000..4caa6bb
--- /dev/null
+++ b/assets/common/abilities/custom/karkatha/summoncrabs.ron
@@ -0,0 +1,22 @@
+BasicSummon(
+    buildup_duration: 0.5,
+    cast_duration: 0.5,
+    recover_duration: 0.5,
+    summon_amount: 20,
+    summon_distance: (10, 20),
+    summon_info: (
+        body: Crustacean((
+            species: SoldierCrab,
+            body_type: Male,
+        )),
+        scale: None,
+        use_npc_name: true,
+        has_health: true,
+        loadout_config: None,
+        skillset_config: Some(Rank3),
+    ),
+    duration: Some((
+        secs: 16,
+        nanos: 0,
+    )),
+)
diff --git a/assets/common/abilities/custom/karkatha/triplestrike.ron b/assets/common/abilities/custom/karkatha/triplestrike.ron
new file mode 100644
index 0000000..a215eb4
--- /dev/null
+++ b/assets/common/abilities/custom/karkatha/triplestrike.ron
@@ -0,0 +1,66 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 15,
+                    poise: 5,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 4.5,
+                angle: 30.0,
+            ),
+            buildup_duration: 0.9,
+            swing_duration: 0.4,
+            hit_timing: 0.5,
+            recover_duration: 0.6,
+            movement: (
+                swing: Some(Forward(0.2)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 18,
+                    poise: 8,
+                    knockback: 1,
+                    energy_regen: 0,
+                ),
+                range: 4.5,
+                angle: 30.0,
+            ),
+            buildup_duration: 1.05,
+            swing_duration: 0.35,
+            hit_timing: 0.5,
+            recover_duration: 0.6,
+            movement: (
+                swing: Some(Forward(0.2)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 32,
+                    poise: 9,
+                    knockback: 1,
+                    energy_regen: 0,
+                ),
+                range: 4.5,
+                angle: 30.0,
+            ),
+            buildup_duration: 1.05,
+            swing_duration: 0.35,
+            hit_timing: 0.5,
+            recover_duration: 0.6,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+    auto_progress: true,
+)
diff --git a/assets/common/abilities/custom/mogwai/breathe.ron b/assets/common/abilities/custom/mogwai/breathe.ron
index fc4419c..3aee660 100644
--- a/assets/common/abilities/custom/mogwai/breathe.ron
+++ b/assets/common/abilities/custom/mogwai/breathe.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.3,
     recover_duration: 1.5,
     beam_duration: 2.0,
-    damage: 20.0,
+    damage: 9.0,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 2,
     energy_drain: 0,
-    ori_rate: 0.5,
+    ori_rate: 0.4,
     specifier: Poison,
 )
diff --git a/assets/common/abilities/custom/seawyvern/inkshockwave.ron b/assets/common/abilities/custom/seawyvern/inkshockwave.ron
index 7814f35..9338480 100644
--- a/assets/common/abilities/custom/seawyvern/inkshockwave.ron
+++ b/assets/common/abilities/custom/seawyvern/inkshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.0,
     damage: 20.0,
diff --git a/assets/common/abilities/custom/seawyvern/inkthrower.ron b/assets/common/abilities/custom/seawyvern/inkthrower.ron
index 5cae603..e724949 100644
--- a/assets/common/abilities/custom/seawyvern/inkthrower.ron
+++ b/assets/common/abilities/custom/seawyvern/inkthrower.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.3,
-    recover_duration: 1.5,
+    buildup_duration: 0.9,
+    recover_duration: 2.0,
     beam_duration: 2.0,
-    damage: 22.5,
+    damage: 12.5,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
diff --git a/assets/common/abilities/custom/seawyvern/triplestrike.ron b/assets/common/abilities/custom/seawyvern/triplestrike.ron
index 1c4116e..e12d430 100644
--- a/assets/common/abilities/custom/seawyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/seawyvern/triplestrike.ron
@@ -16,7 +16,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -36,7 +36,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -56,7 +56,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(1.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/custom/shamanic_spirit/ironspikes.ron b/assets/common/abilities/custom/shamanic_spirit/ironspikes.ron
index 33bf86e..1206d29 100644
--- a/assets/common/abilities/custom/shamanic_spirit/ironspikes.ron
+++ b/assets/common/abilities/custom/shamanic_spirit/ironspikes.ron
@@ -1,5 +1,5 @@
 SpriteSummon(
-    buildup_duration: 0.5,
+    buildup_duration: 1.8,
     cast_duration: 0.1,
     recover_duration: 2.0,
     sprite: IronSpike,
diff --git a/assets/common/abilities/custom/terracotta_besieger/doublestrike.ron b/assets/common/abilities/custom/terracotta_besieger/doublestrike.ron
index d6d7579..f8c8e23 100644
--- a/assets/common/abilities/custom/terracotta_besieger/doublestrike.ron
+++ b/assets/common/abilities/custom/terracotta_besieger/doublestrike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Bash(
-                    damage: 18,
+                    damage: 22,
                     poise: 0,
                     knockback: 4,
                     energy_regen: 0,
@@ -29,9 +29,9 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Bash(
-                    damage: 26,
+                    damage: 28,
                     poise: 0,
-                    knockback: 16,
+                    knockback: 26,
                     energy_regen: 0,
                 ),
                 range: 5.5,
diff --git a/assets/common/abilities/custom/terracotta_demolisher/drop.ron b/assets/common/abilities/custom/terracotta_demolisher/drop.ron
index d4f8bbe..0c7dc3e 100644
--- a/assets/common/abilities/custom/terracotta_demolisher/drop.ron
+++ b/assets/common/abilities/custom/terracotta_demolisher/drop.ron
@@ -4,7 +4,7 @@ BasicRanged(
     recover_duration: 1.5,
     projectile: (
         kind: Explosive(
-            radius: 10,
+            radius: 5,
             min_falloff: 0.5,
             reagent: Some(Yellow),
             terrain: Some((2, Black))
@@ -15,7 +15,7 @@ BasicRanged(
             buff: Some((
                 kind: Burning,
                 dur_secs: 4,
-                strength: DamageFraction(1.0),
+                strength: DamageFraction(0.4),
                 chance: 0.6,
             )),
         )),
diff --git a/assets/common/abilities/custom/terracotta_demolisher/throw.ron b/assets/common/abilities/custom/terracotta_demolisher/throw.ron
index 834f77e..50bef52 100644
--- a/assets/common/abilities/custom/terracotta_demolisher/throw.ron
+++ b/assets/common/abilities/custom/terracotta_demolisher/throw.ron
@@ -15,7 +15,7 @@ BasicRanged(
             buff: Some((
                 kind: Burning,
                 dur_secs: 4,
-                strength: DamageFraction(1.0),
+                strength: DamageFraction(0.4),
                 chance: 0.6,
             )),
         )),
diff --git a/assets/common/abilities/custom/tidalwarrior/pincer.ron b/assets/common/abilities/custom/tidalwarrior/pincer.ron
index a4989a2..186bf14 100644
--- a/assets/common/abilities/custom/tidalwarrior/pincer.ron
+++ b/assets/common/abilities/custom/tidalwarrior/pincer.ron
@@ -6,7 +6,7 @@ BasicMelee(
     recover_duration: 1.2,
     melee_constructor: (
         kind: Bash(
-            damage: 7.5,
+            damage: 12.5,
             poise: 0.0,
             knockback: 50.0,
             energy_regen: 0.0,
diff --git a/assets/common/abilities/custom/tidalwarrior/scuttle.ron b/assets/common/abilities/custom/tidalwarrior/scuttle.ron
index c044922..ab3b3a4 100644
--- a/assets/common/abilities/custom/tidalwarrior/scuttle.ron
+++ b/assets/common/abilities/custom/tidalwarrior/scuttle.ron
@@ -9,7 +9,7 @@ DashMelee(
         ),
         scaled: Some((
             kind: Bash(
-                damage: 12.5,
+                damage: 18.5,
                 poise: 40.0,
                 knockback: 30.0,
                 energy_regen: 0.0,
diff --git a/assets/common/abilities/custom/tidalwarrior/totem_wave.ron b/assets/common/abilities/custom/tidalwarrior/totem_wave.ron
index a260075..e57f9b3 100644
--- a/assets/common/abilities/custom/tidalwarrior/totem_wave.ron
+++ b/assets/common/abilities/custom/tidalwarrior/totem_wave.ron
@@ -3,12 +3,12 @@ Shockwave(
     buildup_duration: 0.6,
     swing_duration: 0.1,
     recover_duration: 7.0,
-    damage: 1.5,
+    damage: 4.5,
     poise_damage: 0,
     knockback: ( strength: 18.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 30.0,
-    shockwave_speed: 10.0,
+    shockwave_speed: 8.0,
     shockwave_duration: 5.0,
     dodgeable: Jump,
     move_efficiency: 0.0,
diff --git a/assets/common/abilities/custom/turret/flamethrower_strong.ron b/assets/common/abilities/custom/turret/flamethrower_strong.ron
index 76c7c73..9f34bdd 100644
--- a/assets/common/abilities/custom/turret/flamethrower_strong.ron
+++ b/assets/common/abilities/custom/turret/flamethrower_strong.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 2.5,
     recover_duration: 0.01,
     beam_duration: 0.3,
-    damage: 6.0,
+    damage: 3.0,
     tick_rate: 3.0,
     range: 20.0,
     max_angle: 20.0,
diff --git a/assets/common/abilities/custom/wealdwyvern/poisonshockwave.ron b/assets/common/abilities/custom/wealdwyvern/poisonshockwave.ron
index 080b132..ca4767e 100644
--- a/assets/common/abilities/custom/wealdwyvern/poisonshockwave.ron
+++ b/assets/common/abilities/custom/wealdwyvern/poisonshockwave.ron
@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.3,
+    buildup_duration: 0.8,
     swing_duration: 0.3,
     recover_duration: 2.0,
     damage: 20.0,
diff --git a/assets/common/abilities/custom/wealdwyvern/poisonthrower.ron b/assets/common/abilities/custom/wealdwyvern/poisonthrower.ron
index e9061c9..ae74105 100644
--- a/assets/common/abilities/custom/wealdwyvern/poisonthrower.ron
+++ b/assets/common/abilities/custom/wealdwyvern/poisonthrower.ron
@@ -1,8 +1,8 @@
 BasicBeam(
-    buildup_duration: 0.3,
-    recover_duration: 1.5,
+    buildup_duration: 0.9,
+    recover_duration: 2.0,
     beam_duration: 2.0,
-    damage: 22.5,
+    damage: 12.5,
     tick_rate: 3.0,
     range: 22.0,
     max_angle: 22.5,
diff --git a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron
index 6ffb8d6..609970e 100644
--- a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron
@@ -16,7 +16,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -36,7 +36,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
@@ -56,7 +56,7 @@ ComboMelee2(
             hit_timing: 0.5,
             recover_duration: 0.6,
             movement: (
-                swing: Some(Forward(1.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.7,
         ),
diff --git a/assets/common/abilities/custom/yeti/frostbreath.ron b/assets/common/abilities/custom/yeti/frostbreath.ron
index 25abaef..bc36038 100644
--- a/assets/common/abilities/custom/yeti/frostbreath.ron
+++ b/assets/common/abilities/custom/yeti/frostbreath.ron
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 0,
     energy_drain: 0,
-    ori_rate: 0.2,
+    ori_rate: 0.15,
     specifier: Frost,
 )
diff --git a/assets/common/abilities/custom/yeti/icespikes.ron b/assets/common/abilities/custom/yeti/icespikes.ron
index 0a70a8f..6594784 100644
--- a/assets/common/abilities/custom/yeti/icespikes.ron
+++ b/assets/common/abilities/custom/yeti/icespikes.ron
@@ -1,9 +1,9 @@
 Shockwave(
     energy_cost: 0,
     buildup_duration: 0.9,
-    swing_duration: 0.15,
+    swing_duration: 0.25,
     recover_duration: 2.0,
-    damage: 18.0,
+    damage: 22.0,
     poise_damage: 10,
     knockback: (strength: 18.0, direction: Up),
     shockwave_angle: 90.0,
diff --git a/assets/common/abilities/custom/yeti/snowball.ron b/assets/common/abilities/custom/yeti/snowball.ron
index d931469..8bfc1eb 100644
--- a/assets/common/abilities/custom/yeti/snowball.ron
+++ b/assets/common/abilities/custom/yeti/snowball.ron
@@ -16,7 +16,7 @@ BasicRanged(
         )),
     ),
     projectile_body: Object(Snowball),
-    projectile_speed: 60.0,
+    projectile_speed: 37.0,
     num_projectiles: Value(1),
     projectile_spread: 0.0,
     move_efficiency: 0.3,
diff --git a/assets/common/abilities/hammer/solid_smash.ron b/assets/common/abilities/hammer/solid_smash.ron
index 2c51cee..47ec3bd 100644
--- a/assets/common/abilities/hammer/solid_smash.ron
+++ b/assets/common/abilities/hammer/solid_smash.ron
@@ -9,7 +9,7 @@ BasicMelee(
             damage: 10,
             poise: 10,
             knockback: 5,
-            energy_regen: 10,
+            energy_regen: 15,
         ),
         range: 3.0,
         angle: 15.0,
diff --git a/assets/common/abilities/hammer/wide_wallop.ron b/assets/common/abilities/hammer/wide_wallop.ron
index fe83255..41155b5 100644
--- a/assets/common/abilities/hammer/wide_wallop.ron
+++ b/assets/common/abilities/hammer/wide_wallop.ron
@@ -13,7 +13,7 @@ ChargedMelee(
                 damage: 40,
                 poise: 70,
                 knockback: 2,
-                energy_regen: 30,
+                energy_regen: 35,
             ))),
         range: 4.5,
         angle: 24.0,
diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron
index cfde38d..c50acbc 100644
--- a/assets/common/abilities/hammersimple/doublestrike.ron
+++ b/assets/common/abilities/hammersimple/doublestrike.ron
@@ -12,11 +12,11 @@ ComboMelee2(
                 angle: 50.0,
             ),
             buildup_duration: 0.6,
-            swing_duration: 0.08,
+            swing_duration: 0.25,
             hit_timing: 0.5,
-            recover_duration: 0.6,
+            recover_duration: 0.25,
             movement: (
-                swing: Some(Forward(3.5)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.65,
         ),
@@ -28,15 +28,15 @@ ComboMelee2(
                     knockback: 16,
                     energy_regen: 0,
                 ),
-                range: 2.5,
+                range: 4.0,
                 angle: 30.0,
             ),
-            buildup_duration: 0.6,
-            swing_duration: 0.25,
+            buildup_duration: 1,
+            swing_duration: 0.4,
             hit_timing: 0.5,
             recover_duration: 1.2,
             movement: (
-                swing: Some(Forward(2.0)),
+                swing: Some(Forward(0.5)),
             ),
             ori_modifier: 0.65,
         ),
diff --git a/assets/common/abilities/haniwa/archer/arrow.ron b/assets/common/abilities/haniwa/archer/arrow.ron
index 6214ee2..1280a1c 100644
--- a/assets/common/abilities/haniwa/archer/arrow.ron
+++ b/assets/common/abilities/haniwa/archer/arrow.ron
@@ -5,7 +5,7 @@ BasicRanged(
     projectile: (
         kind: Pointed,
         attack: Some((
-            damage: 25,
+            damage: 20,
             knockback: Some(8),
             energy: 0,
             buff: Some((
diff --git a/assets/common/abilities/haniwa/guard/strike.ron b/assets/common/abilities/haniwa/guard/strike.ron
index db8d777..42a4976 100644
--- a/assets/common/abilities/haniwa/guard/strike.ron
+++ b/assets/common/abilities/haniwa/guard/strike.ron
@@ -6,7 +6,7 @@ BasicMelee(
     recover_duration: 0.8,
     melee_constructor: (
         kind: Stab(
-            damage: 30,
+            damage: 26,
             poise: 15,
             knockback: 5,
             energy_regen: 0,
diff --git a/assets/common/abilities/haniwa/soldier/riposte.ron b/assets/common/abilities/haniwa/soldier/riposte.ron
index 78f9c1f..61919de 100644
--- a/assets/common/abilities/haniwa/soldier/riposte.ron
+++ b/assets/common/abilities/haniwa/soldier/riposte.ron
@@ -6,7 +6,7 @@ RiposteMelee(
     block_strength: 5.0,
     melee_constructor: (
         kind: Slash(
-            damage: 30,
+            damage: 26,
             poise: 60,
             knockback: 15,
             energy_regen: 0,
diff --git a/assets/common/abilities/haniwa/soldier/strike.ron b/assets/common/abilities/haniwa/soldier/strike.ron
index 9a0b9c9..66a2978 100644
--- a/assets/common/abilities/haniwa/soldier/strike.ron
+++ b/assets/common/abilities/haniwa/soldier/strike.ron
@@ -1,12 +1,12 @@
 BasicMelee(
     energy_cost: 0,
     buildup_duration: 0.8,
-    swing_duration: 0.2,
+    swing_duration: 0.25,
     hit_timing: 0.5,
     recover_duration: 0.6,
     melee_constructor: (
         kind: Slash(
-            damage: 40,
+            damage: 34,
             poise: 40,
             knockback: 10,
             energy_regen: 0,
diff --git a/assets/common/abilities/music/kora.ron b/assets/common/abilities/music/kora.ron
new file mode 100644
index 0000000..18f0a9b
--- /dev/null
+++ b/assets/common/abilities/music/kora.ron
@@ -0,0 +1,4 @@
+Music(
+    play_duration: 0.4,
+    ori_modifier: 1.0,
+)
\ No newline at end of file
diff --git a/assets/common/abilities/sword/agile_double_slash.ron b/assets/common/abilities/sword/agile_double_slash.ron
index 590839a..29bb2ae 100644
--- a/assets/common/abilities/sword/agile_double_slash.ron
+++ b/assets/common/abilities/sword/agile_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 2,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 7,
+                    energy_regen: 9,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -23,7 +23,7 @@ ComboMelee2(
                     damage: 3,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 10,
+                    energy_regen: 13,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/sword/basic_double_slash.ron b/assets/common/abilities/sword/basic_double_slash.ron
index df87e76..1aa9930 100644
--- a/assets/common/abilities/sword/basic_double_slash.ron
+++ b/assets/common/abilities/sword/basic_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 8,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -23,7 +23,7 @@ ComboMelee2(
                     damage: 7,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 12,
+                    energy_regen: 15,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/sword/basic_thrust.ron b/assets/common/abilities/sword/basic_thrust.ron
index 441647d..cd3c33a 100644
--- a/assets/common/abilities/sword/basic_thrust.ron
+++ b/assets/common/abilities/sword/basic_thrust.ron
@@ -13,7 +13,7 @@ ChargedMelee(
                 damage: 15,
                 poise: 5,
                 knockback: 0,
-                energy_regen: 20,
+                energy_regen: 25,
             ))),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/sword/cleaving_double_slash.ron b/assets/common/abilities/sword/cleaving_double_slash.ron
index 4d2ed0b..0fb39cc 100644
--- a/assets/common/abilities/sword/cleaving_double_slash.ron
+++ b/assets/common/abilities/sword/cleaving_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 5,
+                    energy_regen: 8,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -24,7 +24,7 @@ ComboMelee2(
                     damage: 7,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 10,
+                    energy_regen: 12,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/sword/cleaving_spiral_slash.ron b/assets/common/abilities/sword/cleaving_spiral_slash.ron
index f12c5fa..11538d1 100644
--- a/assets/common/abilities/sword/cleaving_spiral_slash.ron
+++ b/assets/common/abilities/sword/cleaving_spiral_slash.ron
@@ -13,7 +13,7 @@ ChargedMelee(
                 damage: 10,
                 poise: 10,
                 knockback: 0,
-                energy_regen: 10,
+                energy_regen: 15,
             ))),
         range: 3.0,
         angle: 360.0,
diff --git a/assets/common/abilities/sword/crippling_deep_rend.ron b/assets/common/abilities/sword/crippling_deep_rend.ron
index 388c60e..7f0ab91 100644
--- a/assets/common/abilities/sword/crippling_deep_rend.ron
+++ b/assets/common/abilities/sword/crippling_deep_rend.ron
@@ -24,7 +24,7 @@ ChargedMelee(
             damage: 6,
             poise: 0,
             knockback: 0,
-            energy_regen: 5,
+            energy_regen: 10,
         ),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/sword/crippling_double_slash.ron b/assets/common/abilities/sword/crippling_double_slash.ron
index 05e865d..021dd44 100644
--- a/assets/common/abilities/sword/crippling_double_slash.ron
+++ b/assets/common/abilities/sword/crippling_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 8,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -24,7 +24,7 @@ ComboMelee2(
                     damage: 7,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 12,
+                    energy_regen: 15,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/sword/defensive_double_slash.ron b/assets/common/abilities/sword/defensive_double_slash.ron
index 9915df4..216c097 100644
--- a/assets/common/abilities/sword/defensive_double_slash.ron
+++ b/assets/common/abilities/sword/defensive_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 4,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 8,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -23,7 +23,7 @@ ComboMelee2(
                     damage: 7,
                     poise: 5,
                     knockback: 0,
-                    energy_regen: 12,
+                    energy_regen: 15,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/sword/defensive_vital_jab.ron b/assets/common/abilities/sword/defensive_vital_jab.ron
index 3e3f62d..718d7a2 100644
--- a/assets/common/abilities/sword/defensive_vital_jab.ron
+++ b/assets/common/abilities/sword/defensive_vital_jab.ron
@@ -13,7 +13,7 @@ ChargedMelee(
                 damage: 12,
                 poise: 5,
                 knockback: 0,
-                energy_regen: 20,
+                energy_regen: 25,
             ))),
         range: 4.5,
         angle: 10.0,
diff --git a/assets/common/abilities/sword/heavy_double_slash.ron b/assets/common/abilities/sword/heavy_double_slash.ron
index 8e71761..8ff15d0 100644
--- a/assets/common/abilities/sword/heavy_double_slash.ron
+++ b/assets/common/abilities/sword/heavy_double_slash.ron
@@ -6,7 +6,7 @@ ComboMelee2(
                     damage: 5,
                     poise: 10,
                     knockback: 0,
-                    energy_regen: 8,
+                    energy_regen: 10,
                 ),
                 range: 3.0,
                 angle: 45.0,
@@ -23,7 +23,7 @@ ComboMelee2(
                     damage: 9,
                     poise: 15,
                     knockback: 0,
-                    energy_regen: 12,
+                    energy_regen: 15,
                 ),
                 range: 3.0,
                 angle: 45.0,
diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron
index d80d9e3..99e2b7a 100644
--- a/assets/common/abilities/swordsimple/doublestrike.ron
+++ b/assets/common/abilities/swordsimple/doublestrike.ron
@@ -3,7 +3,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 8,
+                    damage: 11,
                     poise: 15,
                     knockback: 8,
                     energy_regen: 0,
@@ -29,7 +29,7 @@ ComboMelee2(
         (
             melee_constructor: (
                 kind: Slash(
-                    damage: 10,
+                    damage: 13,
                     poise: 20,
                     knockback: 12,
                     energy_regen: 0,
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/heal.ron b/assets/common/abilities/vampire/bloodmoon_bat/heal.ron
new file mode 100644
index 0000000..bac229d
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/heal.ron
@@ -0,0 +1,19 @@
+BasicAura(
+    buildup_duration: 0.1,
+    cast_duration: 3.0,
+    recover_duration: 0.1,
+    targets: InGroup,
+    auras: [
+        (
+            kind: Regeneration,
+            strength: 30000.0,
+            duration: Some(3),
+            category: Magical,
+        ),
+    ],
+    aura_duration: Some(3.0),
+    range: 5.0,
+    energy_cost: 0.0,
+    scales_with_combo: false,
+    specifier: Some(HealingAura),
+)
\ No newline at end of file
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/lifestealbeam.ron b/assets/common/abilities/vampire/bloodmoon_bat/lifestealbeam.ron
new file mode 100644
index 0000000..653aea1
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/lifestealbeam.ron
@@ -0,0 +1,14 @@
+BasicBeam(
+    buildup_duration: 0.5,
+    recover_duration: 0.5,
+    beam_duration: 1,
+    damage: 30.0,
+    tick_rate: 2.0,
+    range: 25.0,
+    max_angle: 1.0,
+    damage_effect: Some(Lifesteal(0.5)),
+    energy_regen: 2.5,
+    energy_drain: 0,
+    ori_rate: 0.3,
+    specifier: LifestealBeam,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/shapeshift.ron b/assets/common/abilities/vampire/bloodmoon_bat/shapeshift.ron
new file mode 100644
index 0000000..6bf2aab
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/shapeshift.ron
@@ -0,0 +1,7 @@
+Transform(
+	buildup_duration: 0.1,
+	recover_duration: 0.1,
+	target: "common.entity.dungeon.vampire.bloodmoon_heiress",
+	specifier: Some(Evolve),
+	allow_players: false,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/shockwave_1.ron b/assets/common/abilities/vampire/bloodmoon_bat/shockwave_1.ron
new file mode 100644
index 0000000..ef33a60
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/shockwave_1.ron
@@ -0,0 +1,20 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 1.0,
+    swing_duration: 0.3,
+    recover_duration: 1.5,
+    damage: 40.0,
+    poise_damage: 10,
+    knockback: (strength: 18.0, direction: Away),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 180.0,
+    shockwave_speed: 10.0,
+    shockwave_duration: 0.75,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Lightning,
+    ori_rate: 1.0,
+    timing: PostBuildup,
+    emit_outcome: true,    
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/shockwave_2.ron b/assets/common/abilities/vampire/bloodmoon_bat/shockwave_2.ron
new file mode 100644
index 0000000..2cdb64e
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/shockwave_2.ron
@@ -0,0 +1,20 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    swing_duration: 0.3,
+    recover_duration: 1.5,
+    damage: 20.0,
+    poise_damage: 10,
+    knockback: (strength: 70.0, direction: TowardsUp),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 180.0,
+    shockwave_speed: 22.0,
+    shockwave_duration: 2.0,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Lightning,
+    ori_rate: 1.0,
+    timing: PostBuildup,
+    emit_outcome: true,    
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/singlestrike.ron b/assets/common/abilities/vampire/bloodmoon_bat/singlestrike.ron
new file mode 100644
index 0000000..ee21dd1
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/singlestrike.ron
@@ -0,0 +1,18 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    swing_duration: 0.07,
+    hit_timing: 0.5,
+    recover_duration: 0.5,
+    melee_constructor: (
+        kind: Stab(
+            damage: 35,
+            poise: 15,
+            knockback: 0,
+            energy_regen: 0,
+        ),
+        range: 2.5,
+        angle: 150.0,
+    ),
+    ori_modifier: 0.6,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_bat/teleport.ron b/assets/common/abilities/vampire/bloodmoon_bat/teleport.ron
new file mode 100644
index 0000000..33eddf7
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_bat/teleport.ron
@@ -0,0 +1,6 @@
+Blink(
+    buildup_duration: 0.2,
+    recover_duration: 0.2,
+    max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
+)
\ No newline at end of file
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/dash.ron b/assets/common/abilities/vampire/bloodmoon_heiress/dash.ron
new file mode 100644
index 0000000..bf24cb9
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/dash.ron
@@ -0,0 +1,28 @@
+DashMelee(
+    energy_cost: 10.0,
+    melee_constructor: (
+        kind: Stab(
+            damage: 50.0,
+            poise: 40.0,
+            knockback: 18.0,
+            energy_regen: 0.0,
+        ),
+        scaled: Some((
+            kind: Stab(
+                damage: 30.0,
+                poise: 0.0,
+                knockback: 18.0,
+                energy_regen: 0.0,
+            ))),
+        range: 3.0,
+        angle: 45.0,
+    ),
+    energy_drain: 0,
+    forward_speed: 8.0,
+    buildup_duration: 0.6,
+    charge_duration: 1.2,
+    swing_duration: 0.1,
+    recover_duration: 0.9,
+    ori_modifier: 0.3,
+    auto_charge: false,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_1.ron b/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_1.ron
new file mode 100644
index 0000000..c3272c1
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_1.ron
@@ -0,0 +1,20 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 0.4,
+    swing_duration: 0.3,
+    recover_duration: 0.5,
+    damage: 40.0,
+    poise_damage: 10,
+    knockback: (strength: 18.0, direction: Away),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 180.0,
+    shockwave_speed: 30.0,
+    shockwave_duration: 0.25,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Lightning,
+    ori_rate: 1.0,
+    timing: PostBuildup,
+    emit_outcome: true,    
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_2.ron b/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_2.ron
new file mode 100644
index 0000000..ef5a0ca
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/shockwave_2.ron
@@ -0,0 +1,20 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    swing_duration: 0.3,
+    recover_duration: 1.5,
+    damage: 20.0,
+    poise_damage: 10,
+    knockback: (strength: 60.0, direction: TowardsUp),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 180.0,
+    shockwave_speed: 22.0,
+    shockwave_duration: 2.0,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Lightning,
+    ori_rate: 1.0,
+    timing: PostBuildup,
+    emit_outcome: true,    
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/singlestrike.ron b/assets/common/abilities/vampire/bloodmoon_heiress/singlestrike.ron
new file mode 100644
index 0000000..2f1844f
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/singlestrike.ron
@@ -0,0 +1,25 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 45,
+                    poise: 20,
+                    knockback: 12,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+            ),
+            buildup_duration: 0.35,
+            swing_duration: 0.25,
+            hit_timing: 0.5,
+            recover_duration: 0.5,
+            movement: (
+                swing: None,
+            ),
+            ori_modifier: 0.7,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/summon.ron b/assets/common/abilities/vampire/bloodmoon_heiress/summon.ron
new file mode 100644
index 0000000..b0cdbcc
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/summon.ron
@@ -0,0 +1,19 @@
+BasicSummon(
+    buildup_duration: 0.2,
+    cast_duration: 0.3,
+    recover_duration: 0.3,
+    summon_amount: 2,
+    summon_distance: (1, 1),
+    summon_info: (
+        body: BipedSmall((
+            species: Bloodservant,
+            body_type: Male,
+        )),
+        use_npc_name: true,
+        scale: None,
+        has_health: true,
+        loadout_config: Some(BloodservantSummon),
+        skillset_config: Some(Rank5),
+    ),
+    duration: None,
+)
diff --git a/assets/common/abilities/vampire/bloodmoon_heiress/teleport.ron b/assets/common/abilities/vampire/bloodmoon_heiress/teleport.ron
new file mode 100644
index 0000000..33eddf7
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodmoon_heiress/teleport.ron
@@ -0,0 +1,6 @@
+Blink(
+    buildup_duration: 0.2,
+    recover_duration: 0.2,
+    max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
+)
\ No newline at end of file
diff --git a/assets/common/abilities/vampire/bloodservant/doublestrike.ron b/assets/common/abilities/vampire/bloodservant/doublestrike.ron
new file mode 100644
index 0000000..e841d91
--- /dev/null
+++ b/assets/common/abilities/vampire/bloodservant/doublestrike.ron
@@ -0,0 +1,57 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 18,
+                    poise: 9,
+                    knockback: 8,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+                damage_effect: Some(Buff((
+                    kind: Bleeding,
+                    dur_secs: 10.0,
+                    strength: DamageFraction(0.1),
+                    chance: 0.1,
+                ))),
+            ),
+            buildup_duration: 0.4,
+            swing_duration: 0.08,
+            hit_timing: 0.5,
+            recover_duration: 0.5,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.7,
+        ),
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 25,
+                    poise: 15,
+                    knockback: 12,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 30.0,
+                damage_effect: Some(Buff((
+                    kind: Bleeding,
+                    dur_secs: 10.0,
+                    strength: DamageFraction(0.1),
+                    chance: 0.1,
+                ))),
+            ),
+            buildup_duration: 0.7,
+            swing_duration: 0.1,
+            hit_timing: 0.5,
+            recover_duration: 0.9,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.7,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
diff --git a/assets/common/abilities/vampire/executioner/doublestrike.ron b/assets/common/abilities/vampire/executioner/doublestrike.ron
new file mode 100644
index 0000000..ca5afa8
--- /dev/null
+++ b/assets/common/abilities/vampire/executioner/doublestrike.ron
@@ -0,0 +1,57 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 25,
+                    poise: 15,
+                    knockback: 8,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+                damage_effect: Some(Buff((
+                    kind: Bleeding,
+                    dur_secs: 10.0,
+                    strength: DamageFraction(0.1),
+                    chance: 0.1,
+                ))),
+            ),
+            buildup_duration: 0.4,
+            swing_duration: 0.08,
+            hit_timing: 0.5,
+            recover_duration: 0.5,
+            movement: (
+                swing: Some(Forward(1.5)),
+            ),
+            ori_modifier: 0.7,
+        ),
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 35,
+                    poise: 25,
+                    knockback: 12,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 30.0,
+                damage_effect: Some(Buff((
+                    kind: Bleeding,
+                    dur_secs: 10.0,
+                    strength: DamageFraction(0.1),
+                    chance: 0.1,
+                ))),
+            ),
+            buildup_duration: 0.7,
+            swing_duration: 0.1,
+            hit_timing: 0.5,
+            recover_duration: 1.0,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.7,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
diff --git a/assets/common/abilities/vampire/harlequin/stab.ron b/assets/common/abilities/vampire/harlequin/stab.ron
new file mode 100644
index 0000000..1883b87
--- /dev/null
+++ b/assets/common/abilities/vampire/harlequin/stab.ron
@@ -0,0 +1,18 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.2,
+    swing_duration: 0.05,
+    hit_timing: 0.4,
+    recover_duration: 0.375,
+    melee_constructor: (
+        kind: Stab(
+            damage: 15,
+            poise: 5,
+            knockback: 0,
+            energy_regen: 0,
+        ),
+        range: 3,
+        angle: 15,
+    ),
+    ori_modifier: 1.0,
+)
diff --git a/assets/common/abilities/vampire/harlequin/throw.ron b/assets/common/abilities/vampire/harlequin/throw.ron
new file mode 100644
index 0000000..2616569
--- /dev/null
+++ b/assets/common/abilities/vampire/harlequin/throw.ron
@@ -0,0 +1,25 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    recover_duration: 0.8,
+    projectile: (
+        kind: Pointed,
+        attack: Some((
+            damage: 16,
+            knockback: Some(1),
+            energy: 0,
+            buff: Some((
+                kind: Bleeding,
+                dur_secs: 10,
+                strength: DamageFraction(0.1),
+                chance: 0.1,
+            )),
+        )),
+    ),
+    projectile_body: Object(HarlequinDagger),
+    projectile_light: None,
+    projectile_speed: 40.0,
+    num_projectiles: Value(1),
+    projectile_spread: 0.0,
+    move_efficiency: 1.0,
+)
diff --git a/assets/common/abilities/vampire/strigoi/projectiles.ron b/assets/common/abilities/vampire/strigoi/projectiles.ron
new file mode 100644
index 0000000..7a59a8d
--- /dev/null
+++ b/assets/common/abilities/vampire/strigoi/projectiles.ron
@@ -0,0 +1,21 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.75,
+    recover_duration: 1.6,
+    projectile: (
+        kind: Hazard(
+            is_sticky: true,
+            duration: 3,
+        ),
+        attack: Some((
+            damage: 20,
+            energy: 0,
+        )),
+    ),
+    projectile_body: Object(StrigoiHead),
+    projectile_light: None,
+    projectile_speed: 40.0,
+    num_projectiles: Value(2),
+    projectile_spread: 0.1,
+    move_efficiency: 0.3,
+)
diff --git a/assets/common/abilities/vampire/strigoi/singlestrike.ron b/assets/common/abilities/vampire/strigoi/singlestrike.ron
new file mode 100644
index 0000000..cb89ad7
--- /dev/null
+++ b/assets/common/abilities/vampire/strigoi/singlestrike.ron
@@ -0,0 +1,18 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    swing_duration: 0.4,
+    hit_timing: 0.5,
+    recover_duration: 0.5,
+    melee_constructor: (
+        kind: Bash(
+            damage: 40,
+            poise: 18,
+            knockback: 15,
+            energy_regen: 0,
+        ),
+        range: 3.5,
+        angle: 60.0,
+    ),
+    ori_modifier: 0.6,
+)
\ No newline at end of file
diff --git a/assets/common/abilities/vampire/vampire_bat/drop.ron b/assets/common/abilities/vampire/vampire_bat/drop.ron
new file mode 100644
index 0000000..2c2ccfb
--- /dev/null
+++ b/assets/common/abilities/vampire/vampire_bat/drop.ron
@@ -0,0 +1,29 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 1.0,
+    recover_duration: 1.5,
+    projectile: (
+        kind: Explosive(
+            radius: 10,
+            min_falloff: 0.5,
+            reagent: Some(Yellow),
+            terrain: None
+        ),
+        attack: Some((
+            damage: 15,
+            energy: 0,
+            buff: Some((
+                kind: Burning,
+                dur_secs: 2,
+                strength: DamageFraction(0.5),
+                chance: 0.6,
+            )),
+        )),
+    ),
+    projectile_body: Object(BloodBomb),
+    projectile_light: None,
+    projectile_speed: 4.0,
+    num_projectiles: Value(2),
+    projectile_spread: 0.2,
+    move_efficiency: 0.3,
+)
diff --git a/assets/common/abilities/vampire/vampire_bat/shockwave_2.ron b/assets/common/abilities/vampire/vampire_bat/shockwave_2.ron
new file mode 100644
index 0000000..3c25082
--- /dev/null
+++ b/assets/common/abilities/vampire/vampire_bat/shockwave_2.ron
@@ -0,0 +1,20 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    swing_duration: 0.3,
+    recover_duration: 1.5,
+    damage: 20.0,
+    poise_damage: 10,
+    knockback: (strength: 60.0, direction: TowardsUp),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 180.0,
+    shockwave_speed: 5.0,
+    shockwave_duration: 1.5,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Lightning,
+    ori_rate: 1.0,
+    timing: PostBuildup,
+    emit_outcome: true,    
+)
diff --git a/assets/common/abilities/vampire/vampire_bat/teleport.ron b/assets/common/abilities/vampire/vampire_bat/teleport.ron
new file mode 100644
index 0000000..33eddf7
--- /dev/null
+++ b/assets/common/abilities/vampire/vampire_bat/teleport.ron
@@ -0,0 +1,6 @@
+Blink(
+    buildup_duration: 0.2,
+    recover_duration: 0.2,
+    max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
+)
\ No newline at end of file
diff --git a/assets/common/abilities/vampire/vampire_bat/upboost.ron b/assets/common/abilities/vampire/vampire_bat/upboost.ron
new file mode 100644
index 0000000..48dfa02
--- /dev/null
+++ b/assets/common/abilities/vampire/vampire_bat/upboost.ron
@@ -0,0 +1,6 @@
+Boost(
+    movement_duration: 0.05,
+    only_up: true,
+    speed: 180.0,
+    max_exit_velocity: 70.0,
+)
diff --git a/assets/common/entity/dungeon/sahagin/karkatha.ron b/assets/common/entity/dungeon/sahagin/karkatha.ron
new file mode 100644
index 0000000..098d4a9
--- /dev/null
+++ b/assets/common/entity/dungeon/sahagin/karkatha.ron
@@ -0,0 +1,13 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("karkatha"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.sahagin.karkatha"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [
+        SkillSetAsset("common.skillset.preset.rank5.fullskill"),
+    ],
+)
diff --git a/assets/common/entity/dungeon/sahagin/soldier_crab.ron b/assets/common/entity/dungeon/sahagin/soldier_crab.ron
new file mode 100644
index 0000000..dbf7351
--- /dev/null
+++ b/assets/common/entity/dungeon/sahagin/soldier_crab.ron
@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("soldier_crab"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.crustacean.crab"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/bloodmoon_bat.ron b/assets/common/entity/dungeon/vampire/bloodmoon_bat.ron
new file mode 100644
index 0000000..c12633d
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/bloodmoon_bat.ron
@@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("bloodmoon_bat"),
+    alignment: Alignment(Enemy),
+    loot: Nothing,
+    inventory: (
+        loadout: FromBody,
+    ),
+    death_effects: [Transform(entity_spec: "common.entity.dungeon.vampire.bloodmoon_heiress")],
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/bloodmoon_heiress.ron b/assets/common/entity/dungeon/vampire/bloodmoon_heiress.ron
new file mode 100644
index 0000000..694b56b
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/bloodmoon_heiress.ron
@@ -0,0 +1,18 @@
+#![enable(implicit_some)]
+(
+    name: Name("Bloodmoon Heiress"),
+    body: RandomWith("bloodmoon_heiress"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.vampire.bloodmoon_heiress"),
+    inventory: (
+        loadout: Inline((
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.bloodmoon_heiress_sword"), None)),
+            inherit: Asset("common.loadout.dungeon.vampire.bloodmoon_heiress"),
+
+        )),    ),
+        agent: (
+        idle_wander_factor: 0.0,
+        aggro_range_multiplier: 2.0,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/bloodservant.ron b/assets/common/entity/dungeon/vampire/bloodservant.ron
new file mode 100644
index 0000000..9dcde79
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/bloodservant.ron
@@ -0,0 +1,18 @@
+#![enable(implicit_some)]
+(
+    name: Name("Bloodservant"),
+    body: RandomWith("bloodservant"),
+    alignment: Alignment(Enemy),
+    loot: Nothing,
+    inventory: (
+        loadout: Inline((
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.bloodservant_axe"), None)),
+            inherit: Asset("common.loadout.dungeon.vampire.bloodservant"),
+
+        )),    ),
+        agent: (
+        idle_wander_factor: 0.0,
+        aggro_range_multiplier: 2.0,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/executioner.ron b/assets/common/entity/dungeon/vampire/executioner.ron
new file mode 100644
index 0000000..c7bbb3d
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/executioner.ron
@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Executioner"),
+    body: RandomWith("executioner"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.vampire.miniboss"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/harlequin.ron b/assets/common/entity/dungeon/vampire/harlequin.ron
new file mode 100644
index 0000000..ea8277c
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/harlequin.ron
@@ -0,0 +1,18 @@
+#![enable(implicit_some)]
+(
+    name: Name("Harlequin"),
+    body: RandomWith("harlequin"),
+    alignment: Alignment(Enemy),
+    loot: Item("common.items.keys.vampire_key"),
+    inventory: (
+        loadout: Inline((
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.harlequin_dagger"), None)),
+            inherit: Asset("common.loadout.dungeon.vampire.harlequin"),
+
+        )),    ),
+        agent: (
+        idle_wander_factor: 0.0,
+        aggro_range_multiplier: 2.0,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/strigoi.ron b/assets/common/entity/dungeon/vampire/strigoi.ron
new file mode 100644
index 0000000..d04c19a
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/strigoi.ron
@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Strigoi"),
+    body: RandomWith("strigoi"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.vampire.miniboss"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)
diff --git a/assets/common/entity/dungeon/vampire/vampire_bat.ron b/assets/common/entity/dungeon/vampire/vampire_bat.ron
new file mode 100644
index 0000000..d9be3dc
--- /dev/null
+++ b/assets/common/entity/dungeon/vampire/vampire_bat.ron
@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("vampire_bat"),
+    alignment: Alignment(Enemy),
+    loot: Nothing,
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)
diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron
index 426ea58..90e9778 100644
--- a/assets/common/item_i18n_manifest.ron
+++ b/assets/common/item_i18n_manifest.ron
@@ -24,6 +24,9 @@
         Simple(
             "common.items.npc_armor.bird_large.wyvern",
         ): "common-items-npc_armor-bird_large-wyvern",
+        Simple(
+            "common.items.npc_armor.bird_medium.bloodmoon_bat",
+        ): "common-items-npc_armor-bird_medium-bloodmoon_bat",
         Simple(
             "common.items.npc_armor.golem.claygolem",
         ): "common-items-npc_armor-golem-claygolem",
@@ -543,6 +546,54 @@
         Simple(
             "common.items.npc_armor.biped_small.shamanic_spirit.hand.shamanic_spirit",
         ): "common-items-npc_armor-biped_small-shamanic_spirit-hand-shamanic_spirit",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodmoon_heiress.chest.bloodmoon_heiress",
+        ): "common-items-npc_armor-biped_small-bloodmoon_heiress-chest-bloodmoon_heiress",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodmoon_heiress.foot.bloodmoon_heiress",
+        ): "common-items-npc_armor-biped_small-bloodmoon_heiress-foot-bloodmoon_heiress",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodmoon_heiress.hand.bloodmoon_heiress",
+        ): "common-items-npc_armor-biped_small-bloodmoon_heiress-hand-bloodmoon_heiress",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodmoon_heiress.head.bloodmoon_heiress",
+        ): "common-items-npc_armor-biped_small-bloodmoon_heiress-head-bloodmoon_heiress",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodmoon_heiress.pants.bloodmoon_heiress",
+        ): "common-items-npc_armor-biped_small-bloodmoon_heiress-pants-bloodmoon_heiress",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodservant.chest.bloodservant",
+        ): "common-items-npc_armor-biped_small-bloodservant-chest-bloodservant",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodservant.foot.bloodservant",
+        ): "common-items-npc_armor-biped_small-bloodservant-foot-bloodservant",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodservant.hand.bloodservant",
+        ): "common-items-npc_armor-biped_small-bloodservant-hand-bloodservant",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodservant.head.bloodservant",
+        ): "common-items-npc_armor-biped_small-bloodservant-head-bloodservant",
+        Simple(
+            "common.items.npc_armor.biped_small.bloodservant.pants.bloodservant",
+        ): "common-items-npc_armor-biped_small-bloodservant-pants-bloodservant",
+        Simple(
+            "common.items.npc_armor.biped_small.harlequin.chest.harlequin",
+        ): "common-items-npc_armor-biped_small-harlequin-chest-harlequin",
+        Simple(
+            "common.items.npc_armor.biped_small.harlequin.foot.harlequin",
+        ): "common-items-npc_armor-biped_small-harlequin-foot-harlequin",
+        Simple(
+            "common.items.npc_armor.biped_small.harlequin.hand.harlequin",
+        ): "common-items-npc_armor-biped_small-harlequin-hand-harlequin",
+        Simple(
+            "common.items.npc_armor.biped_small.harlequin.head.harlequin",
+        ): "common-items-npc_armor-biped_small-harlequin-head-harlequin",
+        Simple(
+            "common.items.npc_armor.biped_small.harlequin.pants.harlequin",
+        ): "common-items-npc_armor-biped_small-harlequin-pants-harlequin",
+        Simple(
+            "common.items.npc_armor.crustacean.karkatha",
+        ): "common-items-npc_armor-crustacean-karkatha",        
         Simple(
             "common.items.npc_armor.chest.leather_blue",
         ): "armor-leather_blue-pants",
@@ -636,6 +687,9 @@
         Simple(
             "common.items.keys.sahagin_key",
         ): "object-key-sahagin",
+        Simple(
+            "common.items.keys.vampire_key",
+        ): "object-key-vampire",
         Simple(
             "common.items.weapons.shield.shield_1",
         ): "weapon-shield-wood-0",
@@ -2321,6 +2375,9 @@
         Simple(
             "common.items.tool.instruments.shamisen",
         ): "weapon-tool-shamisen",
+        Simple(
+            "common.items.tool.instruments.kora",
+        ): "weapon-tool-kora",        
         Simple(
             "common.items.log.bamboo",
         ): "sprite-wood-item-bamboo",
@@ -2409,6 +2466,15 @@
         Simple(
             "common.items.npc_weapons.biped_small.haniwa.soldier",
         ): "common-items-npc_weapons-biped_small-haniwa-soldier",
+        Simple(
+            "common.items.npc_weapons.biped_small.vampire.harlequin_dagger",
+        ): "common-items-npc_weapons-biped_small-vampire-harlequin_dagger",
+        Simple(
+            "common.items.npc_weapons.biped_small.vampire.bloodservant_axe",
+        ): "common-items-npc_weapons-biped_small-vampire-bloodservant_axe",
+        Simple(
+            "common.items.npc_weapons.biped_small.vampire.bloodmoon_heiress_sword",
+        ): "common-items-npc_weapons-biped_small-vampire-bloodmoon_heiress_sword",
         Simple(
             "common.items.npc_weapons.bow.bipedlarge-velorite",
         ): "common-items-npc_weapons-bow-bipedlarge-velorite",
@@ -2421,6 +2487,9 @@
         Simple(
             "common.items.npc_weapons.axe.gigas_frost_axe",
         ): "common-items-npc_weapons-axe-gigas_frost_axe",
+        Simple(
+            "common.items.npc_weapons.axe.executioner_axe",
+        ): "common-items-npc_weapons-axe-executioner_axe",
         Simple(
             "common.items.npc_weapons.axe.minotaur_axe",
         ): "common-items-npc_weapons-axe-minotaur_axe",
@@ -2508,6 +2577,9 @@
         Simple(
             "common.items.npc_weapons.unique.crab_pincer",
         ): "common-items-npc_weapons-unique-crab_pincer",
+        Simple(
+            "common.items.npc_weapons.unique.karkatha_pincer",
+        ): "common-items-npc_weapons-unique-karkatha_pincer",        
         Simple(
             "common.items.npc_weapons.unique.dagon",
         ): "common-items-npc_weapons-unique-dagon",
@@ -2778,6 +2850,15 @@
         Simple(
             "common.items.npc_weapons.unique.arthropods.weevil",
         ): "common-items-npc_weapons-unique-arthropods-weevil",
+        Simple(
+            "common.items.npc_weapons.unique.bloodmoon_bat",
+        ): "common-items-npc_weapons-unique-bloodmoon_bat",
+        Simple(
+            "common.items.npc_weapons.unique.vampire_bat",
+        ): "common-items-npc_weapons-unique-vampire_bat",
+        Simple(
+            "common.items.npc_weapons.unique.strigoi_claws",
+        ): "common-items-npc_weapons-unique-strigoi_claws",
         Simple(
             "common.items.npc_weapons.hammer.bipedlarge-cultist",
         ): "common-items-npc_weapons-hammer-bipedlarge-cultist",
diff --git a/assets/common/items/keys/bloodmoon_key.ron b/assets/common/items/keys/bloodmoon_key.ron
new file mode 100644
index 0000000..135e544
--- /dev/null
+++ b/assets/common/items/keys/bloodmoon_key.ron
@@ -0,0 +1,10 @@
+ItemDef(
+    legacy_name: "Bloodmoon Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: High,
+    tags: [Utility],
+)
+
diff --git a/assets/common/items/keys/vampire_key.ron b/assets/common/items/keys/vampire_key.ron
new file mode 100644
index 0000000..75649a4
--- /dev/null
+++ b/assets/common/items/keys/vampire_key.ron
@@ -0,0 +1,10 @@
+ItemDef(
+    legacy_name: "Vampire Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: Common,
+    tags: [Utility],
+)
+
diff --git a/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/chest/bloodmoon_heiress.ron b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/chest/bloodmoon_heiress.ron
new file mode 100644
index 0000000..d357db6
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/chest/bloodmoon_heiress.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Chest",
+    legacy_description: "Bloodmoon Heiress Chest",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(50.0)),
+            poise_resilience: Some(Normal(20.0)),
+            precision_power: Some(0.06),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/foot/bloodmoon_heiress.ron b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/foot/bloodmoon_heiress.ron
new file mode 100644
index 0000000..fefbe17
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/foot/bloodmoon_heiress.ron
@@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Foot",
+    legacy_description: "Bloodmoon Heiress Foot",
+    kind: Armor((
+        kind: Foot,
+        stats: Direct((
+            protection: Some(Normal(10.0)),
+            poise_resilience: Some(Normal(5.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.018),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/hand/bloodmoon_heiress.ron b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/hand/bloodmoon_heiress.ron
new file mode 100644
index 0000000..db6f0a4
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/hand/bloodmoon_heiress.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Hand",
+    legacy_description: "Bloodmoon Heiress Hand",
+    kind: Armor((
+        kind: Hand,
+        stats: Direct((
+            protection: Some(Normal(9.0)),
+            poise_resilience: Some(Normal(4.0)),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/head/bloodmoon_heiress.ron b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/head/bloodmoon_heiress.ron
new file mode 100644
index 0000000..a5524c6
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/head/bloodmoon_heiress.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Head",
+    legacy_description: "Bloodmoon Heiress Head",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(11.0)),
+            poise_resilience: Some(Normal(4.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/pants/bloodmoon_heiress.ron b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/pants/bloodmoon_heiress.ron
new file mode 100644
index 0000000..ca9acdc
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodmoon_heiress/pants/bloodmoon_heiress.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Pants",
+    legacy_description: "Bloodmoon Heiress Pants",
+    kind: Armor((
+        kind: Pants,
+        stats: Direct((
+            protection: Some(Normal(12.0)),
+            poise_resilience: Some(Normal(6.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodservant/chest/bloodservant.ron b/assets/common/items/npc_armor/biped_small/bloodservant/chest/bloodservant.ron
new file mode 100644
index 0000000..7abac9b
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodservant/chest/bloodservant.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodservant Chest",
+    legacy_description: "Bloodservant Chest",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(10.0)),
+            poise_resilience: Some(Normal(50.0)),
+            precision_power: Some(0.06),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodservant/foot/bloodservant.ron b/assets/common/items/npc_armor/biped_small/bloodservant/foot/bloodservant.ron
new file mode 100644
index 0000000..79c2d62
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodservant/foot/bloodservant.ron
@@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Bloodservant Foot",
+    legacy_description: "Bloodservant Foot",
+    kind: Armor((
+        kind: Foot,
+        stats: Direct((
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(2.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.018),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodservant/hand/bloodservant.ron b/assets/common/items/npc_armor/biped_small/bloodservant/hand/bloodservant.ron
new file mode 100644
index 0000000..4c954e2
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodservant/hand/bloodservant.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodservant Hand",
+    legacy_description: "Bloodservant Hand",
+    kind: Armor((
+        kind: Hand,
+        stats: Direct((
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(1.0)),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodservant/head/bloodservant.ron b/assets/common/items/npc_armor/biped_small/bloodservant/head/bloodservant.ron
new file mode 100644
index 0000000..2dc43b1
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodservant/head/bloodservant.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodservant Head",
+    legacy_description: "Bloodservant Head",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(2.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/bloodservant/pants/bloodservant.ron b/assets/common/items/npc_armor/biped_small/bloodservant/pants/bloodservant.ron
new file mode 100644
index 0000000..cf12879
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/bloodservant/pants/bloodservant.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Bloodservant Pants",
+    legacy_description: "Bloodservant Pants",
+    kind: Armor((
+        kind: Pants,
+        stats: Direct((
+            protection: Some(Normal(5.0)),
+            poise_resilience: Some(Normal(3.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/harlequin/chest/harlequin.ron b/assets/common/items/npc_armor/biped_small/harlequin/chest/harlequin.ron
new file mode 100644
index 0000000..7526c8f
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/harlequin/chest/harlequin.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Harlequin Chest",
+    legacy_description: "Harlequin Chest",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(8.0)),
+            poise_resilience: Some(Normal(4.0)),
+            precision_power: Some(0.06),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/harlequin/foot/harlequin.ron b/assets/common/items/npc_armor/biped_small/harlequin/foot/harlequin.ron
new file mode 100644
index 0000000..d32db50
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/harlequin/foot/harlequin.ron
@@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Harlequin Foot",
+    legacy_description: "Harlequin Foot",
+    kind: Armor((
+        kind: Foot,
+        stats: Direct((
+            protection: Some(Normal(3.0)),
+            poise_resilience: Some(Normal(2.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.018),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/harlequin/hand/harlequin.ron b/assets/common/items/npc_armor/biped_small/harlequin/hand/harlequin.ron
new file mode 100644
index 0000000..5372bfa
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/harlequin/hand/harlequin.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Harlequin Hand",
+    legacy_description: "Harlequin Hand",
+    kind: Armor((
+        kind: Hand,
+        stats: Direct((
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(2.0)),
+            precision_power: Some(0.016),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/harlequin/head/harlequin.ron b/assets/common/items/npc_armor/biped_small/harlequin/head/harlequin.ron
new file mode 100644
index 0000000..a3b6e93
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/harlequin/head/harlequin.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Harlequin Head",
+    legacy_description: "Harlequin Head",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(5.0)),
+            poise_resilience: Some(Normal(4.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/biped_small/harlequin/pants/harlequin.ron b/assets/common/items/npc_armor/biped_small/harlequin/pants/harlequin.ron
new file mode 100644
index 0000000..7140c23
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_small/harlequin/pants/harlequin.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Harlequin Pants",
+    legacy_description: "Harlequin Pants",
+    kind: Armor((
+        kind: Pants,
+        stats: Direct((
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(2.0)),
+            precision_power: Some(0.032),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/bird_medium/bloodmoon_bat.ron b/assets/common/items/npc_armor/bird_medium/bloodmoon_bat.ron
new file mode 100644
index 0000000..a978caf
--- /dev/null
+++ b/assets/common/items/npc_armor/bird_medium/bloodmoon_bat.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    legacy_name: "Bloodmoon Bat Armor",
+    legacy_description: "Poise Resilience.",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(50.0)),
+            poise_resilience: Some(Normal(30.0)),
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)
diff --git a/assets/common/items/npc_armor/crustacean/karkatha.ron b/assets/common/items/npc_armor/crustacean/karkatha.ron
new file mode 100644
index 0000000..cde57ea
--- /dev/null
+++ b/assets/common/items/npc_armor/crustacean/karkatha.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    legacy_name: "Karkatha's Armor",
+    legacy_description: "Rigid enough to withstand the pressure of the deep ocean.",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(50.0)),
+            poise_resilience: Some(Normal(15.0)),
+        )),
+    )),
+    quality: High,
+    tags: [],
+)
diff --git a/assets/common/items/npc_weapons/axe/executioner_axe.ron b/assets/common/items/npc_weapons/axe/executioner_axe.ron
new file mode 100644
index 0000000..e68f158
--- /dev/null
+++ b/assets/common/items/npc_weapons/axe/executioner_axe.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Executioner Axe",
+    legacy_description: "Placeholder",
+    kind: Tool((
+        kind: Axe,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.5,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Legendary,
+    tags: [],
+    ability_spec: Some(Custom("Executioner")),
+)
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/vampire/bloodmoon_heiress_sword.ron b/assets/common/items/npc_weapons/biped_small/vampire/bloodmoon_heiress_sword.ron
new file mode 100644
index 0000000..54dbce5
--- /dev/null
+++ b/assets/common/items/npc_weapons/biped_small/vampire/bloodmoon_heiress_sword.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Bloodmoon Heiress Sword",
+    legacy_description: "Placeholder",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.5,
+            power: 1.5,
+            effect_power: 1.0,
+            speed: 0.75,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Bloodmoon Heiress")),
+)
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/vampire/bloodservant_axe.ron b/assets/common/items/npc_weapons/biped_small/vampire/bloodservant_axe.ron
new file mode 100644
index 0000000..fbf7504
--- /dev/null
+++ b/assets/common/items/npc_weapons/biped_small/vampire/bloodservant_axe.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Bloodservant Axe",
+    legacy_description: "Placeholder",
+    kind: Tool((
+        kind: Axe,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.5,
+            power: 1.5,
+            effect_power: 1.0,
+            speed: 0.75,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Bloodservant")),
+)
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/biped_small/vampire/harlequin_dagger.ron b/assets/common/items/npc_weapons/biped_small/vampire/harlequin_dagger.ron
new file mode 100644
index 0000000..bbe96eb
--- /dev/null
+++ b/assets/common/items/npc_weapons/biped_small/vampire/harlequin_dagger.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Harlequin Dagger",
+    legacy_description: "Placeholder",
+    kind: Tool((
+        kind: Dagger,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.5,
+            power: 1.5,
+            effect_power: 1.0,
+            speed: 0.75,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Harlequin")),
+)
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/bloodmoon_bat.ron b/assets/common/items/npc_weapons/unique/bloodmoon_bat.ron
new file mode 100644
index 0000000..ed51163
--- /dev/null
+++ b/assets/common/items/npc_weapons/unique/bloodmoon_bat.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Bloodmoon Bat",
+    legacy_description: "Bloodmoon Bat",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.01,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Bloodmoon Bat")),
+)
diff --git a/assets/common/items/npc_weapons/unique/karkatha_pincer.ron b/assets/common/items/npc_weapons/unique/karkatha_pincer.ron
new file mode 100644
index 0000000..bbaf1d5
--- /dev/null
+++ b/assets/common/items/npc_weapons/unique/karkatha_pincer.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Karkatha Pincer",
+    legacy_description: "testing123",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.5,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: High,
+    tags: [],
+    ability_spec: Some(Custom("Karkatha")),
+)
diff --git a/assets/common/items/npc_weapons/unique/strigoi_claws.ron b/assets/common/items/npc_weapons/unique/strigoi_claws.ron
new file mode 100644
index 0000000..0f96d3a
--- /dev/null
+++ b/assets/common/items/npc_weapons/unique/strigoi_claws.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Strigoi Claws",
+    legacy_description: "Placeholder",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.001,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Strigoi Claws")),
+)
\ No newline at end of file
diff --git a/assets/common/items/npc_weapons/unique/vampire_bat.ron b/assets/common/items/npc_weapons/unique/vampire_bat.ron
new file mode 100644
index 0000000..863b825
--- /dev/null
+++ b/assets/common/items/npc_weapons/unique/vampire_bat.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Vampire Bat",
+    legacy_description: "Vampire Bat",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.01,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Vampire Bat")),
+)
diff --git a/assets/common/items/recipes/instruments.ron b/assets/common/items/recipes/instruments.ron
index c8903d8..8e46f6b 100644
--- a/assets/common/items/recipes/instruments.ron
+++ b/assets/common/items/recipes/instruments.ron
@@ -13,6 +13,7 @@ ItemDef(
             "washboard",
             "sitar",
             "icy_talharpa",
+            "kora",            
         ],
     ),
     quality: Common,
diff --git a/assets/common/items/tool/instruments/kora.ron b/assets/common/items/tool/instruments/kora.ron
new file mode 100644
index 0000000..28b53bb
--- /dev/null
+++ b/assets/common/items/tool/instruments/kora.ron
@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Kora",
+    legacy_description: "Kora.",
+    kind: Tool((
+        kind: Instrument,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.4,
+            power: 0.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 0.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [Utility],
+    ability_spec: Some(Custom("Kora")),
+)
diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron
index c64f075..2b1e720 100644
--- a/assets/common/items/weapons/hammer/mjolnir.ron
+++ b/assets/common/items/weapons/hammer/mjolnir.ron
@@ -7,11 +7,11 @@ ItemDef(
         stats: (
             equip_time_secs: 0.5,
             power: 2.25,
-            effect_power: 1.0,
-            speed: 0.6,
+            effect_power: 1.2,
+            speed: 0.7,
             range: 1.0,
-            energy_efficiency: 1.0,
-            buff_strength: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 1.2,
         ),
     )),
     quality: Legendary,
diff --git a/assets/common/loadout/dungeon/vampire/bloodmoon_heiress.ron b/assets/common/loadout/dungeon/vampire/bloodmoon_heiress.ron
new file mode 100644
index 0000000..272698f
--- /dev/null
+++ b/assets/common/loadout/dungeon/vampire/bloodmoon_heiress.ron
@@ -0,0 +1,8 @@
+#![enable(implicit_some)]
+(
+    head: Item("common.items.npc_armor.biped_small.bloodmoon_heiress.head.bloodmoon_heiress"),
+    chest: Item("common.items.npc_armor.biped_small.bloodmoon_heiress.chest.bloodmoon_heiress"),
+    gloves: Item("common.items.npc_armor.biped_small.bloodmoon_heiress.hand.bloodmoon_heiress"),
+    legs: Item("common.items.npc_armor.biped_small.bloodmoon_heiress.pants.bloodmoon_heiress"),
+    feet: Item("common.items.npc_armor.biped_small.bloodmoon_heiress.foot.bloodmoon_heiress"),
+)
\ No newline at end of file
diff --git a/assets/common/loadout/dungeon/vampire/bloodservant.ron b/assets/common/loadout/dungeon/vampire/bloodservant.ron
new file mode 100644
index 0000000..80af18b
--- /dev/null
+++ b/assets/common/loadout/dungeon/vampire/bloodservant.ron
@@ -0,0 +1,8 @@
+#![enable(implicit_some)]
+(
+    head: Item("common.items.npc_armor.biped_small.bloodservant.head.bloodservant"),
+    chest: Item("common.items.npc_armor.biped_small.bloodservant.chest.bloodservant"),
+    gloves: Item("common.items.npc_armor.biped_small.bloodservant.hand.bloodservant"),
+    legs: Item("common.items.npc_armor.biped_small.bloodservant.pants.bloodservant"),
+    feet: Item("common.items.npc_armor.biped_small.bloodservant.foot.bloodservant"),
+)
\ No newline at end of file
diff --git a/assets/common/loadout/dungeon/vampire/harlequin.ron b/assets/common/loadout/dungeon/vampire/harlequin.ron
new file mode 100644
index 0000000..05fe8b5
--- /dev/null
+++ b/assets/common/loadout/dungeon/vampire/harlequin.ron
@@ -0,0 +1,8 @@
+#![enable(implicit_some)]
+(
+    head: Item("common.items.npc_armor.biped_small.harlequin.head.harlequin"),
+    chest: Item("common.items.npc_armor.biped_small.harlequin.chest.harlequin"),
+    gloves: Item("common.items.npc_armor.biped_small.harlequin.hand.harlequin"),
+    legs: Item("common.items.npc_armor.biped_small.harlequin.pants.harlequin"),
+    feet: Item("common.items.npc_armor.biped_small.harlequin.foot.harlequin"),
+)
\ No newline at end of file
diff --git a/assets/common/loot_tables/creature/quad_low/hydra.ron b/assets/common/loot_tables/creature/quad_low/hydra.ron
index cd21fb1..85041d5 100644
--- a/assets/common/loot_tables/creature/quad_low/hydra.ron
+++ b/assets/common/loot_tables/creature/quad_low/hydra.ron
@@ -1,7 +1,8 @@
 [
     (1, All([
         MultiDrop(Item("common.items.food.meat.beast_large_raw"), 5, 8),
-        MultiDrop(Item("common.items.crafting_ing.hide.plate"), 6, 10),
+        MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 6, 10),
+        MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 3, 6),
         MultiDrop(Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 2, 2),
         ],
     )),
diff --git a/assets/common/loot_tables/dungeon/sahagin/karkatha.ron b/assets/common/loot_tables/dungeon/sahagin/karkatha.ron
new file mode 100644
index 0000000..4751723
--- /dev/null
+++ b/assets/common/loot_tables/dungeon/sahagin/karkatha.ron
@@ -0,0 +1,6 @@
+[
+    // Weapons
+    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
+    // Special
+    (0.5, Item("common.items.glider.moonrise")),
+]
diff --git a/assets/common/loot_tables/dungeon/sahagin/tidalwarrior.ron b/assets/common/loot_tables/dungeon/sahagin/tidalwarrior.ron
index f5c6250..85eb474 100644
--- a/assets/common/loot_tables/dungeon/sahagin/tidalwarrior.ron
+++ b/assets/common/loot_tables/dungeon/sahagin/tidalwarrior.ron
@@ -1,9 +1,6 @@
 [
-    // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.5, LootTable("common.loot_tables.armor.tier-3")),
     // Special
     (1.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
-    (0.5, Item("common.items.glider.moonrise")),
 ]
diff --git a/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron b/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron
new file mode 100644
index 0000000..387bdc2
--- /dev/null
+++ b/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron
@@ -0,0 +1,12 @@
+[
+    (1, All([
+            MultiDrop(Item("common.items.utility.coins"), 200, 500),
+            Lottery([
+                // Weapons
+                (4.0, LootTable("common.loot_tables.weapons.tier-4")),
+                // Armor
+                (4.0, LootTable("common.loot_tables.armor.tier-4")),
+            ]),
+        ],
+    )),
+]
diff --git a/assets/common/loot_tables/dungeon/vampire/miniboss.ron b/assets/common/loot_tables/dungeon/vampire/miniboss.ron
new file mode 100644
index 0000000..1fea377
--- /dev/null
+++ b/assets/common/loot_tables/dungeon/vampire/miniboss.ron
@@ -0,0 +1,18 @@
+[
+    (1.0, All([
+        MultiDrop(Item("common.items.utility.coins"), 200, 500),
+        MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10),
+        MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8),
+
+        // Special drop
+        Lottery([
+            // Lantern drop
+            (0.15, Item("common.items.lantern.blue_0")),
+            // Hat drop
+            (0.3, Item("common.items.armor.misc.head.mitre")),
+            // Allow for Eldwood to drop until entity droppers are implemented
+            (0.5, Item("common.items.log.eldwood")),
+            (1.05, Nothing),
+        ]),
+    ]))
+]
diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron
index 12c0b4f..4a818ed 100644
--- a/assets/common/npc_names.ron
+++ b/assets/common/npc_names.ron
@@ -876,6 +876,14 @@
                 keyword: "toucan",
                 generic: "Toucan"
             ),
+            bloodmoon_bat: (
+                keyword: "bloodmoon_bat",
+                generic: "Bloodmoon Heiress"
+            ),
+            vampire_bat: (
+                keyword: "vampire_bat",
+                generic: "Vampire Bat"
+            ),
         )
     ),
     biped_large: (
@@ -1013,6 +1021,14 @@
             forgemaster: (
                 keyword: "forgemaster",
                 generic: "Forgemaster"
+            ),
+            executioner: (
+                keyword: "executioner",
+                generic: "Executioner"
+            ),
+            strigoi: (
+                keyword: "strigoi",
+                generic: "Strigoi"
             )
         )
     ),
@@ -1237,6 +1253,18 @@
                 keyword: "gnarling_chieftain",
                 generic: "Gnarling Chieftain"
             ),
+            bloodmoon_heiress: (
+                keyword: "bloodmoon_heiress",
+                generic: "Bloodmoon Heiress"
+            ),
+            bloodservant: (
+                keyword: "bloodservant",
+                generic: "Bloodservant"
+            ),
+            harlequin: (
+                keyword: "harlequin",
+                generic: "Harlequin"
+            ),
         )
     ),
     fish_small: (
@@ -1495,6 +1523,26 @@
                 keyword: "crab",
                 generic: "Crab",
             ),
-        )
+            soldier_crab: (
+                keyword: "soldier_crab",
+                generic: "Soldier Crab",
+            ),            
+            karkatha: (
+                keyword: "karkatha",
+                generic: "Karkatha",
+            ),
+        ),
+    ),
+    plugin: (
+        body: (
+            keyword: "plugin",
+            names_0: ["Nobody"]
+        ),
+        species: (
+            plugin: (
+                keyword: "unknown",
+                generic: "unknown",
+            ),
+        ),
     ),
 )
diff --git a/assets/common/plugin_bodies.ron b/assets/common/plugin_bodies.ron
new file mode 100644
index 0000000..7464132
--- /dev/null
+++ b/assets/common/plugin_bodies.ron
@@ -0,0 +1,3 @@
+([
+    // this file will be extended by NPCs in plugins
+])
diff --git a/assets/common/recipe_book_manifest.ron b/assets/common/recipe_book_manifest.ron
index ffc604a..316b241 100644
--- a/assets/common/recipe_book_manifest.ron
+++ b/assets/common/recipe_book_manifest.ron
@@ -2349,6 +2349,17 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "kora": (
+        output: ("common.items.tool.instruments.kora", 1),
+        inputs: [
+            (Item("common.items.log.hardwood"), 4, false),
+            (Item("common.items.crafting_ing.resin"), 2, false),
+            (Item("common.items.crafting_ing.cloth.silk"), 3, false),
+            (Item("common.items.crafting_ing.hide.animal_hide"), 2, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),    
     "lockpick": (
         output: ("common.items.utility.lockpick_0", 2),
         inputs: [
diff --git a/assets/credits.ron b/assets/credits.ron
new file mode 100644
index 0000000..d45210f
--- /dev/null
+++ b/assets/credits.ron
@@ -0,0 +1,158 @@
+(
+    // See best attribution practices for creative commons licenses:
+    // https://wiki.creativecommons.org/wiki/Best_practices_for_attribution
+
+    // TODO: consider splitting this into a file for each of common/voxygen/server assets (applications will
+    // need to ensure to properly combine them)
+    //
+    /// Entry format:
+    /// ```
+    /// (
+    ///     name: "Name of art",
+    ///     // Provide if the asset is from or derived from an external source that can be
+    ///     // linked.
+    ///     source_link: "https://fonts.com/fancyfont/",
+    ///     // Can be omitted if no authors are listed for some reason.
+    ///     // TODO: differentiate original authors and authors of derivative work / modifications?
+    ///     // Maybe for now this can be noted in parentheses like: "AuthorOne (original), AuthorTwo (derivative)"?
+    ///     authors: ["Art creator, Art co-creator"],
+    ///     // Must point to file that actually exists
+    ///     // TODO: would it make sense to allow having a list of files here?
+    ///     asset_path: "relative/path/to/asset.ext",
+    ///     // Can be omitted, but assumed to be GPL3 if not provided.
+    ///     license: "CC BY-SA 3.0",
+    ///     // Link to the license, can be omitted if the license can't be linked and/or a
+    ///     // local copy is provided.
+    ///     license_link: "https://creativecommons.org/licenses/by-sa/3.0/",
+    ///     // Note any modifcations if the original work has been modified
+    ///     modfications: "Added additional characters to the font.",
+    ///     // Any additional attribution notes that may be desired and/or required by the
+    ///     // respective license that can't be conveyed or would be awkward to convey with the
+    ///     // fields above.
+    ///     notes: "Other information",
+    /// )
+    /// ```
+    music: [],
+    fonts: [(
+        name: "Alkhemikal",
+        source_link: "https://fontenddev.com/fonts/alkhemikal/",
+        authors: ["jeti"],
+        asset_path: "voxygen/font/Alkhemikal.ttf",
+        license: "CC BY 4.0",
+        license_link: "https://creativecommons.org/licenses/by/4.0/",
+    ), (
+        name: "bdfUMplus outline",
+        authors: ["hikaen2"],
+        asset_path: "voxygen/font/bdfUMplus-outline.ttf",
+        // License text file included alongside font which should satisfy the requirements.
+        license: "MIT",
+    ), (
+        name: "HaxrCorp 4089 Cyrillic AltGr",
+        source_link: "https://fontstruct.com/fontstructions/show/330387/haxrcorp_4089_cyrillic_altgr",
+        authors: ["sahwar"],
+        asset_path: "voxygen/font/haxrcorp_4089_cyrillic_altgr.ttf",
+        license: "CC BY-SA 3.0",
+        license_link: "https://creativecommons.org/licenses/by-sa/3.0/",
+    ), (
+        name: "HaxrCorp 4089 Cyrillic AltGr Extended",
+        // original
+        source_link: "https://fontstruct.com/fontstructions/show/330387/haxrcorp_4089_cyrillic_altgr",
+        authors: ["sahwar (original)"],
+        asset_path: "voxygen/font/haxrcorp_4089_cyrillic_altgr_extended.ttf",
+        license: "CC BY-SA 3.0",
+        license_link: "https://creativecommons.org/licenses/by-sa/3.0/",
+        modifications: "Added additional characters.",
+        notes: "Derived from HaxrCorp 4089 Cyrillic AltGr",
+    ), (
+        name: "Metamorphous",
+        authors: ["Sorkin Type Co"],
+        asset_path: "voxygen/font/Metamorphous-Regular.ttf",
+        // License appears to be satisfied by inclusion of its text file.
+        license: "OFL",
+        license_link: "https://scripts.sil.org/OFL",
+    ), (
+        name: "Open Sans",
+        authors: [""],
+        asset_path: "voxygen/font/OpenSans-Regular.ttf",
+        // License appears to be satisfied by inclusion of its text file.
+        license: "Apache 2.0",
+        license_link: "http://www.apache.org/licenses/LICENSE-2.0",
+    ), (
+        name: "WenQuanYi Zen Hei",
+        source_link: "http://wenq.org/wqy2/index.cgi?ZenHei%28en%29",
+        authors: ["Qianqian Fang", "WenQuanYi project"],
+        asset_path: "voxygen/font/WenQuanYiZenHei.ttf",
+        license: "GPL2",
+        license_link: "http://wenq.org/wqy2/index.cgi?GPL",
+    ), (
+        name: "Wizard",
+        source_link: "https://fontstruct.com/fontstructions/show/1506403/wizard-5",
+        authors: ["Omegaville"],
+        asset_path: "voxygen/font/wizard.ttf",
+        license: "CC BY-SA 3.0",
+        license_link: "https://creativecommons.org/licenses/by-sa/3.0/",
+    ), (
+        name: "Wizard Extended",
+        // original
+        source_link: "https://fontstruct.com/fontstructions/show/1506403/wizard-5",
+        authors: ["Omegaville (original)"],
+        asset_path: "voxygen/font/wizard_extended.ttf",
+        license: "CC BY-SA 3.0",
+        license_link: "https://creativecommons.org/licenses/by-sa/3.0/",
+        modifications: "Added additional characters.",
+        notes: "Derived from Wizard",
+    ), (
+        name: "Sarabun",
+        authors: ["Suppakit Chalermlarp"],
+        asset_path: "voxygen/font/Sarabun-Regular.ttf",
+        // License appears to be satisfied by inclusion of its text file.
+        license: "OFL",
+        license_link: "https://scripts.sil.org/OFL",
+    ),],
+    models: [(
+        name: "Vroom",
+        authors: ["horblegorble"],
+        asset_path: "voxygen/voxel/glider/vroom.vox",
+        license: "CC-BY-NC-SA 4.0",
+        license_link: "https://creativecommons.org/licenses/by-nc-sa/4.0/",
+        notes: "exceptions (to the extent to which the license is prohibitive):
+        - appearances in images and videos (including streams) of veloren gameplay or model viewing/editing software
+        - official releases of veloren on platforms that have relevant restrictions"
+    ),
+    ],
+    other_art: [],
+    /// Entry format:
+    /// ```
+    /// (
+    ///     name: "Contributor name",
+    ///     contributions: "Note about what contributor contributed", // optional, field can be omitted
+    /// )
+    /// ```
+    contributors: [(
+        name: "zesterer",
+    ), (
+        name: "XVar",
+    ), (
+        name: "xMAC94",
+    ), (
+        name: "Timo",
+    ), (
+        name: "Songtronix",
+    ), (
+        name: "Snowram",
+    ), (
+        name: "Slipped",
+    ), (
+        name: "Sharp",
+    ), (
+        name: "Sam",
+    ), (
+        name: "Pfau",
+    ), (
+        name: "imbris",
+    ), (
+        name: "Christof",
+    ), (
+        name: "AngelOnFira",
+    )],
+)
diff --git a/assets/voxygen/i18n/en/_manifest.ron b/assets/voxygen/i18n/en/_manifest.ron
deleted file mode 100644
index 993c8fd..0000000
--- a/assets/voxygen/i18n/en/_manifest.ron
+++ /dev/null
@@ -1,32 +0,0 @@
-/// WARNING: Localization files shall be saved in UTF-8 format without BOM
-
-/// Localization for "global" English
-(
-    metadata: (
-        language_name: "English",
-        language_identifier: "en",
-    ),
-    convert_utf8_to_ascii: false,
-    fonts: {
-        "opensans": Font (
-            asset_key: "voxygen.font.OpenSans-Regular",
-            scale_ratio: 1.0,
-        ),
-        "metamorph": Font (
-            asset_key: "voxygen.font.Metamorphous-Regular",
-            scale_ratio: 1.0,
-        ),
-        "alkhemi": Font (
-            asset_key: "voxygen.font.Alkhemikal",
-            scale_ratio: 1.0,
-        ),
-        "wizard": Font (
-            asset_key: "voxygen.font.wizard",
-            scale_ratio: 1.0,
-        ),
-        "cyri": Font (
-            asset_key: "voxygen.font.haxrcorp_4089_cyrillic_altgr_extended",
-            scale_ratio: 1.0,
-        ),
-    }
-)
diff --git a/assets/voxygen/i18n/en/buff.ftl b/assets/voxygen/i18n/en/buff.ftl
deleted file mode 100644
index 7cb27e5..0000000
--- a/assets/voxygen/i18n/en/buff.ftl
+++ /dev/null
@@ -1,146 +0,0 @@
-## Regeneration
-buff-heal = Heal
-    .desc = Gain health over time.
-    .stat = Restores { $str_total } health points.
-## Potion
-buff-potion = Potion
-    .desc = Drinking...
-## Agility
-buff-agility = Agility
-    .desc = Your movement is faster, but you deal less damage, and take more damage.
-    .stat =
-        Increases movement speed by { $strength } %.
-        In return, your attack power and defense decrease drastically.
-## Saturation
-buff-saturation = Saturation
-    .desc = Gain health over time from consumables.
-## Campfire
-buff-campfire_heal = Campfire Heal
-    .desc = Resting at a campfire heals { $rate } % HP per second.
-## Energy Regen
-buff-energy_regen = Energy Regeneration
-    .desc = Faster energy regeneration.
-    .stat = Restores { $str_total } energy.
-## Health Increase
-buff-increase_max_health = Increase Max Health
-    .desc = Your maximum HP is increased.
-    .stat =
-        Raises maximum health
-        by { $strength }.
-## Energy Increase
-buff-increase_max_energy = Increase Max Energy
-    .desc = Your maximum energy is increased.
-    .stat =
-        Raises maximum energy
-        by { $strength }.
-## Invulnerability
-buff-invulnerability = Invulnerability
-    .desc = You cannot be damaged by any attack.
-    .stat = Grants invulnerability.
-## Protection Ward
-buff-protectingward = Protecting Ward
-    .desc = You are protected, somewhat, from attacks.
-## Frenzied
-buff-frenzied = Frenzied
-    .desc = You are imbued with unnatural speed and can ignore minor injuries.
-## Haste
-buff-hastened = Hastened
-    .desc = Your movements and attacks are faster.
-## Bleeding
-buff-bleed = Bleeding
-    .desc = Inflicts regular damage.
-## Curse
-buff-cursed = Cursed
-    .desc = You are cursed.
-## Burning
-buff-burn = On Fire
-    .desc = You are burning alive.
-## Crippled
-buff-crippled = Crippled
-    .desc = Your movement is crippled as your legs are heavily injured.
-## Freeze
-buff-frozen = Frozen
-    .desc = Your movements and attacks are slowed.
-## Wet
-buff-wet = Wet
-    .desc = The ground rejects your feet, making it hard to stop.
-## Poisoned
-buff-poisoned = Poisoned
-    .desc = You feel your life withering away...
-## Ensnared
-buff-ensnared = Ensnared
-    .desc = Vines grasp at your legs, impeding your movement.
-## Fortitude
-buff-fortitude = Fortitude
-    .desc = You can withstand staggers, and as you take more damage you stagger others more easily.
-## Parried
-buff-parried = Parried
-    .desc = You were parried and now are slow to recover.
-## Potion sickness
-buff-potionsickness = Potion sickness
-    .desc = Potions have less positive effect on you after recently consuming a potion.
-    .stat =
-        Decreases the positive effects of
-        subsequent potions by { $strength } %.
-## Reckless
-buff-reckless = Reckless
-    .desc = Your attacks are more powerful. However, you are leaving your defenses open.
-## Polymorped
-buff-polymorphed = Polymorphed
-    .desc = Your body changes form.
-## Frigid
-buff-frigid = Frigid
-    .desc = Freeze your foes.
-## Lifesteal
-buff-lifesteal = Lifesteal
-    .desc = Siphon your enemies' life away.
-## Salamander's Aspect
-buff-salamanderaspect = Salamander's Aspect
-    .desc = You cannot burn and you move fast through lava.
-## Imminent Critical
-buff-imminentcritical = Imminent Critical
-    .desc = Your next attack will critically hit the enemy.
-## Fury
-buff-fury = Fury
-    .desc = With your fury, your strikes generate more combo.
-## Sunderer
-buff-sunderer = Sunderer
-    .desc = Your attacks can break through your foes' defences and refresh you with more energy.
-## Defiance
-buff-defiance = Defiance
-    .desc = You can withstand mightier and more staggering blows and generate combo by being hit, however you are slower.
-## Bloodfeast
-buff-bloodfeast = Bloodfeast
-    .desc = You restore life on attacks against bleeding enemies.
-## Berserk
-buff-berserk = Berserk
-    .desc = You are in a berserking rage, causing your attacks to be more powerful and swift, and increasing your speed. However, as a result your defensive capability is less.
-## Heatstroke
-buff-heatstroke = Heatstroke
-    .desc = You were exposed to heat and now suffer from heatstroke. Your energy reward and movement speed are cut down. Chill.
-## Scornful Taunt
-buff-scornfultaunt = Scornful Taunt
-    .desc = You scornfully taunt your enemies, granting you bolstered fortitude and stamina. However, your death will bolster your killer.
-## Rooted
-buff-rooted = Rooted
-    .desc = You are stuck in place and cannot move.
-## Winded
-buff-winded = Winded
-    .desc = You can barely breathe hampering how much energy you can recover and how quickly you can move.
-## Concussion
-buff-concussion = Concussion
-    .desc = You have been hit hard on the head and have trouble focusing, preventing you from using some of your more complex attacks.
-## Staggered
-buff-staggered = Staggered
-    .desc = You are off balance and more susceptible to heavy attacks.
-## Tenacity
-buff-tenacity = Tenacity
-    .desc = You are not only able to shrug off heavier attacks, they energize you as well. However you are also slower.
-## Resilience
-buff-resilience = Resilience
-    .desc = After having just taken a debilitating attack, you become more resilient to future incapaciting effects.
-## Util
-buff-text-over_seconds = over { $dur_secs } seconds
-buff-text-for_seconds = for { $dur_secs } seconds
-buff-mysterious = Mysterious effect
-buff-remove = Click to remove
diff --git a/assets/voxygen/i18n/en/char_selection.ftl b/assets/voxygen/i18n/en/char_selection.ftl
deleted file mode 100644
index 03c8ab2..0000000
--- a/assets/voxygen/i18n/en/char_selection.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-char_selection-loading_characters = Loading characters...
-char_selection-delete_permanently = Permanently delete this character?
-char_selection-enter_world = Enter World
-char_selection-spectate = Spectate World
-char_selection-joining_character = Joining world...
-char_selection-logout = Logout
-char_selection-create_new_character = Create new character
-char_selection-creating_character = Creating character...
-char_selection-uncanny_valley = Wilderness
-char_selection-beard = Beard
-char_selection-hair_style = Hair Style
-char_selection-hair_color = Hair Color
-char_selection-eye_color = Eye Color
-char_selection-skin = Skin
-char_selection-eyeshape = Eye Details
-char_selection-accessories = Accessories
-char_selection-starting_site = Select Starting Area
-char_selection-starting_site_next = Next
-char_selection-starting_site_prev = Previous
-char_selection-starting_site_kind = Kind: { $kind }
-char_selection-create_info_name = Your character needs a name!
-char_selection-version_mismatch = WARNING! This server is running a different, possibly incompatible game version. Please update your game.
-char_selection-rules = Rules
diff --git a/assets/voxygen/i18n/en/command.ftl b/assets/voxygen/i18n/en/command.ftl
deleted file mode 100644
index 3881a5a..0000000
--- a/assets/voxygen/i18n/en/command.ftl
+++ /dev/null
@@ -1,107 +0,0 @@
-command-no-permission = You don't have permission to use '/{ $command_name }'
-command-position-unavailable = Cannot get position for { $target }
-command-player-role-unavailable = Cannot get administrator roles for { $target }
-command-uid-unavailable = Cannot get UID for { $target }
-command-area-not-found = Could not find area named '{ $area }'
-command-player-not-found = Player '{ $player }' not found!
-command-player-uuid-not-found = Player with UUID '{ $uuid }' not found!
-command-username-uuid-unavailable = Unable to determine UUID for username { $username }
-command-uuid-username-unavailable = Unable to determine username for UUID  { $uuid }
-command-no-sudo = It's rude to impersonate people
-command-entity-dead = Entity '{ $entity }' is dead!
-command-error-while-evaluating-request = Encountered an error while validating the request: { $error }
-command-give-inventory-full = Player inventory full. Gave { $given ->
-  [1] only one
-  *[other] { $given }
-} of { $total } items.
-command-give-inventory-success = Added { $total } x { $item } to the inventory.
-command-invalid-item = Invalid item: { $item }
-command-invalid-block-kind = Invalid block kind: { $kind }
-command-nof-entities-at-least = Number of entities should be at least 1
-command-nof-entities-less-than = Number of entities should be less than 50
-command-entity-load-failed = Failed to load entity config: { $config }
-command-spawned-entities-config = Spawned { $n } entities from config: { $config }
-command-invalid-sprite = Invalid sprite kind: { $kind }
-command-time-parse-too-large = { $n } is invalid, cannot be larger than 16 digits.
-command-time-parse-negative = { $n } is invalid, cannot be negative.
-command-time-backwards = { $t } is before the current time, time cannot go backwards.
-command-time-invalid = { $t } is not a valid time.
-command-rtsim-purge-perms = You must be a real admin (not just a temporary admin) to purge rtsim data.
-command-chunk-not-loaded = Chunk { $x }, { $y } not loaded
-command-chunk-out-of-bounds = Chunk { $x }, { $y } not within map bounds
-command-spawned-entity = Spawned entity with ID: { $id }
-command-spawned-dummy = Spawned a training dummy
-command-spawned-airship = Spawned an airship
-command-spawned-campfire = Spawned a campfire
-command-spawned-safezone = Spawned a safe zone
-command-volume-size-incorrect = Size has to be between 1 and 127.
-command-volume-created = Created a volume
-command-permit-build-given = You are now permitted to build in '{ $area }'
-command-permit-build-granted = Permission to build in '{ $area }' granted
-command-revoke-build-recv = Your permission to build in '{ $area }' has been revoked
-command-revoke-build = Permission to build in '{ $area }' revoked
-command-revoke-build-all = Your build permissions have been revoked.
-command-revoked-all-build = All build permissions revoked.
-command-no-buid-perms = You do not have permission to build.
-command-set-build-mode-off = Toggled build mode off.
-command-set-build-mode-on-persistent = Toggled build mode on. Experimental terrain persistence is enabled. The server will attempt to persist changes, but this is not guaranteed.
-command-set-build-mode-on-unpersistent = Toggled build mode on. Changes will not be persisted when a chunk unloads.
-command-invalid-alignment = Invalid alignment: { $alignment }
-command-kit-not-enough-slots = Inventory doesn't have enough slots
-command-lantern-unequiped = Please equip a lantern first
-command-lantern-adjusted-strength = You adjusted flame strength.
-command-lantern-adjusted-strength-color = You adjusted flame strength and color.
-command-explosion-power-too-high = Explosion power mustn't be more than { $power }
-command-explosion-power-too-low = Explosion power must be more than { $power }
-# Note: Do not translate "confirm" here
-command-disconnectall-confirm = Please run the command again with the second argument of "confirm" to confirm that
-  you really want to disconnect all players from the server
-command-invalid-skill-group = { $group } is not a skill group!
-command-unknown = Unknown command
-command-disabled-by-settings = Command disabled in server settings
-command-battlemode-intown = You need to be in town to change battle mode!
-command-battlemode-cooldown = Cooldown period active. Try again in { $cooldown } seconds
-command-battlemode-available-modes = Available modes: pvp, pve
-command-battlemode-same = Attempted to set the same battle mode
-command-battlemode-updated = New battle mode: { $battlemode }
-command-buff-unknown = Unknown buff: { $buff }
-command-buff-data = Buff argument '{ $buff }' requires additional data
-command-buff-body-unknown = Unknown body spec: { $spec }
-command-skillpreset-load-error = Error while loading presets
-command-skillpreset-broken = Skill preset is broken
-command-skillpreset-missing = Preset does not exist: { $preset }
-command-location-invalid = Location name '{ $location }' is invalid. Names may only contain lowercase ASCII and
-  underscores
-command-location-duplicate = Location '{ $location }' already exists, consider deleting it first
-command-location-not-found = Location '{ $location }' does not exist
-command-location-created = Created location '{ $location }'
-command-location-deleted = Deleted location '{ $location }'
-command-locations-empty = No locations currently exist
-command-locations-list = Available locations: { $locations }
-# Note: Do not translate these weather names
-command-weather-valid-values = Valid values are 'clear', 'rain', 'wind' and 'storm'.
-command-scale-set = Set scale to { $scale }
-command-repaired-items = Repaired all equipped items
-command-message-group-missing = You are using group chat but do not belong to a group. Use /world or
-  /region to change chat.
-command-tell-request = { $sender } wants to talk to you.
-command-transform-invalid-presence = Cannot transform in the current presence
-command-aura-invalid-buff-parameters = Invalid buff parameters for aura
-command-aura-spawn = Spawned new aura attached to entity
-command-aura-spawn-new-entity = Spawned new aura
-command-reloaded-chunks = Reloaded { $reloaded } chunks
-command-server-no-experimental-terrain-persistence = Server was compiled without terrain persistence enabled
-command-experimental-terrain-persistence-disabled = Experimental terrain persistence is disabled
-
-# Unreachable/untestable but added for consistency
-
-command-player-info-unavailable = Cannot get player information for { $target }
-command-unimplemented-spawn-special = Spawning special entities is not implemented
-command-kit-inventory-unavailable = Could not get inventory
-command-inventory-cant-fit-item = Can't fit item to inventory
-# Emitted by /disconnect_all when you don't exist (?)
-command-you-dont-exist = You do not exist, so you cannot use this command
-command-destroyed-tethers = All tethers destroyed! You are now free
-command-destroyed-no-tethers = You're not connected to any tethers
-command-dismounted = Dismounted
-command-no-dismount = You're not riding or being ridden
diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl
deleted file mode 100644
index 00f7d64..0000000
--- a/assets/voxygen/i18n/en/common.ftl
+++ /dev/null
@@ -1,112 +0,0 @@
-common-singleplayer = Singleplayer
-common-multiplayer = Multiplayer
-common-servers = Servers
-common-quit = Quit
-common-settings = Settings
-common-languages = Languages
-common-interface = Interface
-common-gameplay = Gameplay
-common-controls = Controls
-common-video = Graphics
-common-sound = Sound
-common-chat = Chat
-common-networking = Networking
-common-accessibility = Accessibility
-common-resume = Resume
-common-characters = Characters
-common-close = Close
-common-yes = Yes
-common-no = No
-common-back = Back
-common-create = Create
-common-okay = Okay
-common-add = Add
-common-accept = Accept
-common-decline = Decline
-common-disclaimer = Disclaimer
-common-cancel = Cancel
-common-none = None
-common-error = Error
-common-automatic = Auto
-common-empty = Empty
-common-confirm = Confirm
-common-delete_server = Delete Server
-common-interface_settings = Interface Settings
-common-gameplay_settings = Gameplay Settings
-common-controls_settings = Controls Settings
-common-video_settings = Graphics Settings
-common-sound_settings = Sound Settings
-common-language_settings = Language Settings
-common-chat_settings = Chat Settings
-common-networking_settings = Networking Settings
-common-accessibility_settings = Accessibility Settings
-common-connection_lost =
-    Connection lost!
-    Did the server restart?
-    Is the client up to date?
-common-species-orc = Orc
-common-species-human = Human
-common-species-dwarf = Dwarf
-common-species-elf = Elf
-common-species-draugr = Draugr
-common-species-danari = Danari
-common-weapons-axe = Axe
-common-weapons-dagger = Dagger
-common-weapons-greatsword = Greatsword
-common-weapons-shortswords = Shortswords
-common-weapons-sword = Sword
-common-weapons-staff = Firestaff
-common-weapons-bow = Bow
-common-weapons-hammer = Hammer
-common-weapons-general = General Combat
-common-weapons-sceptre = Healing Sceptre
-common-weapons-shield = Shield
-common-weapons-spear = Spear
-common-tool-debug = Debug
-common-tool-farming = Farming Tool
-common-tool-pick = Pickaxe
-common-tool-shovel = Shovel
-common-tool-mining = Mining
-common-tool-instrument = Instrument
-common-kind-modular_component = Modular Component
-common-kind-modular_component_partial = Component
-common-kind-glider = Glider
-common-kind-consumable = Consumable
-common-kind-throwable = Can be thrown
-common-kind-utility = Utility
-common-kind-ingredient = Ingredient
-common-kind-lantern = Lantern
-common-kind-recipegroup = Recipes
-common-hands-one = One-Handed
-common-hands-two = Two-Handed
-common-rand_appearance = Random appearance
-common-rand_name = Random name
-common-stats-power = Power
-common-stats-speed = Speed
-common-stats-effect-power = Effect Power
-common-stats-range = Range
-common-stats-energy_efficiency = Energy Efficiency
-common-stats-buff_strength = Buff/Debuff Strength
-common-stats-armor = Armor
-common-stats-poise_res = Stun Res
-common-stats-energy_max = Max Energy
-common-stats-energy_reward = Energy Reward
-common-stats-precision_power = Crit Power
-common-stats-stealth = Stealth
-common-stats-slots = Slots
-common-stats-durability = Durability
-common-material-metal = Metal
-common-material-wood = Wood
-common-material-stone = Stone
-common-material-cloth = Cloth
-common-material-hide = Hide
-common-sprite-chest = Chest
-common-sprite-chair = Chair
-common-sprite-mud = Mud
-common-sprite-grave = Grave
-common-sprite-crate = Crate
-common-sprite-signboard = Signboard
-common-sprite-street_lamp = Street Lamp
-common-sprite-lantern = Lantern
-common-sprite-seashell_lantern = Seashell Lantern
-common-sprite-firebowl_ground = Firebowl
\ No newline at end of file
diff --git a/assets/voxygen/i18n/en/gameinput.ftl b/assets/voxygen/i18n/en/gameinput.ftl
deleted file mode 100644
index d974eb5..0000000
--- a/assets/voxygen/i18n/en/gameinput.ftl
+++ /dev/null
@@ -1,76 +0,0 @@
-gameinput-primary = Basic Attack
-gameinput-secondary = Secondary Attack
-gameinput-block = Block
-gameinput-slot1 = Hotbar Slot 1
-gameinput-slot2 = Hotbar Slot 2
-gameinput-slot3 = Hotbar Slot 3
-gameinput-slot4 = Hotbar Slot 4
-gameinput-slot5 = Hotbar Slot 5
-gameinput-slot6 = Hotbar Slot 6
-gameinput-slot7 = Hotbar Slot 7
-gameinput-slot8 = Hotbar Slot 8
-gameinput-slot9 = Hotbar Slot 9
-gameinput-slot10 = Hotbar Slot 10
-gameinput-swaploadout = Swap Loadout
-gameinput-togglecursor = Toggle Cursor
-gameinput-help = Toggle Help Window
-gameinput-toggleinterface = Toggle Interface
-gameinput-toggledebug = Toggle FPS and Debug Info
-gameinput-toggle_egui_debug = Toggle EGUI Debug Info
-gameinput-togglechat = Toggle Chat
-gameinput-screenshot = Take Screenshot
-gameinput-toggleingameui = Toggle Nametags
-gameinput-fullscreen = Toggle Fullscreen
-gameinput-moveforward = Move Forward
-gameinput-moveleft = Move Left
-gameinput-moveright = Move Right
-gameinput-moveback = Move Backwards
-gameinput-jump = Jump
-gameinput-glide = Glider
-gameinput-roll = Roll
-gameinput-climb = Climb
-gameinput-climbdown = Climb Down
-gameinput-togglelantern = Toggle Lantern
-gameinput-mount = Mount
-gameinput-stayfollow = Stay/Follow
-gameinput-chat = Chat
-gameinput-command = Command
-gameinput-escape = Escape
-gameinput-map = Map
-gameinput-bag = Bag
-gameinput-trade = Trade
-gameinput-social = Social
-gameinput-sit = Sit
-gameinput-spellbook = Spells
-gameinput-settings = Settings
-gameinput-respawn = Respawn
-gameinput-togglewield = Toggle Wield
-gameinput-interact = Interact
-gameinput-freelook = Free Look
-gameinput-autowalk = Auto Walk/Swim
-gameinput-zoomin = Camera zoom in
-gameinput-zoomout = Camera zoom out
-gameinput-zoomlock = Camera zoom lock
-gameinput-cameraclamp = Camera Clamp
-gameinput-dance = Dance
-gameinput-select = Select Entity
-gameinput-acceptgroupinvite = Accept Group Invite
-gameinput-declinegroupinvite = Decline Group Invite
-gameinput-cyclecamera = Cycle camera
-gameinput-crafting = Crafting
-gameinput-fly = Fly
-gameinput-sneak = Sneak
-gameinput-swimdown = Swim downwards
-gameinput-swimup = Swim upwards
-gameinput-mapzoomin = Increase map zoom
-gameinput-mapzoomout = Decrease map zoom
-gameinput-greet = Greet
-gameinput-map-locationmarkerbutton = Set a waypoint in the Map
-gameinput-spectatespeedboost = Spectate speed boost
-gameinput-spectateviewpoint = Spectate viewpoint
-gameinput-mutemaster = Mute master volume
-gameinput-muteinactivemaster = Mute master volume (inactive window)
-gameinput-mutemusic = Mute music volume
-gameinput-mutesfx = Mute SFX volume
-gameinput-muteambience = Mute ambience volume
-gameinput-togglewalk = Toggle Walking
diff --git a/assets/voxygen/i18n/en/hud/crafting.ftl b/assets/voxygen/i18n/en/hud/crafting.ftl
deleted file mode 100644
index 90cefea..0000000
--- a/assets/voxygen/i18n/en/hud/crafting.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-hud-crafting = Crafting
-hud-crafting-recipes = Recipes
-hud-crafting-ingredients = Ingredients:
-hud-crafting-craft = Craft
-hud-crafting-craft_all = Craft All
-hud-crafting-repair-selection = Selection
-hud-crafting-repair_equipped = Equipped
-hud-crafting-repair_all = All
-hud-crafting-tool_cata = Tools:
-hud-crafting-req_crafting_station = Station:
-hud-crafting-anvil = Anvil
-hud-crafting-cauldron = Cauldron
-hud-crafting-cooking_pot = Cooking Pot
-hud-crafting-crafting_bench = Crafting Bench
-hud-crafting-forge = Forge
-hud-crafting-loom = Loom
-hud-crafting-spinning_wheel = Spinning Wheel
-hud-crafting-tanning_rack = Tanning Rack
-hud-crafting-salvaging_station = Salvaging Bench
-hud-crafting-repair_bench = Repair Bench
-hud-crafting-campfire = Campfire
-hud-crafting-tabs-all = All
-hud-crafting-tabs-armor = Armor
-hud-crafting-tabs-dismantle = Dismantle
-hud-crafting-tabs-food = Food
-hud-crafting-tabs-glider = Gliders
-hud-crafting-tabs-potion = Potions
-hud-crafting-tabs-tool = Tools
-hud-crafting-tabs-utility = Utility
-hud-crafting-tabs-weapon = Weapons
-hud-crafting-tabs-bag = Bags
-hud-crafting-tabs-processed_material = Materials
-hud-crafting-dismantle_title = Dismantling
-hud-crafting-dismantle_explanation =
-    Hover items in your bag to see what
-    you can salvage.
-
-    Double-Click them to start dismantling.
-hud-crafting-modular_desc = Drag Item-Parts here to craft a weapon
-hud-crafting-repair_desc = Drag damaged items here to repair them
-hud-crafting-mod_weap_prim_slot_title = Primary Weapon Component
-hud-crafting-mod_weap_prim_slot_desc = Place a primary weapon component here (e.g. a sword blade, axe head, or bow limbs).
-hud-crafting-mod_weap_sec_slot_title = Secondary Weapon Component
-hud-crafting-mod_weap_sec_slot_desc = Place a secondary weapon component here (e.g. a sword hilt, bow grip, or staff core).
-hud-crafting-mod_comp_metal_prim_slot_title = Metal Ingot
-hud-crafting-mod_comp_metal_prim_slot_desc = Place a metal ingot here, only certain metals can be used to make weapons.
-hud-crafting-mod_comp_wood_prim_slot_title = Wood
-hud-crafting-mod_comp_wood_prim_slot_desc = Place a kind of wood here, only certain woods can be used to make weapons.
-hud-crafting-mod_comp_sec_slot_title = Animal Material
-hud-crafting-mod_comp_sec_slot_desc = Optionally place an animal crafting ingredient, only certain ingredients can be used to augment weapons.
-hud-crafting-repair_slot_title = Damaged Item
-hud-crafting-repair_slot_desc = Place an item here to see the cost of repairing it at its current durability level.
-hud-crafting-recipe-uncraftable = Recipe Cannot be Crafted
-hud-crafting-recipe-unlearned = You must first learn how to craft this recipe.
diff --git a/assets/voxygen/i18n/en/hud/diary.ftl b/assets/voxygen/i18n/en/hud/diary.ftl
deleted file mode 100644
index ea20f6d..0000000
--- a/assets/voxygen/i18n/en/hud/diary.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-## General diary terms
-
-## Section titles
-
-hud-diary-sections-skill_trees-title = Skill-Trees
-hud-diary-sections-abilities-title = Abilities
-hud-diary-sections-stats-title = Stats
-hud-diary-sections-recipes-title = Recipes
\ No newline at end of file
diff --git a/assets/voxygen/i18n/en/hud/group.ftl b/assets/voxygen/i18n/en/hud/group.ftl
deleted file mode 100644
index 31dcb65..0000000
--- a/assets/voxygen/i18n/en/hud/group.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-hud-group = Group
-
-hud-group-invite_to_join = [{ $name }] invited you to their group!
-hud-group-invite_to_trade = [{ $name }] would like to trade with you.
-hug-group-invite-accepted = { $target } accepted your group invite.
-hud-group-invite-declined = { $target } declined your group invite.
-hud-group-invite-timed_out= Group invite to { $target } timed out.
-
-hud-group-invite = Invite
-hud-group-kick = Kick
-hud-group-assign_leader = Assign Leader
-hud-group-leave = Leave Group
-hud-group-dead = Dead
-hud-group-out_of_range = Out of range
-hud-group-add_friend = Add to Friends
-hud-group-link_group = Link Groups
-hud-group-in_menu = In Menu
-hud-group-members = Group Members
diff --git a/assets/voxygen/i18n/en/hud/skills.ftl b/assets/voxygen/i18n/en/hud/skills.ftl
deleted file mode 100644
index c4f2806..0000000
--- a/assets/voxygen/i18n/en/hud/skills.ftl
+++ /dev/null
@@ -1,158 +0,0 @@
-## Internal terms, currently only used in es
-## If we remove them here, they also get auto-removed in es,
-## so please keep them, even when not used in English file.
-## See https://github.com/WeblateOrg/weblate/issues/9895
--hud-skill-sc_wardaura_title = ""
--hud-skill-bow_shotgun_title = ""
--hud-skill-st_shockwave_title = ""
-
-## Skill tree UI
-
-hud-skill_tree-general = General Combat
-hud-skill_tree-sword = Sword
-hud-skill_tree-axe = Axe
-hud-skill_tree-hammer = Hammer
-hud-skill_tree-bow = Bow
-hud-skill_tree-staff = Fire Staff
-hud-skill_tree-sceptre = Sceptre
-hud-skill_tree-mining = Mining
-
-hud-rank_up = New skill point
-hud-skill-sp_available =
-    { $number ->
-        [0] No skill points available
-        [1] { $number } skill point available
-        *[other] { $number } skill points available
-    }
-hud-skill-not_unlocked = Not yet unlocked
-hud-skill-req_sp = {"\u000A"}Requires { $number } SP
-hud-skill-set_as_exp_bar = Track progress on experience bar
-
-hud-skill-unlck_sword_title = Sword proficiency
-hud-skill-unlck_sword = Unlocks the sword skill tree.{ $SP }
-hud-skill-unlck_axe_title = Axe proficiency
-hud-skill-unlck_axe = Unlocks the axe skill tree.{ $SP }
-hud-skill-unlck_hammer_title = Hammer proficiency
-hud-skill-unlck_hammer = Unlocks the hammer skill tree.{ $SP }
-hud-skill-unlck_bow_title = Bow proficiency
-hud-skill-unlck_bow = Unlocks the bow skill tree.{ $SP }
-hud-skill-unlck_staff_title = Staff proficiency
-hud-skill-unlck_staff = Unlocks the staff skill tree.{ $SP }
-hud-skill-unlck_sceptre_title = Sceptre proficiency
-hud-skill-unlck_sceptre = Unlocks the sceptre skill tree.{ $SP }
-hud-skill-climbing_title = Climbing
-hud-skill-climbing = Ability to climb surfaces.
-hud-skill-climbing_cost_title = Climbing Cost
-hud-skill-climbing_cost = Climbing uses { $boost } % less energy.{ $SP }
-hud-skill-climbing_speed_title = Climbing Speed
-hud-skill-climbing_speed = Climb { $boost } % faster.{ $SP }
-hud-skill-swim_title = Swimming
-hud-skill-swim = Moving through water.
-hud-skill-swim_speed_title = Swimming Speed
-hud-skill-swim_speed = Swim { $boost } % faster.{ $SP }
-hud-skill-sc_lifesteal_title = Lifesteal Beam
-hud-skill-sc_lifesteal = Drain the life from your enemies.
-hud-skill-sc_lifesteal_damage_title = Damage
-hud-skill-sc_lifesteal_damage = Deal { $boost } % more damage.{ $SP }
-hud-skill-sc_lifesteal_range_title = Range
-hud-skill-sc_lifesteal_range = Your beam reaches { $boost } % further.{ $SP }
-hud-skill-sc_lifesteal_lifesteal_title = Lifesteal
-hud-skill-sc_lifesteal_lifesteal = Convert an additional { $boost } % of damage into health.{ $SP }
-hud-skill-sc_lifesteal_regen_title = Energy Regen
-hud-skill-sc_lifesteal_regen = Replenish your energy by an additional { $boost } %.{ $SP }
-hud-skill-sc_heal_title = Healing Aura
-hud-skill-sc_heal = Heal your allies using the blood of your enemies, requires combo to activate.
-hud-skill-sc_heal_heal_title = Heal
-hud-skill-sc_heal_heal = Increases the amount you heal by { $boost } %.{ $SP }
-hud-skill-sc_heal_cost_title = Energy Cost
-hud-skill-sc_heal_cost = Healing requires { $boost } % less energy.{ $SP }
-hud-skill-sc_heal_duration_title = Duration
-hud-skill-sc_heal_duration = The effects of your healing aura last { $boost } % longer.{ $SP }
-hud-skill-sc_heal_range_title = Radius
-hud-skill-sc_heal_range = Your healing aura reaches { $boost } % further.{ $SP }
-hud-skill-sc_wardaura_unlock_title = Warding Aura Unlock
-hud-skill-sc_wardaura_unlock = Allows you to ward your allies against enemy attacks.{ $SP }
-hud-skill-sc_wardaura_strength_title = Strength
-hud-skill-sc_wardaura_strength = The strength of your protection increases by { $boost } %.{ $SP }
-hud-skill-sc_wardaura_duration_title = Duration
-hud-skill-sc_wardaura_duration = The effects of your ward last { $boost } % longer.{ $SP }
-hud-skill-sc_wardaura_range_title = Radius
-hud-skill-sc_wardaura_range = Your ward reaches { $boost } % further.{ $SP }
-hud-skill-sc_wardaura_cost_title = Energy Cost
-hud-skill-sc_wardaura_cost = Creating the ward requires { $boost } % less energy.{ $SP }
-hud-skill-st_shockwave_range_title = Shockwave Range
-hud-skill-st_shockwave_range = Throw things that used to be out of reach, range increased { $boost } %.{ $SP }
-hud-skill-st_shockwave_cost_title = Shockwave Cost
-hud-skill-st_shockwave_cost = Decreases the energy cost to throw helpless villagers by { $boost } %.{ $SP }
-hud-skill-st_shockwave_knockback_title = Shockwave Knockback
-hud-skill-st_shockwave_knockback = Increases throw potential by { $boost } %.{ $SP }
-hud-skill-st_shockwave_damage_title = Shockwave Damage
-hud-skill-st_shockwave_damage = Increases the damage done by { $boost } %.{ $SP }
-hud-skill-st_shockwave_unlock_title = Shockwave Unlock
-hud-skill-st_shockwave_unlock = Unlocks the ability to throw enemies away using fire.{ $SP }
-hud-skill-st_flamethrower_title = Flamethrower
-hud-skill-st_flamethrower = Throws fire, cook'em all.
-hud-skill-st_flame_velocity_title = Flame Velocity
-hud-skill-st_flame_velocity = Gets the fire there faster, { $boost } % faster.{ $SP }
-hud-skill-st_flamethrower_range_title = Flamethrower Range
-hud-skill-st_flamethrower_range = For when the flames just won't reach, they go { $boost } % further.{ $SP }
-hud-skill-st_energy_drain_title = Energy Drain
-hud-skill-st_energy_drain = Decreases the rate energy is drained by { $boost } %.{ $SP }
-hud-skill-st_flamethrower_damage_title = Flamethrower Damage
-hud-skill-st_flamethrower_damage = Increases damage by { $boost } %.{ $SP }
-hud-skill-st_explosion_radius_title = Explosion Radius
-hud-skill-st_explosion_radius = Bigger is better, increases explosion radius by { $boost } %.{ $SP }
-hud-skill-st_energy_regen_title = Energy Regen
-hud-skill-st_energy_regen = Increases energy gain by { $boost } %.{ $SP }
-hud-skill-st_fireball_title = Fireball
-hud-skill-st_fireball = Shoots a fireball that explodes on impact.
-hud-skill-st_damage_title = Damage
-hud-skill-st_damage = Increases damage by { $boost } %.{ $SP }
-hud-skill-bow_projectile_speed_title = Projectile Speed
-hud-skill-bow_projectile_speed = Allows you to shoot arrows further, faster, by { $boost } %.{ $SP }
-hud-skill-bow_charged_title = Charged Shoot
-hud-skill-bow_charged = Because you waited longer.
-hud-skill-bow_charged_damage_title = Charged Damage
-hud-skill-bow_charged_damage = Increases damage by { $boost } %.{ $SP }
-hud-skill-bow_charged_energy_regen_title = Charged Regen
-hud-skill-bow_charged_energy_regen = Increases energy recovery by { $boost } %.{ $SP }
-hud-skill-bow_charged_knockback_title = Charged Knockback
-hud-skill-bow_charged_knockback = Knock enemies further back by { $boost } %.{ $SP }
-hud-skill-bow_charged_speed_title = Charged Speed
-hud-skill-bow_charged_speed = Increases the rate that you charge the attack by { $boost } %.{ $SP }
-hud-skill-bow_charged_move_title = Charged Move Speed
-hud-skill-bow_charged_move = Increases how fast you can shuffle while charging the attack by { $boost } %.{ $SP }
-hud-skill-bow_repeater_title = Repeater
-hud-skill-bow_repeater = Shoots faster the longer you fire for.
-hud-skill-bow_repeater_damage_title = Repeater Damage
-hud-skill-bow_repeater_damage = Increases the damage done by { $boost } %.{ $SP }
-hud-skill-bow_repeater_cost_title = Repeater Cost
-hud-skill-bow_repeater_cost = Decreases the energy cost to become a repeater by { $boost } %.{ $SP }
-hud-skill-bow_repeater_speed_title = Repeater Speed
-hud-skill-bow_repeater_speed = Increases the rate at which you fire arrows by { $boost } %.{ $SP }
-hud-skill-bow_shotgun_unlock_title = Unlocks Shotgun
-hud-skill-bow_shotgun_unlock = Unlocks ability to fire multiple arrows at once.{ $SP }
-hud-skill-bow_shotgun_damage_title = Shotgun Damage
-hud-skill-bow_shotgun_damage = Increases the damage done by { $boost } %.{ $SP }
-hud-skill-bow_shotgun_cost_title = Shotgun Cost
-hud-skill-bow_shotgun_cost = Decreases the cost of shotgun by { $boost } %.{ $SP }
-hud-skill-bow_shotgun_arrow_count_title = Shotgun Arrows
-hud-skill-bow_shotgun_arrow_count = Increases the number of arrows in the burst by { $boost }.{ $SP }
-hud-skill-bow_shotgun_spread_title = Shotgun Spread
-hud-skill-bow_shotgun_spread = Decreases the spread of the arrows by { $boost } %.{ $SP }
-hud-skill-mining_title = Mining
-hud-skill-pick_strike_title = Pickaxe Strike
-hud-skill-pick_strike = Hit rocks with the pickaxe to gain ore, gems and experience.
-hud-skill-pick_strike_speed_title = Pickaxe Strike Speed
-hud-skill-pick_strike_speed = Mine rocks faster.{ $SP }
-hud-skill-pick_strike_oregain_title = Pickaxe Strike Ore Yield
-hud-skill-pick_strike_oregain = Chance to gain extra ore ({ $boost } % per level).{ $SP }
-hud-skill-pick_strike_gemgain_title = Pickaxe Strike Gem Yield
-hud-skill-pick_strike_gemgain = Chance to gain extra gems ({ $boost } % per level).{ $SP }
-
-## Skill tree error dialog
-hud-skill-persistence-hash_mismatch = There was a difference detected in one of your skill groups since you last played.
-hud-skill-persistence-deserialization_failure = There was a error in loading some of your skills from the database.
-hud-skill-persistence-spent_experience_missing = The amount of free experience you had in one of your skill groups differed from when you last played.
-hud-skill-persistence-skills_unlock_failed = Your skills were not able to be obtained in the same order you acquired them. Prerequisites or costs may have changed.
-hud-skill-persistence-common_message = Some of your skill points have been reset. You will need to reassign them.
diff --git a/assets/voxygen/i18n/en/hud/trade.ftl b/assets/voxygen/i18n/en/hud/trade.ftl
deleted file mode 100644
index 81d2d69..0000000
--- a/assets/voxygen/i18n/en/hud/trade.ftl
+++ /dev/null
@@ -1,37 +0,0 @@
-hud-trade-trade_window = Trade
-hud-trade-phase1_description =
-    Drag the items you want to trade
-     into the corresponding area.
-hud-trade-phase2_description =
-    The trade is now locked to give you
-     time to review it.
-hud-trade-phase3_description = Trade is being processed.
-hud-trade-persons_offer = Offer from { $playername }
-hud-trade-has_accepted =
-    { $playername }
-    has accepted
-hud-trade-accept = Accept
-hud-trade-decline = Decline
-
-hud-trade-invite_sent = Trade request sent to { $playername }.
-hud-trade-invite-accepted = { $target } accepted your trade request.
-hud-trade-invite-declined = { $target } declined your trade request.
-hud-trade-invite-timed_out = Trade request to { $target } timed out.
-
-hud-trade-result-completed = Trade completed successfully.
-hud-trade-result-declined = Trade declined.
-hud-trade-result-nospace = Not enough space to complete the trade.
-hud-trade-buy = Buy Price: { $coin_num ->
-    [1] one coin
-    *[other] { $coin_formatted } coins
-}
-hud-trade-sell = Sell Price: { $coin_num ->
-    [1] one coin
-    *[other] { $coin_formatted } coins
-}
-hud-trade-tooltip_hint_1 = <Shift-Click to Add/Remove from trade.>
-hud-trade-tooltip_hint_2 = <Ctrl-Click to Auto-Balance with this.>
-hud-trade-your_offer = Your offer
-hud-trade-their_offer = Their offer
-hud-trade-amount_input = Select an item
-hud-confirm-trade-for-nothing = Really give away these items in exchange for nothing?
diff --git a/assets/voxygen/i18n/en/item/admin.ftl b/assets/voxygen/i18n/en/item/admin.ftl
deleted file mode 100644
index ab464c8..0000000
--- a/assets/voxygen/i18n/en/item/admin.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-armor-tabard_admin = Admin's Tabard
-    .desc = With great power comes great responsibility.
-
-armor-misc-back-admin = Admin's Cape
-    .desc = 
-        With great power comes
-        great responsibility.
-
-armor-tabard-admin_tabard = Admin's Tabard
-    .desc = 
-        With great power comes
-        great responsibility.
-
-armor-misc-back-admin_back = Admin's Cape
-    .desc = 
-        With great power comes
-        great responsibility.
-
-armor-misc-bag-admin_black_hole = Admin's Black Hole
-    .desc = They say it will fit anything.
-
-armor-velorite-back = Velorite Admin Cape
-    .desc = Where did I put my banhammer again?
-
-armor-velorite-belt = Velorite Belt
-    .desc = {""}
-
-armor-velorite-boots = Velorite Boots
-    .desc = {""}
-
-armor-velorite-chest = Velorite Chest
-    .desc = {""}
-
-armor-velorite-hands = Velorite Gloves
-    .desc = {""}
-
-armor-velorite-legs = Velorite Skirt
-    .desc = {""}
-
-armor-velorite-shoulder = Velorite Mantle
-    .desc = {""}
-
-object-item_cheese = Golden Cheese
-    .desc = They say gods eat it to get eternal youth.
-
-weapon-tool-broom_belzeshrub_purple = Belzeshrub the Broom-God
-    .desc = You can hear him giggle whenever you hit the ground a bit too hard...
-
-weapon-sword-frost-admin_sword = Admin Greatsword
-    .desc = Shouldn't this be a hammer?
-
-weapon-bow-velorite-debug = Admin Velorite Bow
-    .desc = Infused with Velorite power.
-
-other-glider-vroom-debug = Vroom Glider
-    .desc = goes brrr
diff --git a/assets/voxygen/i18n/en/item/armor/armor.ftl b/assets/voxygen/i18n/en/item/armor/armor.ftl
deleted file mode 100644
index 1362365..0000000
--- a/assets/voxygen/i18n/en/item/armor/armor.ftl
+++ /dev/null
@@ -1,854 +0,0 @@
-armor-hide-carapace-back = Carapace Cape
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-belt = Carapace Belt
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-chest = Carapace Cuirass
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-foot = Carapace Treads
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-hand = Carapace Grips
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-pants = Carapace Leggings
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-carapace-shoulder = Carapace Shoulderpads
-    .desc = Made from the shell that once shielded a beast.
-
-armor-hide-primal-back = Primal Cape
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-belt = Primal Sash
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-chest = Primal Cuirass
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-foot = Primal Boots
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-hand = Primal Gauntlets
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-pants = Primal Legs
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-primal-shoulder = Primal Shoulders
-    .desc = Smithed from hide tougher than steel.
-
-armor-hide-leather-back = Leather Cloak
-    .desc = Swift like the wind.
-
-armor-hide-leather-belt = Leather Belt
-    .desc = Swift like the wind.
-
-armor-hide-leather-chest = Leather Chestpiece
-    .desc = Swift like the wind.
-
-armor-hide-leather-foot = Leather Boots
-    .desc = Swift like the wind.
-
-armor-hide-leather-hand = Leather Gloves
-    .desc = Swift like the wind.
-
-armor-misc-head-leather-0 = Leather Cap
-    .desc = Swift like the wind.
-
-armor-hide-leather-pants = Leather Pants
-    .desc = Swift like the wind.
-
-armor-hide-leather-shoulder = Leather Shoulderpads
-    .desc = Swift like the wind.
-
-armor-hide-rawhide-back = Rawhide Cloak
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-belt = Rawhide Belt
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-chest = Rawhide Chestpiece
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-foot = Rawhide Shoes
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-hand = Rawhide Bracers
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-pants = Rawhide Pants
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-rawhide-shoulder = Rawhide Shoulderpads
-    .desc = Tightly packed pieces of leather. Light-weight and sturdy!
-
-armor-hide-scale-back = Scale Cape
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-belt = Scale Girdle
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-chest = Scale Chestpiece
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-foot = Scale Sabatons
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-hand = Scale Fists
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-pants = Scale Leggings
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-scale-shoulder = Scale Shoulderguards
-    .desc = Each embedded scale provides additional protection.
-
-armor-hide-dragonscale-back = Dragonscale Cape
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-belt = Dragonscale Sash
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-chest = Dragonscale Chestplate
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-foot = Dragonscale Spurs
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-hand = Dragonscale Gloves
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-pants = Dragonscale Leggings
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-hide-dragonscale-shoulder = Dragonscale Mantle
-    .desc = Crafted from the scales of a legendary creature, power can be felt pulsing through it.
-
-armor-cloth_blue-belt = Blue Linen Belt
-    .desc = A stylish rough fabric belt, dyed blue.
-
-armor-cloth_blue-chest = Blue Linen Chest
-    .desc = A stylish rough fabric surcoat, dyed blue.
-
-armor-cloth_blue-foot = Blue Linen Boots
-    .desc = Cobbled rough fabric boots, dyed blue.
-
-armor-cloth_blue-hand = Blue Linen Wrists
-    .desc = Rough cloth bracelets provide a stylish fashion statement, dyed blue.
-
-armor-cloth_blue-pants = Blue Linen Skirt
-    .desc = A stylish, rough fabric skirt, dyed blue.
-
-armor-cloth_blue-shoulder_0 = Blue Linen Coat
-    .desc = A rough fabric coat, dyed blue.
-
-armor-cloth_blue-shoulder_1 = Blue Cloth Pads
-    .desc = Simple shoulderpads made from blue cloth.
-
-armor-boreal-back = Boreal Cloak
-    .desc = Thick yet surprisingly cold.
-
-armor-boreal-belt = Boreal Belt
-    .desc = It's cold.
-
-armor-boreal-chest = Boreal Chestplate
-    .desc = So frigid that you can feel it in your heart.
-
-armor-boreal-foot = Boreal Wrappings
-    .desc = The blistering cold makes it hard to move.
-
-armor-boreal-hand = Boreal Gauntlets
-    .desc = Colder than the touch of death.
-
-armor-boreal-pants = Boreal Tunic
-    .desc = Colder than the climate it protects you from.
-
-armor-boreal-shoulder = Boreal Spaulders
-    .desc = As though the icy grip of death touches your shoulder.
-
-armor-brinestone-back = Brinestone Cloak
-    .desc = It's not weak.
-
-armor-brinestone-belt = Brinestone Belt
-    .desc = Ties it together.
-
-armor-brinestone-chest = Brinestone Chestplate
-    .desc = Hard to pierce.
-
-armor-brinestone-crown = Brinestone Crown
-    .desc = Makes you look taller.
-
-armor-brinestone-foot = Brinestone Boots
-    .desc = Not very comfortable.
-
-armor-brinestone-hand = Brinestone Gauntlets
-    .desc = Hits like a rock.
-
-armor-brinestone-pants = Brinestone Pants
-    .desc = Do not tumble.
-
-armor-brinestone-shoulder = Brinestone Pads
-    .desc = Almost too heavy.
-
-armor-misc-foot-cloth_sandal = Worn out Sandals
-    .desc = Loyal companions, though they don't look like they can go much further.
-
-armor-misc-neck-abyssal_gorget = Abyssal Gorget
-    .desc = Harnessed vigour of the tides.
-
-armor-misc-neck-amethyst = Amethyst Necklace
-    .desc = A tin necklace lined with amethyst gems.
-
-armor-misc-neck-ankh_of_life = Ankh of Life
-    .desc = A unique necklace of unkown origin... You can feel the power flowing through it.
-
-armor-misc-neck-carcanet_of_wrath = Carcanet of Wrath
-    .desc = A necklace that gives even the most feeble beings immense amounts of power.
-
-armor-misc-neck-diamond = Diamond Necklace
-    .desc = An expensive gold necklace, ornate with exquisite diamonds.
-
-armor-misc-neck-emerald = Emerald Necklace
-    .desc = A cobalt necklace, bearing beautiful emerald gems.
-
-armor-misc-neck-fang = Fang Necklace
-    .desc = Only the most savage beings can handle the power of this necklace...
-
-armor-misc-neck-resilience_gem = Gem of Resilience
-    .desc = Surrounded by a discrete magical glow.
-
-armor-misc-neck-gold = Gold Necklace
-    .desc = An expensive gold necklace... looks stolen.
-
-armor-misc-neck-haniwa_talisman = Haniwa Talisman
-    .desc = A talisman depicting a figure of unknown origin.
-
-armor-misc-neck-honeycomb_pendant = Honeycomb Pendant
-    .desc = This necklace is always spewing out honey...
-
-armor-misc-neck-pendant_of_protection = Pendant of Protection
-    .desc = You feel some sort of presence keeping you safe...
-
-armor-misc-neck-ruby = Ruby Necklace
-    .desc = An ornate silver necklace, embedded with beautiful rubies.
-
-armor-misc-neck-sapphire = Sapphire Necklace
-    .desc = A sturdy iron necklace, with polished sapphire gems embedded into it.
-
-armor-misc-neck-scratched = Scratched Necklace
-    .desc = A shoddy necklace with a string about to snap...
-
-armor-misc-neck-shell = Seashell Necklace
-    .desc = Contains the guardian aura of the ocean.
-
-armor-misc-neck-topaz = Topaz Necklace
-    .desc = A copper necklace, with topaz embedded in the center.
-
-armor-misc-head-bamboo_twig = Bamboo Twig
-    .desc = A tiny stray shoot from a larger bamboo shaft.
-
-armor-misc-head-bear_bonnet = Bear Bonnet
-    .desc = Wearing the guise of a ferocious bear, its fury becomes your own.
-
-armor-misc-head-boreal_warhelm = Boreal Warhelmet
-    .desc = I wonder where it's pointing...
-
-armor-misc-head-crown = Crown
-    .desc = A crown fit for royal stature.
-
-armor-misc-head-facegourd = Facegourd
-    .desc = Pumpkin Head.
-
-armor-misc-head-gnarling_mask = Chieftain Mask
-    .desc = It smells like burned wood.
-
-armor-misc-head-helmet = Helmet
-    .desc = {""}
-
-armor-misc-head-hog_hood = Hog Hood
-    .desc = Wear the guise of a great swine now felled, so that you may honor its sacrifice.
-
-armor-misc-head-hood = Hood
-    .desc = Become one with the treetops.
-
-armor-misc-head-hood_dark = Dark Hood
-    .desc = Tis a bit thicker.
-
-armor-misc-head-howl_cowl = Howl Cowl
-    .desc = Wearing the guise of a fearsome wolf befits a fearsome hunter.
-
-armor-misc-head-mitre = Mitre
-    .desc = Calls strength down from above.
-
-armor-misc-head-spikeguard = Spiked Crown
-    .desc = Resembling some sort of thorny crown.
-
-armor-misc-head-straw = Straw Hat
-    .desc = Often times worn by villagers. It's simple and stylish!
-
-armor-misc-head-wanderers_hat = Wanderer's Hat
-    .desc = The perfect headwear for those who feel at home on the highways and byways of Veloren.
-
-armor-misc-head-winged_coronet = Winged Coronet
-    .desc = You feel more connected with nature.
-
-armor-misc-head-bandana-red = Red Bandana
-    .desc = Very sneaky, but also, bright red.
-
-armor-misc-head-bandana-thief = Thief Bandana
-    .desc = Common bandit's mask.
-
-armor-misc-head-hare_hat = Hare Hat
-    .desc = Easter Special
-
-armor-misc-head-cat_capuche = Cat Capuche
-    .desc = April Fools Special
-
-armor-misc-pants-grayscale = Hunting Pants
-    .desc = Crafted from soft, supple leather.
-
-armor-misc-pants-worker_blue = Blue Worker Pants
-    .desc = Resilient and reliable.
-
-armor-misc-pants-worker_brown = Comfortable Worker Pants
-    .desc = Resilient and reliable.
-
-armor-misc-shoulder-iron_spikes = Iron Spiked Pauldrons
-    .desc = The heavy, rough iron plate has an interlocking spikes shoved through several slots in the center to dissuade attackers.
-
-armor-misc-shoulder-leather_iron_0 = Iron and Leather Spaulders
-    .desc = Leather shoulders decorated with heavy iron hooks provide protection to the wearer.
-
-armor-misc-shoulder-leather_iron_1 = Iron and Leather Spaulders
-    .desc = Leather inset with heavy iron spikes provide solid protection to the wearer.
-
-armor-misc-shoulder-leather_iron_2 = Iron and Leather Spaulders
-    .desc = Leather inset with heavy iron bands provide protection to the wearer.
-
-armor-misc-shoulder-leather_iron_3 = Iron and Leather Spaulders
-    .desc = Leather inset with iron fragments provide protection to the wearer.
-
-armor-misc-shoulder-leather_strip = Leather Strips
-    .desc = Tanned animal hide strips formed into loose shoulder pads.
-
-armor-misc-chest-worker_green = Green Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-shirt_white = Green Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_orange_0 = Orange Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_orange_1 = Orange Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_purple_0 = Purple Worker Shirt
-    .desc = Resilient and reliable.
-
-armor-misc-chest-worker_purple_1 = Purple Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_purp_brown = Purple Worker Shirt
-    .desc = Resilient and reliable.
-
-armor-misc-chest-worker_red_0 = Red Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_red_1 = Red Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_yellow_0 = Yellow Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-chest-worker_yellow_1 = Yellow Worker Shirt
-    .desc = Was used by a farmer, until recently.
-
-armor-misc-ring-amethyst = Amethyst Ring
-    .desc = A tin ring with an amethyst gem.
-
-armor-misc-ring-diamond = Diamond Ring
-    .desc = A gold ring with an expensive diamond.
-
-armor-misc-ring-emerald = Emerald Ring
-    .desc = A cobalt ring with an emerald gem.
-
-armor-misc-ring-gold = Gold Ring
-    .desc = A plain gold ring... almost as if it is missing a gem.
-
-armor-misc-ring-ruby = Ruby Ring
-    .desc = A silver ring with a ruby gem.
-
-armor-misc-ring-sapphire = Sapphire Ring
-    .desc = An iron ring with a sapphire gem.
-
-armor-misc-ring-scratched = Scratched Ring
-    .desc = Barely fits your finger.
-
-armor-misc-ring-topaz = Topaz Ring
-    .desc = A copper ring with a topaz gem.
-
-armor-misc-ring-abyssal_ring = Abyssal Ring
-    .desc = A pearl ring crudely held together with gold and coral.
-
-armor-misc-back-backpack-traveler = Traveler's Backpack
-    .desc = Comfortable and with enough capacity, its a hoarder's best friend.
-
-armor-misc-back-dungeon_purple = Purple Cultist Cape
-    .desc = Smells like dark magic and candles.
-
-armor-misc-back-short-0 = Short leather Cape
-    .desc = Probably made of the finest leather.
-
-armor-misc-back-short-1 = Green Blanket
-    .desc = Keeps your shoulders warm.
-
-armor-savage-back = Savage Cape
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-belt = Savage Belt
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-chest = Savage Cuirass
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-foot = Savage Boots
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-hand = Savage Gauntlets
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-pants = Savage Chausses
-    .desc = Brings the fury of the barbarians.
-
-armor-savage-shoulder = Savage Shoulder Pad
-    .desc = Brings the fury of the barbarians.
-
-armor-witch-hat = Witch Hat
-    .desc = Draws strength from dark arts.
-
-armor-pirate-hat = Pirate Hat
-    .desc = It seems like a parrot was perched up here.
-
-armor-twigsleaves-belt = Leafy Belt
-    .desc = Dried leaves cover over the standard twig belt, providing a slightly different texture.
-
-armor-twigsleaves-chest = Leafy Shirt
-    .desc = Leaves cover the magically imbued twig shirt, providing a more natural appearance.
-
-armor-twigsleaves-foot = Leafy Boots
-    .desc = Leaves cover the magically entwined twigs to provide simple protection from the elements.
-
-armor-twigsleaves-hand = Leafy Wraps
-    .desc = Leaves help hide the magic-interlocking twigs, and provide mild protection from the elements.
-
-armor-twigsleaves-pants = Leafy Pants
-    .desc = Leaves cover the magically imbued chainmail twigs, providing protection from the elements.
-
-armor-twigsleaves-shoulder = Leafy Shoulders
-    .desc = Leaves cover over the twigs to provide better protection from the elements.
-
-armor-twigsflowers-belt = Flowery Belt
-    .desc = Magically imbued twigs, held together with a flower intertwining its stem to hold the belt together.
-
-armor-twigsflowers-chest = Flowery Shirt
-    .desc = Magically imbued twigs decorated with flowers and their stems, letting others know your intentions of peace and love.
-
-armor-twigsflowers-foot = Flowery Boots
-    .desc = Woven and magically imbued, these boots of twigs and flowers provide simple protection and peace to the wearer.
-
-armor-twigsflowers-hand = Flowery Wraps
-    .desc = Wrapped and intertwined twigs held together with magic and flowers with their stems, providing peace and protection for the wearer.
-
-armor-twigsflowers-pants = Flowery Pants
-    .desc = Chainmail woven twigs enhanced with flower stems to provide protection and peace.
-
-armor-twigsflowers-shoulder = Flowery Shoulders
-    .desc = Flowers join the tied twigs to provide protection and peace to the wearer.
-
-armor-leather_plate-belt = Leather Plate Belt
-    .desc = Leather adorned with steel for better protection.
-
-armor-leather_plate-chest = Leather Plate Chest
-    .desc = Leather adorned with steel for better protection.
-
-armor-leather_plate-foot = Leather Plate Boots
-    .desc = Leather adorned with steel for better protection.
-
-armor-leather_plate-hand = Leather Plate Gloves
-    .desc = Leather adorned with steel for better protection.
-
-armor-leather_plate-pants = Leather Plate Chausses
-    .desc = Leather adorned with steel for better protection.
-
-armor-leather_plate-shoulder = Leather Plate Shoulder Pad
-    .desc = Leather adorned with steel for better protection.
-
-armor-mail-bloodsteel-back = Bloodsteel Cape
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-belt = Bloodsteel Girdle
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-chest = Bloodsteel Chest
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-foot = Bloodsteel Sabatons
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-hand = Bloodsteel Gauntlets
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-pants = Bloodsteel Legs
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-bloodsteel-shoulder = Bloodsteel Pauldrons
-    .desc = Forged to preserve life, at the cost of another.
-
-armor-mail-cobalt-back = Cobalt Cape
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-belt = Cobalt Girdle
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-chest = Cobalt Chestpiece
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-foot = Cobalt Footguards
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-hand = Cobalt Gauntlets
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-pants = Cobalt Leggings
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-cobalt-shoulder = Cobalt Shoulderguards
-    .desc = Ornamental and impenetrable, the metal will never dull.
-
-armor-mail-bronze-back = Bronze Cloak
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-belt = Bronze Girdle
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-chest = Bronze Chestguard
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-foot = Bronze Shoes
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-hand = Bronze Gauntlets
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-pants = Bronze Pantalons
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-bronze-shoulder = Bronze Guards
-    .desc = Heavy and dull, but it can take a punch.
-
-armor-mail-orichalcum-6 = Orichalcum Cape
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum-2 = Orichalcum Belt
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum = Orichalcum Chestguard
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum-3 = Orichalcum Warboots
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum-4 = Orichalcum Gloves
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum-1 = Orichalcum Legplates
-    .desc = An ancient alloy. Myths remain of heroes who once wore this metal.
-
-armor-mail-orichalcum-5 = Orichalcum Mantle
-    .desc = An ancient alloy. Myths remain of heroes who once wore this armor.
-
-armor-mail-orichalcum-7 = Orichalcum Helmet
-    .desc = The plume glows as you charge into battle.
-
-armor-mail-steel-back = Steel Cape
-    .desc = Metal alloy interlocking plates to improve protection.
-
-armor-mail-steel-belt = Steel Belt
-    .desc = Metal alloy interlocking plates to improve protection.
-
-armor-mail-steel-chest = Steel Cuirass
-    .desc = The metal alloy provides a somewhat lighter and stronger cuirass.
-
-armor-mail-steel-foot = Steel Boots
-    .desc = Metal alloy boots providing a more comfortable and durable protection.
-
-armor-mail-steel-hand = Steel Gauntlets
-    .desc = The metal alloy provides better protection and lighter weight, a quite comfortable gauntlet.
-
-armor-mail-steel-pants = Steel Chausses
-    .desc = The metal alloy provides improvements to fit, durability, and lightness.
-
-armor-mail-steel-shoulder = Steel Shoulders
-    .desc = The metal alloy plates provide better protection and comfort.
-
-armor-mail-iron-back = Iron Cloak
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-belt = Iron Belt
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-chest = Iron Chestguard
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-foot = Iron Footguards
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-hand = Iron Fists
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-pants = Iron Pants
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-mail-iron-shoulder = Iron Shoulderpads
-    .desc = Sturdy and unyielding, across ages of war.
-
-armor-cloth_purple-belt = Purple Linen Belt
-    .desc = A stylish rough fabric belt, dyed purple.
-
-armor-cloth_purple-chest = Purple Linen Chest
-    .desc = A stylish rough fabric surcoat, dyed purple.
-
-armor-cloth_purple-foot = Purple Linen Boots
-    .desc = Cobbled rough fabric boots, dyed purple.
-
-armor-cloth_purple-hand = Purple Linen Wrists
-    .desc = Rough cloth bracelets provide a stylish fashion statement, dyed purple.
-
-armor-cloth_purple-pants = Purple Linen Skirt
-    .desc = A stylish, rough fabric skirt, dyed purple.
-
-armor-cloth_purple-shoulder = Purple Linen Coat
-    .desc = A rough fabric coat, dyed purple.
-
-armor-rugged-chest = Rugged Shirt
-    .desc = Smells like Adventure.
-
-armor-rugged-pants = Rugged Commoner's Pants
-    .desc = They remind you of the old days.
-
-armor-cloth_green-belt = Green Linen Belt
-    .desc = A stylish rough fabric belt, dyed green.
-
-armor-cloth_green-chest = Green Linen Chest
-    .desc = A stylish rough fabric surcoat, dyed green.
-
-armor-cloth_green-foot = Green Linen Boots
-    .desc = Cobbled rough fabric boots, dyed green.
-
-armor-cloth_green-hand = Green Linen Wrists
-    .desc = Rough cloth bracelets provide a stylish fashion statement, dyed green.
-
-armor-cloth_green-pants = Green Linen Skirt
-    .desc = A stylish, rough fabric skirt, dyed green.
-
-armor-cloth_green-shoulder = Green Linen Coat
-    .desc = A rough fabric coat, dyed green.
-
-armor-merchant-turban = Impressive Turban
-    .desc = An incredibly fancy and light-weight turban, quite expensive too.
-
-armor-tarasque-belt = Tarasque Belt
-    .desc = Shattered band of a tarasque shell, making for a strong belt.
-
-armor-tarasque-chest = Tarasque Cuirass
-    .desc = The rough protective underbelly and back of a tarasque's shell, formed to fit humanoid proportions.
-
-armor-tarasque-foot = Tarasque Boots
-    .desc = Tarasque claws form the outside of these boots, protecting the wearer's feet.
-
-armor-tarasque-hand = Tarasque Gauntlets
-    .desc = Shattered fragments from a tarasque shell shaped into a protective gauntlets.
-
-armor-tarasque-pants = Tarasque Chausses
-    .desc = Fragmented tarasque shell tied together to form protective leg armor.
-
-armor-tarasque-shoulder = Tarasque Shoulder Pad
-    .desc = Spiky tarasque shell fragments formed to fit as shoulder guards.
-
-armor-twigs-belt = Twig Belt
-    .desc = Small bits of nature magically held together into the shape of a belt.
-
-armor-twigs-chest = Twig Shirt
-    .desc = Small sticks magically imbued to hold together to form a shirt.
-
-armor-twigs-foot = Twig Boots
-    .desc = Small twigs intertwined and imbued with magic to provide simple protection.
-
-armor-twigs-hand = Twig Wraps
-    .desc = Magically imbued twigs interlocked into simple hand wraps.
-
-armor-twigs-pants = Twig Pants
-    .desc = Magically imbued twigs formed into links similar to chainmail.
-
-armor-twigs-shoulder = Twig Shoulders
-    .desc = Spaulders made from tightly tied twigs.
-
-armor-cultist-bandana = Cultist Bandana
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-belt = Cultist Belt
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-chest = Cultist Chest
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-foot = Cultist Boots
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-hand = Cultist Gloves
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-necklace = Cultist Amulet
-    .desc = You can still feel a mindflayer's presence within this amulet...
-
-armor-cultist-pants = Cultist Skirt
-    .desc = Ceremonial attire used by members.
-
-armor-cultist-ring = Cultist Signet Ring
-    .desc = Once belonged to a cultist.
-
-armor-cultist-shoulder = Cultist Mantle
-    .desc = Ceremonial attire used by members.
-
-armor-cloth-moonweave-back = Moonweave Cape
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-belt = Moonweave Belt
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-chest = Moonweave Vest
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-foot = Moonweave Boots
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-hand = Moonweave Gloves
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-pants = Moonweave Legs
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-moonweave-shoulder = Moonweave Shoulders
-    .desc = The fabric dances silently, like moonlight.
-
-armor-cloth-linen-back = Linen Shawl
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-belt = Linen Sash
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-chest = Linen Vest
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-foot = Linen Feet
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-hand = Linen Handwraps
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-pants = Linen Pants
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-linen-shoulder = Linen Shoulders
-    .desc = Roughly stitched, but it seems to hold.
-
-armor-cloth-sunsilk-back = Sunsilk Cape
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-belt = Sunsilk Sash
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-chest = Sunsilk Tunic
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-foot = Sunsilk Footwraps
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-hand = Sunsilk Handwraps
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-pants = Sunsilk Kilt
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-sunsilk-shoulder = Sunsilk Shoulderwraps
-    .desc = It radiates with the sun's power, and the grace to harness it.
-
-armor-cloth-woolen-back = Woolen Cloak
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-belt = Woolen Belt
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-chest = Woolen Parka
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-foot = Woolen Boots
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-hand = Woolen Mittens
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-pants = Woolen Pants
-    .desc = Thick and ready for the snow.
-
-armor-cloth-woolen-shoulder = Woolen Shoulders
-    .desc = Thick and ready for the snow.
-
-armor-cloth-silken-back = Silken Cape
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-belt = Silken Sash
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-chest = Silken Robe
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-foot = Silken Feet
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-hand = Silken Wraps
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-pants = Silken Skirt
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-silken-shoulder = Silken Shoulders
-    .desc = Weaved with care by a skilled tailor.
-
-armor-cloth-druid-back = Druid Cape
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-belt = Druid Sash
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-chest = Druid Chestguard
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-foot = Druid Kickers
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-hand = Druid Handwraps
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-pants = Druid Leggings
-    .desc = Incredibly light, with the essence of nature.
-
-armor-cloth-druid-shoulder = Druid Shoulderpads
-    .desc = Incredibly light, with the essence of nature.
-
-armor-misc-head-woolly_wintercap = Woolly Wintercap
-    .desc = Simple, stylish, and festive.
diff --git a/assets/voxygen/i18n/en/item/armor/npc.ftl b/assets/voxygen/i18n/en/item/armor/npc.ftl
deleted file mode 100644
index 45a5aeb..0000000
--- a/assets/voxygen/i18n/en/item/armor/npc.ftl
+++ /dev/null
@@ -1,869 +0,0 @@
-### This file contains non-player-facing items.
-### Feel free to ignore them.
-
-common-items-npc_armor-pants-leather_blue = Blue Leather Guards
-    .desc = {""}
-
-common-items-npc_armor-pants-plate_red = Iron Legguards
-    .desc = Greaves forged from iron.
-
-common-items-npc_armor-bird_large-phoenix = Phoenix Armor
-    .desc = The thickest feather you have ever seen!
-
-common-items-npc_armor-bird_large-wyvern = Wyvern Armor
-    .desc = Generic Protection.
-
-common-items-npc_armor-golem-claygolem = Clay Golem Armor
-    .desc = Worn by clay golem.
-
-common-items-npc_armor-golem-woodgolem = Wood Golem Armor
-    .desc = Yeet.
-
-common-items-npc_armor-golem-irongolem = Iron Golem Armor
-    .desc = Worn by iron golem.
-
-common-items-npc_armor-golem-ancienteffigy = Ancient Effigy Armor
-    .desc = Worn by ancient effigy.
-
-common-items-npc_armor-golem-gravewarden = Grave Warden Armor
-    .desc = Worn by grave warden.
-
-common-items-npc_armor-golem-mogwai = Mogwai Armor
-    .desc = Worn by mogwai.
-
-common-items-npc_armor-biped_small-myrmidon-foot-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-foot-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-foot-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-head-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-head-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-head-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-pants-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-pants-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-pants-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-chest-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-chest-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-chest-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-hand-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-hand-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-hand-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-tail-hoplite = Myrmidon Hoplite
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-tail-marksman = Myrmidon Marksman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-myrmidon-tail-strategian = Myrmidon Strategian
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-foot-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-foot-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-foot-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-head-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-head-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-head-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-pants-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-pants-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-pants-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-chest-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-chest-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-chest-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-hand-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-hand-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-hand-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-tail-sniper = Sahagin Sniper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-tail-sorcerer = Sahagin Sorcerer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-sahagin-tail-spearman = Sahagin Spearman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-foot-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-foot-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-foot-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-head-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-head-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-head-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-pants-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-pants-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-pants-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-chest-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-chest-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-chest-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-hand-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-hand-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-hand-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-tail-hunter = Adlet Hunter
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-tail-icepicker = Adlet Icepicker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-adlet-tail-tracker = Adlet Tracker
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-foot-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-foot-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-foot-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-foot-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-head-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-head-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-head-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-head-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-pants-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-pants-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-pants-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-pants-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-chest-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-chest-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-chest-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-chest-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-hand-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-hand-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-hand-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-hand-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-tail-chieftain = Gnarling Chieftain
-    .desc = Only worn by the most spiritual of Gnarlings.
-
-common-items-npc_armor-biped_small-gnarling-tail-logger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-tail-mugger = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnarling-tail-stalker = Gnarling
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-foot-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-head-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-pants-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-chest-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-hand-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-kappa-tail-kappa = Kappa
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-boreal-foot-warrior = Boreal Wrappings
-    .desc = The blistering cold makes it hard to move.
-
-common-items-npc_armor-biped_small-boreal-head-warrior = Boreal Helmet
-    .desc = Did somebody say...BRAINFREEZE?!
-
-common-items-npc_armor-biped_small-boreal-pants-warrior = Boreal Tunic
-    .desc = Colder than the climate it protects you from.
-
-common-items-npc_armor-biped_small-boreal-chest-warrior = Boreal Chestplate
-    .desc = So frigid that you can feel it in your heart.
-
-common-items-npc_armor-biped_small-boreal-hand-warrior = Boreal Gauntlets
-    .desc = Colder than the touch of death.
-
-common-items-npc_armor-biped_small-bushly-foot-bushly = Bushly
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-bushly-pants-bushly = Bushly
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-bushly-chest-bushly = Bushly
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-bushly-hand-bushly = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-treasure_egg-chest-treasure_egg = Treasure Egg Chest
-    .desc = Treasure Egg Chest
-
-common-items-npc_armor-biped_small-treasure_egg-foot-treasure_egg = Treasure Egg Foot
-    .desc = Treasure Egg Foot
-
-common-items-npc_armor-biped_small-iron_dwarf-foot-iron_dwarf = Iron Dwarf Foot
-    .desc = Iron Dwarf Foot.
-
-common-items-npc_armor-biped_small-iron_dwarf-head-iron_dwarf = Iron Dwarf Head
-    .desc = Iron Dwarf Head.
-
-common-items-npc_armor-biped_small-iron_dwarf-pants-iron_dwarf = Iron Dwarf Pants
-    .desc = Iron Dwarf Pants.
-
-common-items-npc_armor-biped_small-iron_dwarf-chest-iron_dwarf = Iron Dwarf Chest
-    .desc = Iron Dwarf Chest.
-
-common-items-npc_armor-biped_small-iron_dwarf-hand-iron_dwarf = Iron Dwarf Hand
-    .desc = Iron Dwarf Hand.
-
-common-items-npc_armor-biped_small-haniwa-foot-archer = Haniwa Archer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-foot-guard = Haniwa Guard
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-foot-soldier = Haniwa Soldier
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-head-archer = Haniwa Archer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-head-guard = Haniwa Guard
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-head-soldier = Haniwa Soldier
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-pants-archer = Haniwa Archer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-pants-guard = Haniwa Guard
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-pants-soldier = Haniwa Soldier
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-chest-archer = Haniwa Archer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-chest-guard = Haniwa Guard
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-chest-soldier = Haniwa Soldier
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-hand-archer = Haniwa Archer
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-hand-guard = Haniwa Guard
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-haniwa-hand-soldier = Haniwa Soldier
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-foot-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-head-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-pants-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-chest-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-hand-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-husk-tail-husk = Husk
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-flamekeeper-foot-flamekeeper = Flamekeeper Foot
-    .desc = Flamekeeper Foot.
-
-common-items-npc_armor-biped_small-flamekeeper-head-flamekeeper = Flamekeeper Head
-    .desc = Flamekeeper Head.
-
-common-items-npc_armor-biped_small-flamekeeper-pants-flamekeeper = Flamekeeper Pants
-    .desc = Flamekeeper Pants.
-
-common-items-npc_armor-biped_small-flamekeeper-chest-flamekeeper = Flamekeeper Chest
-    .desc = Flamekeeper Chest.
-
-common-items-npc_armor-biped_small-flamekeeper-hand-flamekeeper = Flamekeeper Hand
-    .desc = Flamekeeper Hand.
-
-common-items-npc_armor-biped_small-gnome-foot-gnome = Gnome
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnome-head-gnome = Gnome
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnome-pants-gnome = Gnome
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnome-chest-gnome = Gnome
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnome-hand-gnome = Gnome
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-mandragora-foot-mandragora = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-mandragora-pants-mandragora = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-mandragora-chest-mandragora = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-mandragora-hand-mandragora = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-mandragora-tail-mandragora = Mandragora
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-irrwurz-foot-irrwurz = Irrwurz
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-irrwurz-pants-irrwurz = Irrwurz
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-irrwurz-chest-irrwurz = Irrwurz
-    .desc = Plant Creature.
-
-common-items-npc_armor-biped_small-irrwurz-hand-irrwurz = Irrwurz
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-foot-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-foot-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-foot-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-head-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-head-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-head-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-pants-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-pants-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-pants-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-chest-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-chest-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-chest-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-hand-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-hand-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-hand-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-tail-rogue = Gnoll Rogue
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-tail-shaman = Gnoll Shaman
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-gnoll-tail-trapper = Gnoll Trapper
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-jiangshi-head-jiangshi = Jiangshi
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-jiangshi-chest-jiangshi = Jiangshi
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-jiangshi-pants-jiangshi = Jiangshi
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-jiangshi-hand-jiangshi = Jiangshi
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-jiangshi-foot-jiangshi = Jiangshi
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-shamanic_spirit-head-shamanic_spirit = Shamanic Spirit
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-shamanic_spirit-chest-shamanic_spirit = Shamanic Spirit
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-shamanic_spirit-pants-shamanic_spirit = Shamanic Spirit
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-biped_small-shamanic_spirit-hand-shamanic_spirit = Shamanic Spirit
-    .desc = Ceremonial attire used by members.
-
-common-items-npc_armor-chest-plate_red = Iron Chestplate
-    .desc = A chestplate forged from iron.
-
-common-items-npc_armor-quadruped_low-basilisk = Basilisk Armor
-    .desc = Made up of heavy and thick plates.
-
-common-items-npc_armor-quadruped_low-dagon = Dagon's Scales
-    .desc = Rigid enough to withstand the pressure of the deep ocean.
-
-common-items-npc_armor-quadruped_low-drake = Drake Armor
-    .desc = Adaptive to temperature.
-
-common-items-npc_armor-quadruped_low-shell = Quad Low Shell
-    .desc = Shell.
-
-common-items-npc_armor-quadruped_low-snapper = Snapper Shell
-    .desc = 'Tis but a shell.
-
-common-items-npc_armor-quadruped_medium-tarasque = Tarasque Armor
-    .desc = testing123
-
-common-items-npc_armor-quadruped_medium-claysteed = Clay Steed's Thick Fur
-    .desc = testing123
-
-common-items-npc_armor-generic = NPC Generic
-    .desc = testing123
-
-common-items-npc_armor-generic_high = NPC Generic High
-    .desc = testing123
-
-common-items-npc_armor-theropod-rugged = Theropod Rugged
-    .desc = For big scary dinos.
-
-common-items-npc_armor-biped_large-cyclops = Cyclops Armor
-    .desc = Made of mysteries.
-
-common-items-npc_armor-biped_large-dullahan = Dullahan Itself Armor
-    .desc = Made of It ownself.
-
-common-items-npc_armor-biped_large-generic = Generic Biped Large
-    .desc = Worn by bipeds.
-
-common-items-npc_armor-biped_large-gigas_frost = Frost Gigas Armor
-    .desc = The best defense is a good offense.
-
-common-items-npc_armor-biped_large-harvester = Harvester Shirt
-    .desc = Made of sunflowers.
-
-common-items-npc_armor-biped_large-mindflayer = Mindflayer Armor
-    .desc = Worn by mindflayers.
-
-common-items-npc_armor-biped_large-minotaur = Minotaur Armor
-    .desc = The best defense is a good offense.
-
-common-items-npc_armor-biped_large-tidal_warrior = Tidal Warrior Armor
-    .desc = Made of fish scales.
-
-common-items-npc_armor-biped_large-tursus = Tursus Skin
-    .desc = Born with it.
-
-common-items-npc_armor-biped_large-warlock = Giant Warlock Chest
-    .desc = Made of darkest silk.
-
-common-items-npc_armor-biped_large-warlord = Giant Warlord Chest
-    .desc = Made of darkest steel.
-
-common-items-npc_armor-biped_large-yeti = Yeti Hide
-    .desc = Strong as Yeti itself.
-
-common-items-npc_armor-biped_large-forgemaster = Forge Master Armor
-    .desc = Worn by forgemaster.
-
-common-items-npc_armor-biped_large-haniwageneral = Haniwa General Uniform
-    .desc = Has seen combat.
-
-common-items-npc_armor-biped_large-terracotta = Terracotta Armor
-    .desc = A little dusty, that's all.
-
-armor-leather_blue-pants = Blue Leather Cuirass
-    .desc = {""}
-
-armor-leather_blue-back = Blue Traveler Coat
-    .desc = {""}
-
-armor-velorite_battlemage-back = Velorite Battlemage Cloak
-    .desc = Keeps your shoulders warm.
-
-armor-velorite_battlemage-belt = Velorite Battlemage Belt
-    .desc = {""}
-
-armor-velorite_battlemage-chest = Velorite Battlemage Vest
-    .desc = {""}
-
-armor-velorite_battlemage-foot = Velorite Battlemage Boots
-    .desc = {""}
-
-armor-velorite_battlemage-hand = Velorite Battlemage Gauntlets
-    .desc = {""}
-
-armor-velorite_battlemage-pants = Velorite Battlemage Kilt
-    .desc = {""}
-
-armor-velorite_battlemage-shoulder = Velorite Battlemage Guards
-    .desc = {""}
-
-armor-cardinal-belt = Cardinal's Belt
-    .desc = Seemlessly transitions...
-
-armor-cardinal-chest = Cardinal's Cloak
-    .desc = A part of the cardinal's exquisite cloak.
-
-armor-cardinal-foot = Cardinal's Boots
-    .desc = The boots with millions of steps.
-
-armor-cardinal-hand = Cardinal's Gloves
-    .desc = Bloodstained and rugged.
-
-armor-cardinal-mitre = Cardinal Mitre
-    .desc = Induces respect.
-
-armor-cardinal-pants = Cardinal's Jeans
-    .desc = Pants with many experiences.
-
-armor-cardinal-shoulder = Cardinal's Shoulderguard
-    .desc = The other was lost in a vicious fight.
-
-armor-merchant-back = Merchant Backpack
-    .desc = {""}
-
-armor-merchant-belt = Merchant Belt
-    .desc = {""}
-
-armor-merchant-chest = Merchant Jacket
-    .desc = {""}
-
-armor-merchant-foot = Merchant Boots
-    .desc = {""}
-
-armor-merchant-hand = Merchant Gloves
-    .desc = {""}
-
-armor-merchant-pants = Merchant Pants
-    .desc = {""}
-
-armor-merchant-shoulder_l = Merchant Mantle
-    .desc = {""}
-
-common-items-armor-alchemist-belt = Alchemist Belt
-    .desc = {""}
-
-common-items-armor-alchemist-chest = Alchemist Jacket
-    .desc = {""}
-
-common-items-armor-alchemist-hat = Alchemist Hat
-    .desc = It seems like a parrot was perched up here.
-
-common-items-armor-alchemist-pants = Alchemist Pants
-    .desc = {""}
-
-common-items-armor-misc-head-headband = Headband
-    .desc = A simple headband, it's nothing special.
-
-common-items-armor-witch-back = Witch Cape
-    .desc = {""}
-
-common-items-armor-witch-belt = Witch Belt
-    .desc = {""}
-
-common-items-armor-witch-chest = Witch Robe
-    .desc = {""}
-
-common-items-armor-witch-foot = Witch Boots
-    .desc = {""}
-
-common-items-armor-witch-hand = Witch Handwarmers
-    .desc = {""}
-
-common-items-armor-witch-pants = Witch Skirt
-    .desc = {""}
-
-common-items-armor-witch-shoulder = Witch Mantle
-    .desc = {""}
-
-common-items-armor-pirate-belt = Pirate Belt
-    .desc = {""}
-
-common-items-armor-pirate-chest = Pirate Jacket
-    .desc = {""}
-
-common-items-armor-pirate-foot = Pirate Boots
-    .desc = {""}
-
-common-items-armor-pirate-hand = Pirate Gloves
-    .desc = {""}
-
-common-items-armor-pirate-pants = Pirate Pants
-    .desc = {""}
-
-common-items-armor-pirate-shoulder = Pirate Mantle
-    .desc = {""}
-
-armor-miner-helmet = Miner Helmet
-    .desc = Someone carved 'Mine!' into the inside.
-
-common-items-armor-miner-back = Miner's Backpack
-    .desc = Battered from heavy rocks being carried inside.
-
-common-items-armor-miner-belt = Miner's Belt
-    .desc = {""}
-
-common-items-armor-miner-chest = Miner's Vestment
-    .desc = Rock dust is covering most of the leather parts.
-
-common-items-armor-miner-foot = Miner's Footwear
-    .desc = Someone carved 'Mine!' into the inside.
-
-common-items-armor-miner-hand = Miner's Gloves
-    .desc = Someone carved 'Mine!' into the inside.
-
-common-items-armor-miner-pants = Miner's pantaloons
-    .desc = {""}
-
-common-items-armor-miner-shoulder = Miner's Pauldrons
-    .desc = Protects Cave-in and out.
-
-common-items-armor-miner-shoulder_captain = Captain's Pauldrons
-    .desc = {""}
-
-common-items-armor-miner-shoulder_flame = Flamekeeper's Pauldrons
-    .desc = {""}
-
-common-items-armor-miner-shoulder_overseer = Overseer's Pauldrons
-    .desc = {""}
-
-common-items-armor-chef-belt = Chef Belt
-    .desc = {""}
-
-common-items-armor-chef-chest = Chef Jacket
-    .desc = {""}
-
-common-items-armor-chef-hat = Chef Hat
-    .desc = {""}
-
-common-items-armor-chef-pants = Chef Pants
-    .desc = {""}
-
-common-items-armor-blacksmith-belt = Blacksmith Belt
-    .desc = {""}
-
-common-items-armor-blacksmith-chest = Blacksmith Jacket
-    .desc = {""}
-
-common-items-armor-blacksmith-hand = Blacksmith Gloves
-    .desc = {""}
-
-common-items-armor-blacksmith-hat = Blacksmith Hat
-    .desc = {""}
-
-common-items-armor-blacksmith-pants = Blacksmith Pants
-    .desc = {""}
-
-common-items-armor-leather_plate-helmet = Leather Plate Helmet
-    .desc = Leather adorned with steel for better protection.
-
-armor-assassin-belt = Assassin Belt
-    .desc = Only the best for a member of the creed.
-
-armor-assassin-chest = Assassin Chest
-    .desc = Only the best for a member of the creed.
-
-armor-assassin-foot = Assassin Boots
-    .desc = Only the best for a member of the creed.
-
-armor-assassin-hand = Assassin Gloves
-    .desc = Only the best for a member of the creed.
-
-armor-misc-head-assa_mask-0 = Dark Assassin Mask
-    .desc = A general assassination mask preventing the wearer from being identified.
-
-armor-assassin-pants = Assassin Pants
-    .desc = Only the best for a member of the creed.
-
-armor-assassin-shoulder = Assassin Shoulder Guard
-    .desc = Only the best for a member of the creed.
-
-armor-ferocious-back = Ferocious Mantle
-    .desc = The dark side of nature.
-
-armor-ferocious-belt = Ferocious Sash
-    .desc = The dark side of nature.
-
-armor-ferocious-chest = Ferocious Shirt
-    .desc = The dark side of nature.
-
-armor-ferocious-foot = Ferocious Waraji
-    .desc = The dark side of nature.
-
-armor-ferocious-hand = Ferocious Wraps
-    .desc = The dark side of nature.
-
-armor-ferocious-pants = Ferocious Shorts
-    .desc = The dark side of nature.
-
-armor-ferocious-shoulder = Ferocious Guards
-    .desc = The dark side of nature.
-
-armor-bonerattler-belt = Bonerattler Belt
-    .desc = Sections of vertebrae fastened together with hide and a bonerattler eye for the buckle.
-
-armor-bonerattler-chest = Bonerattler Cuirass
-    .desc = The spiny back and hide of a bonerattler fastened together into a protective cuirass.
-
-armor-bonerattler-foot = Bonerattler Boots
-    .desc = Boots made from the claws and hide of a bonerattler.
-
-armor-bonerattler-hand = Bonerattler Gauntlets
-    .desc = The hide and bone from a bonerattler provide strong protection for the wearer.
-
-armor-bonerattler-pants = Bonerattler Chausses
-    .desc = Assorted bones and hide from a bonerattler provide protection around the wearer's legs.
-
-armor-bonerattler-shoulder = Bonerattler Shoulder Pad
-    .desc = Roughly formed bonerattler hide provide some strong protection.
-
-armor-misc-head-exclamation = Exclamation hat
-    .desc = You feel like bestowing quests.
-
-armor-misc-foot-iceskate = Ice Skates
-    .desc = Best used on a frozen lake.
-
-armor-misc-foot-jackalope = Fluffy Jackalope Slippers
-    .desc = So warm and cozy!
-
-armor-misc-foot-ski = Wooden skis
-    .desc = Best used downhill on snow.
diff --git a/assets/voxygen/i18n/en/item/armor/other.ftl b/assets/voxygen/i18n/en/item/armor/other.ftl
deleted file mode 100644
index 178d707..0000000
--- a/assets/voxygen/i18n/en/item/armor/other.ftl
+++ /dev/null
@@ -1,118 +0,0 @@
-lantern-magic_lantern = Magic Lantern
-    .desc = Illuminates even the darkest dungeon. A great monster was slain for this item.
-
-lantern-black = Black Lantern
-    .desc = Quite common due to popular use of budding adventurers!
-
-lantern-blue = Cool Blue Lantern
-    .desc = This lantern is surprisingly cold when lit.
-
-lantern-geode_purp = Purple Geode
-    .desc = Emits a calming glow, helps to calm your nerves.
-
-lantern-green = Lime Zest Lantern
-    .desc = It has an opening that could fit a ring...
-
-lantern-polaris = Polaris
-    .desc = Christmas Lantern.
-
-lantern-pumpkin = Eerie Pumpkin
-    .desc = Did it just blink?!
-
-lantern-red = Red Lantern
-    .desc = Caution: contents hot.
-
-lantern-delvers_lamp = Delver's Lamp
-    .desc = Perfect for mining.
-
-glider-basic_red = Red Cloth Glider
-    .desc = A simple glider, but with a striking red color.
-
-glider-basic_white = Plain Cloth Glider
-    .desc = Simple, but classy.
-
-glider-blue = Blue Falcon
-    .desc = Sky colored.
-
-glider-butterfly-moonlit_love = Moonlit Love
-    .desc = Love is in the air.
-
-glider-cloverleaf = Cloverleaf
-    .desc = Brings luck to its owner. Light-weight and cheap to make, and also very cute!
-
-glider-leaves = Leaves Glider
-    .desc = Soar among the trees.
-
-glider-butterfly-orange_monarch = Orange Monarch
-    .desc = The delicate wings flutter faintly.
-
-glider-moonrise = Aquatic Night
-    .desc = The stars are beautiful tonight.
-
-glider-butterfly-blue_morpho = Blue Morpho
-    .desc = The delicate wings flutter faintly.
-
-glider-moth = Green Luna
-    .desc = The delicate wings flutter faintly.
-
-glider-sandraptor = Sand Raptor Wings
-    .desc = Take flight with the wings of a thirsty predator.
-
-glider-cultists = Skullgrin
-    .desc = Death from above.
-
-glider-snowraptor = Snow Raptor Wings
-    .desc = Take flight with the wings of a cold-blooded predator.
-
-glider-sunset = Horizon
-    .desc = It isn't high noon.
-
-glider-winter_wings = Wings of Winter
-    .desc = Sparkles brilliantly and cooly even under the warm sun.
-
-glider-woodraptor = Wood Raptor Wings
-    .desc = Take flight with the wings of a stealthy predator.
-
-armor-misc-back-backpack = Rugged Backpack
-    .desc = Keeps all your stuff together.
-
-armor-misc-bag-heavy_seabag = Heavy Seabag
-    .desc = Commonly used by sailors.
-
-armor-misc-bag-knitted_red_pouch = Knitted Red Pouch
-    .desc = A sizeable red bag with two pouches, made of wool and dye.
-
-armor-misc-bag-liana_kit = Liana Kit
-    .desc = Woven from dried lianas.
-
-armor-misc-bag-mindflayer_spellbag = Mindflayer Spellbag
-    .desc = 
-        You can almost feel a mindflayer's
-        evil presence flowing through the fabric.
-
-armor-misc-bag-reliable_backpack = Reliable Backpack
-    .desc = It will never give you up.
-
-armor-misc-bag-reliable_leather_pack = Reliable Leather Pack
-    .desc = It will never give you up.
-
-armor-misc-bag-soulkeeper_cursed = Cursed Soulkeeper
-    .desc = WIP.
-
-armor-misc-bag-soulkeeper_pure = Purified Soulkeeper
-    .desc = WIP.
-
-armor-misc-bag-sturdy_red_backpack = Sturdy Red Saddlebag
-    .desc = A truly reliable and sizeable bag, embroidered with amethyst and thick leather.
-
-armor-misc-bag-tiny_leather_pouch = Small Leather Pouch
-    .desc = A small reliable leather pouch.
-
-armor-misc-bag-tiny_red_pouch = Tiny Red Pouch
-    .desc = Made from multiple patches of dyed cloth.
-
-armor-misc-bag-troll_hide_pack = Trollhide Pack
-    .desc = Trolls were definitely hurt in the making of this.
-
-armor-misc-bag-woven_red_bag = Woven Red Bag
-    .desc = A moderately sized red bag. Although it still feels pretty cramped.
diff --git a/assets/voxygen/i18n/en/item/common.ftl b/assets/voxygen/i18n/en/item/common.ftl
deleted file mode 100644
index 334ed26..0000000
--- a/assets/voxygen/i18n/en/item/common.ftl
+++ /dev/null
@@ -1 +0,0 @@
-items-common-amount = Amount: { $amount }
\ No newline at end of file
diff --git a/assets/voxygen/i18n/en/item/items/crafting.ftl b/assets/voxygen/i18n/en/item/items/crafting.ftl
deleted file mode 100644
index e64e0f6..0000000
--- a/assets/voxygen/i18n/en/item/items/crafting.ftl
+++ /dev/null
@@ -1,345 +0,0 @@
-sprite-grass-grass_long_5 = Long Grass
-    .desc = Greener than an orc's snout.
-
-sprite-wood-item-bamboo = Bamboo
-    .desc = A giant woody grass. This can be used when crafting wooden weapons.
-
-sprite-wood-item-eldwood = Eldwood Logs
-    .desc = Old logs that emanate magic. This can be used when crafting wooden weapons.
-
-sprite-wood-item-frostwood = Frostwood Logs
-    .desc = Chilly wood that comes from cold biomes. Cold to the touch. This can be used when crafting wooden weapons.
-
-sprite-wood-item-hardwood = Hardwood Logs
-    .desc = Extra thick and sturdy logs. This can be used when crafting wooden weapons.
-
-sprite-wood-item-ironwood = Ironwood Logs
-    .desc = A particularly sturdy wood. This can be used when crafting wooden weapons.
-
-sprite-wood-item-wood = Wood Logs
-    .desc = Regular, sturdy wooden logs. This can be used when crafting wooden weapons.
-
-sprite-crafting_ing-abyssal_heart = Abyssal Heart
-    .desc = Source of Dagons Power.
-
-sprite-crafting_ing-bowl = Bowl
-    .desc = A simple bowl for preparing meals.
-
-sprite-crafting_ing-brinestone = Brinestone
-    .desc = Used for armor crafting.
-
-sprite-cacti-flat_cactus_med = Cactus
-    .desc = Grows in warm and dry places. Very prickly!
-
-sprite-crafting_ing-coral_branch = Coral Branch
-    .desc = Treasure from the bottom of the sea.
-
-sprite-crafting_ing-cotton_boll = Cotton Boll
-    .desc = Plucked from a common cotton plant.
-
-sprite-crafting_ing-living_embers = Living Embers
-    .desc = The smouldering remains of a fiery creature.
-
-sprite-crafting_ing-oil = Oil
-    .desc = A measure of thick, sludgy oil.
-
-sprite-crafting_ing-pearl = Pearl
-    .desc = Would make a nice lamp.
-
-sprite-crafting_ing-resin = Resin
-    .desc = Used for woodworking.
-
-sprite-seashells-shell-0 = Seashells
-    .desc = Shells from a sea creature.
-
-sprite-crafting_ing-sentient_seed = Sentient Seed
-    .desc = The undeveloped spawn of a sentient plant.
-
-sprite-crafting_ing-sticky_thread = Sticky Thread
-    .desc = A messy spider extract, but a tailor may have use for it.
-
-sprite-crafting_ing-alkahest = Alkahest
-    .desc = Alchemical solvent.
-
-sprite-crafting_ing-dwarven_battery = Dwarven Battery
-    .desc = Container of magical energy.
-
-sprite-rocks-rock-0 = Stones
-    .desc = Pebbles from the ground, nothing out of the ordinary.
-
-sprite-twigs-twigs-0 = Twigs
-    .desc = Found near trees, a squirrel must've knocked it down.
-
-sprite-crafting_ing-hide-animal_hide = Animal Hide
-    .desc = A common pelt from most animals. Becomes leather.
-
-sprite-crafting_ing-hide-carapace = Hard Carapace
-    .desc = Tough, hard carapace, a shield to many creatures.
-
-sprite-crafting_ing-hide-dragon_scale = Dragon Scale
-    .desc = Tough scale from a legendary beast, hot to the touch.
-
-sprite-crafting_ing-hide-troll_hide = Troll Hide
-    .desc = Looted from cave trolls.
-
-sprite-crafting_ing-hide-plate = Plate
-    .desc = Durable plate from an armored animal.
-
-sprite-crafting_ing-hide-rugged_hide = Rugged Hide
-    .desc = A durable pelt from fierce creatures, favored by leatherworkers.
-
-sprite-crafting_ing-hide-scale = Scale
-    .desc = Shiny scales found off of an animal.
-
-sprite-crafting_ing-hide-tough_hide = Tough Hide
-    .desc = A relatively tough, rough hide. Becomes leather.
-
-sprite-crafting_ing-animal_misc-claw = Predator Claw
-    .desc = 
-        The nimble claw of a fierce predator.
-        
-        Can be used to craft fast and agile weapons.
-
-sprite-crafting_ing-animal_misc-fur = Soft Fur
-    .desc = Soft fur from an animal.
-
-sprite-crafting_ing-animal_misc-grim_eyeball = Grim Eyeball
-    .desc = Casts a petrifying gaze.
-
-sprite-crafting_ing-animal_misc-large_horn = Large Horn
-    .desc = 
-        A large horn from a fearsome beast.
-        
-        Weapons made with it have strengthened ability effects.
-
-sprite-crafting_ing-animal_misc-lively_vine = Lively Vine
-    .desc = I think it just moved...
-
-sprite-crafting_ing-animal_misc-phoenix_feather = Phoenix Feather
-    .desc = Said to have magical properties.
-
-sprite-crafting_ing-animal_misc-sharp_fang = Sharp Fang
-    .desc = 
-        Razor-sharp tooth from a ferocious animal.
-        
-        Weapons made with it have more potent lasting effects.
-
-sprite-crafting_ing-animal_misc-venom_sac = Venom Sac
-    .desc = A venomous sac from a poisonous creature.
-
-sprite-crafting_ing-animal_misc-viscous_ooze = Viscous Ooze
-    .desc = A measure of viscous ooze from a slimy creature.
-
-sprite-crafting_ing-leather-leather_strips = Leather Strips
-    .desc = Simple and versatile.
-
-sprite-crafting_ing-leather-rigid_leather = Rigid Leather
-    .desc = Light but layered, perfect for protection.
-
-sprite-crafting_ing-leather-simple_leather = Simple Leather
-    .desc = Light and flexible.
-
-sprite-crafting_ing-leather-thick_leather = Thick Leather
-    .desc = Strong and durable.
-
-sprite-crafting_ing-cloth-cloth_strips = Cloth Strips
-    .desc = Small and soft, yet useful.
-
-sprite-crafting_ing-cloth-cotton = Cotton
-    .desc = Easy to work with and multi-functional.
-
-sprite-crafting_ing-cloth-lifecloth = Lifecloth
-    .desc = A fabric imbued with the gentleness that nature has to offer.
-
-sprite-crafting_ing-cloth-linen = Linen
-    .desc = A textile made from flax fibers.
-
-sprite-crafting_ing-cloth-linen_red = Red Linen
-    .desc = A flax fiber textile, dyed to stand out.
-
-sprite-crafting_ing-cloth-moonweave = Moonweave
-    .desc = A light yet very sturdy textile.
-
-sprite-crafting_ing-cloth-silk = Silk
-    .desc = A fine and strong fibre produced by spiders.
-
-sprite-crafting_ing-cloth-sunsilk = Sunsilk
-    .desc = A supernaturally strong textile.
-
-sprite-crafting_ing-cloth-wool = Soft Wool
-    .desc = Soft wool from an animal.
-
-sprite-flowers-moonbell = Moonbell
-    .desc = It glistens brilliantly under the moonlight.
-
-sprite-crafting_ing-plant_fiber = Plant Fiber
-    .desc = A length of raw plant material.
-
-sprite-flowers-pyrebloom = Pyrebloom
-    .desc = Warm to the touch, long after picking.
-
-sprite-flowers-flower_red-4 = Red Flower
-    .desc = Can be used as a dying ingredient.
-
-sprite-flowers-sunflower_1 = Sunflower
-    .desc = Smells like summer.
-
-sprite-flowers-flax = Wild Flax
-    .desc = Could be used to spin some simple cloth.
-
-sprite-flowers-yellow = Yellow Flower
-    .desc = Glows like the sun.
-
-object-v-coin = Coins
-    .desc = Precious coins, can be exchanged for goods and services.
-
-object-collar = Collar
-    .desc = Tames neutral wild animals within 5 blocks.
-
-object-training_dummy = Training Dummy
-    .desc = His name is William. Fire at will.
-
-object-mortar_pestle = Mortar and Pestle
-    .desc = Crushes and grinds things into a fine powder or paste. Needed to craft various items.
-
-object-sewing_set = Sewing Set
-    .desc = Used to craft various items.
-
-object-potion_empty = Empty Vial
-    .desc = A simple glass vial used for holding various fluids.
-
-object-glacial_crystal = Glacial Crystal
-    .desc = The purest form of ice, cold enough to cool lava.
-
-object-honey = Honey
-    .desc = Stolen from a beehive. Surely the bees won't be happy with this!
-
-object-glowing_remains = Glowing Remains
-    .desc = 
-        Looted from an evil being.
-        
-        With some additional work it can surely be
-        brought back to its former glory...
-
-object-elegant_crest = Elegant Crest
-    .desc = 
-        Bright plumage formerly part of a colorful creature.
-        
-        Can be used to craft quick and energy-efficient weapons.
-
-object-ice_shard = Icy Shard
-    .desc = Looted from a frosty creature.
-
-object-long_tusk = Long Tusk
-    .desc = 
-        An impressively long tusk from a proud beast.
-        
-        Can be used to craft efficient, long-range weapons.
-
-object-raptor_feather = Raptor Feather
-    .desc = A large colorful feather from a raptor.
-
-object-strong_pincer = Strong Pincer
-    .desc = 
-        A powerful pincer from a hard-shelled creature.
-        
-        Has power-enhancing effects when crafting weapons.
-
-sprite-mineral-ore-bloodstone = Bloodstone Ore
-    .desc = A deep red ore, it reminds you of blood.
-
-sprite-mineral-ore-coal = Coal
-    .desc = A dark, combustible energy source.
-
-sprite-mineral-ore-cobalt = Cobalt Ore
-    .desc = A blue, shiny ore.
-
-sprite-mineral-ore-copper = Copper Ore
-    .desc = A brown metal. Key part of bronze.
-
-sprite-mineral-ore-gold = Gold Ore
-    .desc = A precious yellow metal.
-
-sprite-mineral-ore-iron = Iron Ore
-    .desc = An incredibly common but incredibly versatile metal.
-
-sprite-mineral-ore-silver = Silver Ore
-    .desc = A precious shiny greyish-white metal.
-
-sprite-mineral-ore-tin = Tin Ore
-    .desc = A silvery metal. One of the components of bronze.
-
-sprite-mineral-ore-ancient_gold = Ancient Gold
-    .desc = Ancient ingot of gold, soaked in magical energies.
-
-sprite-velorite-velorite_ore = Velorite
-    .desc = A bizarre, oddly shimmering ore, its origin seems to be shrouded in mystery.
-
-sprite-velorite-velorite = Velorite Fragment
-    .desc = Small runes sparkle on its surface, though you don't know what it means.
-
-sprite-mineral-ingot-bloodsteel = Bloodsteel Ingot
-    .desc = 
-        An alloy of bloodstone and iron, with a dark red color.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-bronze = Bronze Ingot
-    .desc = 
-        A sturdy alloy made from combining copper and tin.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-cobalt = Cobalt Ingot
-    .desc = 
-        A strikingly blue ingot.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-copper = Copper Ingot
-    .desc = An ingot with a unique brown color.
-
-sprite-mineral-ingot-gold = Gold Ingot
-    .desc = An ingot made of refined metallic gold.
-
-sprite-mineral-ingot-iron = Iron Ingot
-    .desc = 
-        An incredibly commonplace metal.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-orichalcum = Orichalcum Ingot
-    .desc = 
-        An ingot made of refined orichalcum.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-silver = Silver Ingot
-    .desc = An ingot made of refined metallic silver.
-
-sprite-mineral-ingot-steel = Steel Ingot
-    .desc = 
-        An alloy of iron and coal that is much tougher than its components.
-        
-        This can be used when crafting metal weapons.
-
-sprite-mineral-ingot-tin = Tin Ingot
-    .desc = An ingot primarily used to make bronze.
-
-sprite-mineral-gem-amethystgem = Amethyst
-    .desc = A precious purple gem.
-
-sprite-mineral-gem-diamondgem = Diamond
-    .desc = A sparkling silver gem.
-
-sprite-mineral-gem-emeraldgem = Emerald
-    .desc = A vibrant viridian gem.
-
-sprite-mineral-gem-rubygem = Ruby
-    .desc = A superbly scarlet gem.
-
-sprite-mineral-gem-sapphiregem = Sapphire
-    .desc = A colorful cobalt gem.
-
-sprite-mineral-gem-topazgem = Topaz
-    .desc = An outstanding orange gem.
diff --git a/assets/voxygen/i18n/en/item/items/food.ftl b/assets/voxygen/i18n/en/item/items/food.ftl
deleted file mode 100644
index 5957abb..0000000
--- a/assets/voxygen/i18n/en/item/items/food.ftl
+++ /dev/null
@@ -1,92 +0,0 @@
-sprite-carrot-carrot = Carrot
-    .desc = An orange root vegetable. They say it'll improve your vision!
-
-sprite-cabbage-cabbage = Lettuce
-    .desc = A vibrant green leafy vegetable. Lettuce make some salads!
-
-sprite-mushrooms-mushroom-10 = Mushroom
-    .desc = Hopefully this one is not poisonous.
-
-sprite-food-salad_plain = Plain Salad
-    .desc = Literally just chopped lettuce. Does this even count as a salad?
-
-sprite-tomato-tomato = Tomato
-    .desc = A red fruit. It's not actually a vegetable!
-
-sprite-food-salad_tomato = Tomato Salad
-    .desc = Leafy salad with some chopped, juicy tomatoes mixed in.
-
-sprite-food-meat-beast_large_cooked = Cooked Meat Slab
-    .desc = Medium Rare.
-
-sprite-food-meat-beast_large_raw = Raw Meat Slab
-    .desc = Chunk of beastly animal meat, best after cooking.
-
-sprite-food-meat-beast_small_cooked = Cooked Meat Sliver
-    .desc = Medium Rare.
-
-sprite-food-meat-beast_small_raw = Raw Meat Sliver
-    .desc = Small hunk of beastly animal meat, best after cooking.
-
-sprite-food-meat-bird_cooked = Cooked Bird Meat
-    .desc = Best enjoyed with one in each hand.
-
-sprite-food-meat-bird_large_cooked = Huge Cooked Drumstick
-    .desc = Makes for a legendary meal.
-
-sprite-food-meat-bird_large_raw = Huge Raw Drumstick
-    .desc = It's magnificent.
-
-sprite-food-meat-bird_raw = Raw Bird Meat
-    .desc = A hefty drumstick.
-
-sprite-food-meat-fish_cooked = Cooked Fish
-    .desc = A fresh cooked seafood steak.
-
-sprite-food-meat-fish_raw = Raw Fish
-    .desc = A steak chopped from a fish, best after cooking.
-
-sprite-food-meat-tough_cooked = Cooked Tough Meat
-    .desc = Tastes exotic.
-
-sprite-food-meat-tough_raw = Raw Tough Meat
-    .desc = Peculiar bit of meat, best after cooking.
-
-object-apple_half = Apple
-    .desc = Red and juicy.
-
-object-mushroom_curry = Mushroom Curry
-    .desc = Who could say no to that?
-
-object-apple_stick = Apple Stick
-    .desc = The stick makes it easier to carry!
-
-object-blue_cheese = Blue Cheese
-    .desc = Pungent and filling.
-
-object-cactus_drink = Cactus Colada
-    .desc = Giving you that special prickle.
-
-object-cheese = Dwarven Cheese
-    .desc = Made from goat milk from the finest dwarven produce. Aromatic and nutritious!
-
-object-coconut_half = Coconut
-    .desc = Reliable source of water and fat. Can often be found growing on palm trees.
-
-object-honeycorn = Honeycorn
-    .desc = Sweeet.
-
-object-mushroom_stick = Mushroom Stick
-    .desc = Roasted mushrooms on a stick for easy carrying.
-
-object-pumpkin_spice_brew = Pumpkin Spice Brew
-    .desc = Brewed from moldy pumpkins.
-
-object-sunflower_ice_tea = Sunflower Ice Tea
-    .desc = Brewed from freshly shelled sunflower seeds.
-
-sprite-spore-corruption_spore = Spore of Corruption
-    .desc = 
-        You feel an evil force pulsating within.
-        
-        It may be unwise to hold on to it for too long...
diff --git a/assets/voxygen/i18n/en/item/items/internal.ftl b/assets/voxygen/i18n/en/item/items/internal.ftl
deleted file mode 100644
index d8fff04..0000000
--- a/assets/voxygen/i18n/en/item/items/internal.ftl
+++ /dev/null
@@ -1,215 +0,0 @@
-### This file contains non-player-facing items.
-### Feel free to ignore them.
-
-common-items-food-coltsfoot = Coltsfoot
-    .desc = A daisy-like flower often used in herbal teas.
-
-common-items-food-dandelion = Dandelion
-    .desc = A small, yellow flower. Uses the wind to spread its seeds.
-
-common-items-food-garlic = Garlic
-    .desc = Make sure to brush your teeth after eating.
-
-common-items-food-meat = Meat
-    .desc = Meat. The lifeblood of mankind.
-
-common-items-food-onion = Onion
-    .desc = A vegetable that's made the toughest men cry.
-
-common-items-food-sage = Sage
-    .desc = A herb commonly used in tea.
-
-common-items-tag_examples-cultist = Anything related to cultists
-    .desc = These items are a little creepy.
-
-common-items-grasses-medium = Medium Grass
-    .desc = Greener than an orc's snout.
-
-common-items-grasses-short = Short Grass
-    .desc = Greener than an orc's snout.
-
-common-items-boss_drops-exp_flask = Flask of Velorite Dust
-    .desc = Take with plenty of water.
-
-common-items-boss_drops-xp_potion = Potion of Skill
-    .desc = It doesn't seem to be doing anything...
-
-common-items-crafting_ing-rock = Rock
-    .desc = Made up of a bunch of different minerals, looks like it would hurt to get hit with.
-
-common-items-crafting_ing-animal_misc-bone = Thick Bone
-    .desc = A thick bone, it seems sturdy enough to craft with.
-
-common-items-crafting_ing-animal_misc-ember = Ember
-    .desc = A flicking ember left by a fiery creature.
-
-common-items-crafting_ing-animal_misc-feather = Feather
-    .desc = Feather from a bird.
-
-common-items-tag_examples-gnarling = Attire of the Gnarling tribes
-    .desc = Worn by Gnarlings and their Chieftains.
-
-common-items-flowers-blue = Blue Flower
-    .desc = Matches the color of the sky.
-
-common-items-flowers-pink = Pink Flower
-    .desc = Looks like a lollipop.
-
-common-items-flowers-white = White flower
-    .desc = Pure and precious.
-
-common-items-mineral-stone-basalt = Basalt
-    .desc = A dark volcanic rock, most volcanic rock tends to be basalt..
-
-common-items-mineral-stone-granite = Granite
-    .desc = A light-colored igneous rock, coarse-grained and formed by intrusion.
-
-common-items-mineral-stone-obsidian = Obsidian
-    .desc = An igneous rock that comes from felsic lava, it never seems to dwindle.
-
-common-items-mineral-stone-coal = Coal
-    .desc = A combustible black rock that happens to be really good at burning.
-
-common-items-weapons-sceptre-belzeshrub = Belzeshrub the Broom God
-    .desc = 'Is it... alive?'
-
-common-items-tool-pickaxe_velorite = Velorite Pickaxe
-    .desc = Allows for swift excavation of any ore in sight.
-
-common-items-testing-test_bag_18_slot = Test 18 slot bag
-    .desc = Used for unit tests do not delete.
-
-common-items-testing-test_bag_9_slot = Test 9 slot bag
-    .desc = Used for unit tests do not delete.
-
-common-items-testing-test_boots = Testing Boots
-    .desc = Hopefully this test doesn't break!
-
-common-items-weapons-empty-empty = Empty Item
-    .desc = This item may grant abilities, but is invisible.
-
-common-items-modular-weapon-primary-bow-bow = Bow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-composite = Composite Bow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-greatbow = Greatbow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-longbow = Longbow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-ornate = Ornate Bow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-shortbow = Shortbow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-bow-warbow = Warbow Limbs
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-axe = Axe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-battleaxe = Battleaxe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-greataxe = Greataxe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-jagged = Jagged Axe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-labrys = Labrys Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-ornate = Ornate Axe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-axe-poleaxe = Poleaxe Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-brand = Brand Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-grandstaff = Grandstaff Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-longpole = Long Pole Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-ornate = Ornate Staff Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-pole = Pole Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-rod = Rod Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-staff-staff = Staff Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-greatsword = Greatsword Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-katana = Katana Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-longsword = Longsword Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-ornate = Ornate Sword Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-sabre = Sabre Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-sawblade = Sawblade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sword-zweihander = Zweihander Blade
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-arbor = Arbor Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-cane = Cane Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-crook = Crook Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-crozier = Crozier Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-grandsceptre = Grandsceptre Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-ornate = Ornate Sceptre Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-sceptre-sceptre = Sceptre Shaft
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-greathammer = Greathammer Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-greatmace = Greatmace Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-hammer = Hammer Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-maul = Maul Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-ornate = Ornate Hammer Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-spikedmace = Spiked Mace Head
-    .desc = {""}
-
-common-items-modular-weapon-primary-hammer-warhammer = Warhammer Head
-    .desc = {""}
diff --git a/assets/voxygen/i18n/en/item/items/key.ftl b/assets/voxygen/i18n/en/item/items/key.ftl
deleted file mode 100644
index f085f95..0000000
--- a/assets/voxygen/i18n/en/item/items/key.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-object-lockpick = Common Lockpick
-    .desc = Used to open common locks. Will break after use.
-
-object-key-bone = Bone Key
-    .desc = Used to open bone locks. Will break after use.
-
-object-key-glass = Glass Key
-    .desc = Used to open Glass Barriers. Will break after use.
-
-object-key-rusty = Rusty Tower Key
-    .desc = Smells like magic with a bit of... cheese?
-
-object-key-miner = Miner Key
-    .desc = Used to open doors. Will break after use.
-
-object-key-forge = Forge Key
-    .desc = Used to open doors. Will break after use.
-
-object-key-haniwa = Haniwa Keystone
-    .desc = Used to open doors. Will break after use.
-
-object-key-terracotta_chest = Terracotta Chest Key
-    .desc = Used to open chests. Will break after use.
-
-object-key-terracotta_door = Terracotta Door Key
-    .desc = Used to open doors. Will break after use.
-
-object-key-sahagin = Sahagin Key
-    .desc = Used to open doors. Will break after use.
diff --git a/assets/voxygen/i18n/en/item/items/potion.ftl b/assets/voxygen/i18n/en/item/items/potion.ftl
deleted file mode 100644
index e7e98fc..0000000
--- a/assets/voxygen/i18n/en/item/items/potion.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-object-potion_red = Potent Potion
-    .desc = A potent healing potion.
-
-object-potion_curious = Curious Potion
-    .desc = Wonder what this does...
-
-object-potion_agility = Potion of Agility
-    .desc = Fly, you fools!
-
-object-potion_big = Large Potion
-    .desc = Precious medicine, it makes for the largest rejuvenative flask yet.
-
-object-potion_combustion = Potion of Combustion
-    .desc = Sets the user ablaze.
-
-object-potion_med = Medium Potion
-    .desc = An innovative invention from an apothecary, better than its smaller precursors.
-
-object-potion_minor = Minor Potion
-    .desc = A small potion concocted from apples and honey.
-
-object-potion_freezing = Freezing Potion
-    .desc = Freezes the user's brain.
-
-object-burning_charm = Blazing Charm
-    .desc = Flame is your ally, harness its power to burn your foes.
-
-object-frozen_charm = Freezing Charm
-    .desc = Let your enemies feel the sting of cold as you freeze them in their tracks.
-
-object-lifesteal_charm = Siphon Charm
-    .desc = Siphon your target life and use it for your own.
diff --git a/assets/voxygen/i18n/en/item/recipe.ftl b/assets/voxygen/i18n/en/item/recipe.ftl
deleted file mode 100644
index 4ddce62..0000000
--- a/assets/voxygen/i18n/en/item/recipe.ftl
+++ /dev/null
@@ -1,116 +0,0 @@
-recipe-armor-bloodsteel = Bloodsteel Armor Recipes
-    .desc = Bloodsteel Armor Recipes
-recipe-armor-brinestone = Brinestone Armor Recipes
-    .desc = Brinestone Armor Recipes
-recipe-armor-carapace = Carapace Armor Recipes
-    .desc = Carapace Armor Recipes
-recipe-armor-cobalt = Cobalt Armor Recipes
-    .desc = Cobalt Armor Recipes
-recipe-armor-dragonscale = Dragonscale Armor Recipes
-    .desc = Dragonscale Armor Recipes
-recipe-armor-druid = Druid Armor Recipes
-    .desc = Druid Armor Recipes
-recipe-armor-iron = Iron Armor Recipes
-    .desc = Iron Armor Recipes
-recipe-armor-leather = Leather Armor Recipes
-    .desc = Leather Armor Recipes
-recipe-armor-moonweave = Moonweave Armor Recipes
-    .desc = Moonweave Armor Recipes
-recipe-armor-orichalcum = Orichalcum Armor Recipes
-    .desc = Orichalcum Armor Recipes
-recipe-armor-primal = Primal Armor Recipes
-    .desc = Primal Armor Recipes
-recipe-armor-scale = Scale Armor Recipes
-    .desc = Scale Armor Recipes
-recipe-armor-silken = Silken Armor Recipes
-    .desc = Silken Armor Recipes
-recipe-armor-steel = Steel Armor Recipes
-    .desc = Steel Armor Recipes
-recipe-armor-sunsilk = Sunsilk Armor Recipes
-    .desc = Sunsilk Armor Recipes
-recipe-armor-woolen = Woolen Armor Recipes
-    .desc = Woolen Armor Recipes
-recipe-equipment-basic = Basic Equipment Recipes
-    .desc = Basic Equipment Recipes
-recipe-equipment-moderate = Moderate Equipment Recipes
-    .desc = Moderate Equipment Recipes
-recipe-equipment-advanced = Advanced Equipment Recipes
-    .desc = Advanced Equipment Recipes
-recipe-unique-abyssal_gorget = Abyssal Gorget Recipe
-    .desc = Abyssal Gorget Recipe
-recipe-unique-abyssal_ring = Abyssal Ring Recipe
-    .desc = Abyssal Ring Recipe
-recipe-unique-mindflayer_spellbag = Mindflayer Spellbag Recipe
-    .desc = Mindflayer Spellbag Recipe
-recipe-unique-polaris = Polaris Recipe
-    .desc = Polaris Recipe
-recipe-unique-seashell_necklace = Seashell Necklace Recipe
-    .desc = Seashell Necklace Recipe
-recipe-unique-troll_hide_pack = Troll Hide Pack Recipe
-    .desc = Troll Hide Pack Recipe
-recipe-unique-winged_coronet = Winged Coronet Recipe
-    .desc = Winged Coronet Recipe
-recipe-unique-delvers_lamp = Delver's Lamp Recipe
-    .desc = Delver's Lamp Recipe
-recipe-charms = Charms Recipes
-    .desc = Charms Recipes
-recipe-explosives = Explosives Recipes
-    .desc = Explosives Recipes
-recipe-food = Food Recipes
-    .desc = Food Recipes
-recipe-gliders = Gliders Recipes
-    .desc = Gliders Recipes
-recipe-instruments = Instruments Recipes
-    .desc = Instruments Recipes
-recipe-potions = Potions Recipes
-    .desc = Potions Recipes
-recipe-utility = Utility Recipes
-    .desc = Utility Recipes
-recipe-weapons-iron = Iron Weapon Recipes
-    .desc = Iron Weapon Recipes
-recipe-weapons-steel = Steel Weapon Recipes
-    .desc = Steel Weapon Recipes
-recipe-weapons-cobalt = Cobalt Weapon Recipes
-    .desc = Cobalt Weapon Recipes
-recipe-weapons-bloodsteel = Bloodsteel Weapon Recipes
-    .desc = Bloodsteel Weapon Recipes
-recipe-weapons-orichalcum = Orichalcum Weapon Recipes
-    .desc = Orichalcum Weapon Recipes
-recipe-weapons-bamboo = Bamboo Weapon Recipes
-    .desc = Bamboo Weapon Recipes
-recipe-weapons-hardwood = Hardwood Weapon Recipes
-    .desc = Hardwood Weapon Recipes
-recipe-weapons-ironwood = Ironwood Weapon Recipes
-    .desc = Ironwood Weapon Recipes
-recipe-weapons-frostwood = Frostwood Weapon Recipes
-    .desc = Frostwood Weapon Recipes
-recipe-weapons-eldwood = Eldwood Weapon Recipes
-    .desc = Eldwood Weapon Recipes
-recipe-default = Default Recipes
-    .desc = Default Recipes
-
-## Pseudo
-
-pseudo-recipe-modular_weapon-modular_weapon = Modular Weapon
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-sword = Sword Blade
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-axe = Axe Head
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-hammer = Hammer Head
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-bow = Bow Limbs
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-staff = Staff Shaft
-    .desc = {""}
-
-pseudo-recipe-modular_weapon-sceptre = Sceptre Shaft
-    .desc = {""}
-
-pseudo-recipe-repair = Repair Equipment
-    .desc = {""}
\ No newline at end of file
diff --git a/assets/voxygen/i18n/en/item/weapon/modular.ftl b/assets/voxygen/i18n/en/item/weapon/modular.ftl
deleted file mode 100644
index b0adf9e..0000000
--- a/assets/voxygen/i18n/en/item/weapon/modular.ftl
+++ /dev/null
@@ -1,989 +0,0 @@
-weapon-sword-greatsword-iron-2h = Iron Greatsword
-    .desc = {""}
-
-weapon-sword-katana-iron-2h = Iron Katana
-    .desc = {""}
-
-weapon-sword-katana-iron-1h = Iron Swiftblade
-    .desc = {""}
-
-weapon-sword-sawblade-iron-2h = Iron Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-iron-1h = Iron Sawback
-    .desc = {""}
-
-weapon-sword-sabre-iron-2h = Iron Sabre
-    .desc = {""}
-
-weapon-sword-sabre-iron-1h = Iron Scimitar
-    .desc = {""}
-
-weapon-sword-ornate-iron-2h = Iron Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-iron-1h = Iron Rapier
-    .desc = {""}
-
-weapon-sword-longsword-iron-2h = Iron Longsword
-    .desc = {""}
-
-weapon-sword-longsword-iron-1h = Iron Shortsword
-    .desc = {""}
-
-weapon-sword-zweihander-iron-2h = Iron Zweihander
-    .desc = {""}
-
-weapon-bow-shortbow-wood = Wooden Shortbow
-    .desc = {""}
-
-weapon-bow-longbow-wood = Wooden Longbow
-    .desc = {""}
-
-weapon-bow-ornate-wood = Wooden Ornate Bow
-    .desc = {""}
-
-weapon-bow-greatbow-wood = Wooden Greatbow
-    .desc = {""}
-
-weapon-bow-composite-wood = Wooden Composite Bow
-    .desc = {""}
-
-weapon-bow-bow-wood = Wooden Bow
-    .desc = {""}
-
-weapon-bow-warbow-wood = Wooden Warbow
-    .desc = {""}
-
-weapon-hammer-maul-bronze-2h = Bronze Maul
-    .desc = {""}
-
-weapon-hammer-hammer-bronze-2h = Bronze Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-bronze-1h = Bronze Club
-    .desc = {""}
-
-weapon-hammer-greatmace-bronze-2h = Bronze Greatmace
-    .desc = {""}
-
-weapon-hammer-spikedmace-bronze-2h = Bronze Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-bronze-1h = Bronze Mace
-    .desc = {""}
-
-weapon-hammer-greathammer-bronze-2h = Bronze Greathammer
-    .desc = {""}
-
-weapon-hammer-warhammer-bronze-2h = Bronze Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-bronze-1h = Bronze Mallet
-    .desc = {""}
-
-weapon-hammer-ornate-bronze-2h = Bronze Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-bronze-1h = Bronze Cudgel
-    .desc = {""}
-
-weapon-hammer-maul-bloodsteel-2h = Bloodsteel Maul
-    .desc = {""}
-
-weapon-hammer-greathammer-bloodsteel-2h = Bloodsteel Greathammer
-    .desc = {""}
-
-weapon-hammer-ornate-bloodsteel-2h = Bloodsteel Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-bloodsteel-1h = Bloodsteel Cudgel
-    .desc = {""}
-
-weapon-hammer-hammer-bloodsteel-2h = Bloodsteel Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-bloodsteel-1h = Bloodsteel Club
-    .desc = {""}
-
-weapon-hammer-spikedmace-bloodsteel-2h = Bloodsteel Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-bloodsteel-1h = Bloodsteel Mace
-    .desc = {""}
-
-weapon-hammer-greatmace-bloodsteel-2h = Bloodsteel Greatmace
-    .desc = {""}
-
-weapon-hammer-warhammer-bloodsteel-2h = Bloodsteel Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-bloodsteel-1h = Bloodsteel Mallet
-    .desc = {""}
-
-weapon-sceptre-ornate-frostwood = Frostwood Ornate Sceptre
-    .desc = {""}
-
-weapon-sceptre-sceptre-frostwood = Frostwood Sceptre
-    .desc = {""}
-
-weapon-sceptre-crook-frostwood = Frostwood Crook
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-frostwood = Frostwood Grandsceptre
-    .desc = {""}
-
-weapon-sceptre-cane-frostwood = Frostwood Cane
-    .desc = {""}
-
-weapon-sceptre-crozier-frostwood = Frostwood Crozier
-    .desc = {""}
-
-weapon-sceptre-arbor-frostwood = Frostwood Arbor
-    .desc = {""}
-
-weapon-bow-bow-eldwood = Eldwood Bow
-    .desc = {""}
-
-weapon-bow-warbow-eldwood = Eldwood Warbow
-    .desc = {""}
-
-weapon-bow-greatbow-eldwood = Eldwood Greatbow
-    .desc = {""}
-
-weapon-bow-ornate-eldwood = Eldwood Ornate Bow
-    .desc = {""}
-
-weapon-bow-longbow-eldwood = Eldwood Longbow
-    .desc = {""}
-
-weapon-bow-composite-eldwood = Eldwood Composite Bow
-    .desc = {""}
-
-weapon-bow-shortbow-eldwood = Eldwood Shortbow
-    .desc = {""}
-
-weapon-axe-axe-bloodsteel-2h = Bloodsteel Axe
-    .desc = {""}
-
-weapon-axe-axe-bloodsteel-1h = Bloodsteel Hatchet
-    .desc = {""}
-
-weapon-axe-ornate-bloodsteel-2h = Bloodsteel Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-bloodsteel-1h = Bloodsteel Kilonda
-    .desc = {""}
-
-weapon-axe-jagged-bloodsteel-2h = Bloodsteel Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-bloodsteel-1h = Bloodsteel Tomahawk
-    .desc = {""}
-
-weapon-axe-battleaxe-bloodsteel-2h = Bloodsteel Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-bloodsteel-1h = Bloodsteel Cleaver
-    .desc = {""}
-
-weapon-axe-greataxe-bloodsteel-2h = Bloodsteel Greataxe
-    .desc = {""}
-
-weapon-axe-labrys-bloodsteel-2h = Bloodsteel Labrys
-    .desc = {""}
-
-weapon-axe-poleaxe-bloodsteel-2h = Bloodsteel Poleaxe
-    .desc = {""}
-
-weapon-axe-poleaxe-cobalt-2h = Cobalt Poleaxe
-    .desc = {""}
-
-weapon-axe-jagged-cobalt-2h = Cobalt Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-cobalt-1h = Cobalt Tomahawk
-    .desc = {""}
-
-weapon-axe-labrys-cobalt-2h = Cobalt Labrys
-    .desc = {""}
-
-weapon-axe-axe-cobalt-2h = Cobalt Axe
-    .desc = {""}
-
-weapon-axe-axe-cobalt-1h = Cobalt Hatchet
-    .desc = {""}
-
-weapon-axe-ornate-cobalt-2h = Cobalt Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-cobalt-1h = Cobalt Kilonda
-    .desc = {""}
-
-weapon-axe-greataxe-cobalt-2h = Cobalt Greataxe
-    .desc = {""}
-
-weapon-axe-battleaxe-cobalt-2h = Cobalt Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-cobalt-1h = Cobalt Cleaver
-    .desc = {""}
-
-weapon-hammer-maul-iron-2h = Iron Maul
-    .desc = {""}
-
-weapon-hammer-ornate-iron-2h = Iron Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-iron-1h = Iron Cudgel
-    .desc = {""}
-
-weapon-hammer-spikedmace-iron-2h = Iron Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-iron-1h = Iron Mace
-    .desc = {""}
-
-weapon-hammer-hammer-iron-2h = Iron Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-iron-1h = Iron Club
-    .desc = {""}
-
-weapon-hammer-warhammer-iron-2h = Iron Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-iron-1h = Iron Mallet
-    .desc = {""}
-
-weapon-hammer-greathammer-iron-2h = Iron Greathammer
-    .desc = {""}
-
-weapon-hammer-greatmace-iron-2h = Iron Greatmace
-    .desc = {""}
-
-weapon-sword-zweihander-steel-2h = Steel Zweihander
-    .desc = {""}
-
-weapon-sword-longsword-steel-2h = Steel Longsword
-    .desc = {""}
-
-weapon-sword-longsword-steel-1h = Steel Shortsword
-    .desc = {""}
-
-weapon-sword-katana-steel-2h = Steel Katana
-    .desc = {""}
-
-weapon-sword-katana-steel-1h = Steel Swiftblade
-    .desc = {""}
-
-weapon-sword-greatsword-steel-2h = Steel Greatsword
-    .desc = {""}
-
-weapon-sword-ornate-steel-2h = Steel Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-steel-1h = Steel Rapier
-    .desc = {""}
-
-weapon-sword-sawblade-steel-2h = Steel Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-steel-1h = Steel Sawback
-    .desc = {""}
-
-weapon-sword-sabre-steel-2h = Steel Sabre
-    .desc = {""}
-
-weapon-sword-sabre-steel-1h = Steel Scimitar
-    .desc = {""}
-
-weapon-staff-grandstaff-hardwood = Hardwood Grandstaff
-    .desc = {""}
-
-weapon-staff-rod-hardwood = Hardwood Rod
-    .desc = {""}
-
-weapon-staff-brand-hardwood = Hardwood Brand
-    .desc = {""}
-
-weapon-staff-longpole-hardwood = Hardwood Longpole
-    .desc = {""}
-
-weapon-staff-staff-hardwood = Hardwood Staff
-    .desc = {""}
-
-weapon-staff-ornate-hardwood = Hardwood Ornate Staff
-    .desc = {""}
-
-weapon-staff-pole-hardwood = Hardwood Pole
-    .desc = {""}
-
-weapon-axe-ornate-orichalcum-2h = Orichalcum Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-orichalcum-1h = Orichalcum Kilonda
-    .desc = {""}
-
-weapon-axe-jagged-orichalcum-2h = Orichalcum Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-orichalcum-1h = Orichalcum Tomahawk
-    .desc = {""}
-
-weapon-axe-axe-orichalcum-2h = Orichalcum Axe
-    .desc = {""}
-
-weapon-axe-axe-orichalcum-1h = Orichalcum Hatchet
-    .desc = {""}
-
-weapon-axe-battleaxe-orichalcum-2h = Orichalcum Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-orichalcum-1h = Orichalcum Cleaver
-    .desc = {""}
-
-weapon-axe-greataxe-orichalcum-2h = Orichalcum Greataxe
-    .desc = {""}
-
-weapon-axe-poleaxe-orichalcum-2h = Orichalcum Poleaxe
-    .desc = {""}
-
-weapon-axe-labrys-orichalcum-2h = Orichalcum Labrys
-    .desc = {""}
-
-weapon-bow-greatbow-bamboo = Bamboo Greatbow
-    .desc = {""}
-
-weapon-bow-longbow-bamboo = Bamboo Longbow
-    .desc = {""}
-
-weapon-bow-composite-bamboo = Bamboo Composite Bow
-    .desc = {""}
-
-weapon-bow-ornate-bamboo = Bamboo Ornate Bow
-    .desc = {""}
-
-weapon-bow-shortbow-bamboo = Bamboo Shortbow
-    .desc = {""}
-
-weapon-bow-bow-bamboo = Bamboo Bow
-    .desc = {""}
-
-weapon-bow-warbow-bamboo = Bamboo Warbow
-    .desc = {""}
-
-weapon-bow-ornate-frostwood = Frostwood Ornate Bow
-    .desc = {""}
-
-weapon-bow-composite-frostwood = Frostwood Composite Bow
-    .desc = {""}
-
-weapon-bow-warbow-frostwood = Frostwood Warbow
-    .desc = {""}
-
-weapon-bow-shortbow-frostwood = Frostwood Shortbow
-    .desc = {""}
-
-weapon-bow-longbow-frostwood = Frostwood Longbow
-    .desc = {""}
-
-weapon-bow-bow-frostwood = Frostwood Bow
-    .desc = {""}
-
-weapon-bow-greatbow-frostwood = Frostwood Greatbow
-    .desc = {""}
-
-weapon-staff-ornate-frostwood = Frostwood Ornate Staff
-    .desc = {""}
-
-weapon-staff-pole-frostwood = Frostwood Pole
-    .desc = {""}
-
-weapon-staff-longpole-frostwood = Frostwood Longpole
-    .desc = {""}
-
-weapon-staff-grandstaff-frostwood = Frostwood Grandstaff
-    .desc = {""}
-
-weapon-staff-rod-frostwood = Frostwood Rod
-    .desc = {""}
-
-weapon-staff-staff-frostwood = Frostwood Staff
-    .desc = {""}
-
-weapon-staff-brand-frostwood = Frostwood Brand
-    .desc = {""}
-
-weapon-bow-greatbow-hardwood = Hardwood Greatbow
-    .desc = {""}
-
-weapon-bow-warbow-hardwood = Hardwood Warbow
-    .desc = {""}
-
-weapon-bow-shortbow-hardwood = Hardwood Shortbow
-    .desc = {""}
-
-weapon-bow-bow-hardwood = Hardwood Bow
-    .desc = {""}
-
-weapon-bow-composite-hardwood = Hardwood Composite Bow
-    .desc = {""}
-
-weapon-bow-ornate-hardwood = Hardwood Ornate Bow
-    .desc = {""}
-
-weapon-bow-longbow-hardwood = Hardwood Longbow
-    .desc = {""}
-
-weapon-sceptre-cane-ironwood = Ironwood Cane
-    .desc = {""}
-
-weapon-sceptre-ornate-ironwood = Ironwood Ornate Sceptre
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-ironwood = Ironwood Grandsceptre
-    .desc = {""}
-
-weapon-sceptre-arbor-ironwood = Ironwood Arbor
-    .desc = {""}
-
-weapon-sceptre-crozier-ironwood = Ironwood Crozier
-    .desc = {""}
-
-weapon-sceptre-crook-ironwood = Ironwood Crook
-    .desc = {""}
-
-weapon-sceptre-sceptre-ironwood = Ironwood Sceptre
-    .desc = {""}
-
-weapon-axe-greataxe-iron-2h = Iron Greataxe
-    .desc = {""}
-
-weapon-axe-jagged-iron-2h = Iron Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-iron-1h = Iron Tomahawk
-    .desc = {""}
-
-weapon-axe-battleaxe-iron-2h = Iron Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-iron-1h = Iron Cleaver
-    .desc = {""}
-
-weapon-axe-labrys-iron-2h = Iron Labrys
-    .desc = {""}
-
-weapon-axe-axe-iron-2h = Iron Axe
-    .desc = {""}
-
-weapon-axe-axe-iron-1h = Iron Hatchet
-    .desc = {""}
-
-weapon-axe-ornate-iron-2h = Iron Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-iron-1h = Iron Kilonda
-    .desc = {""}
-
-weapon-axe-poleaxe-iron-2h = Iron Poleaxe
-    .desc = {""}
-
-weapon-axe-greataxe-steel-2h = Steel Greataxe
-    .desc = {""}
-
-weapon-axe-ornate-steel-2h = Steel Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-steel-1h = Steel Kilonda
-    .desc = {""}
-
-weapon-axe-jagged-steel-2h = Steel Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-steel-1h = Steel Tomahawk
-    .desc = {""}
-
-weapon-axe-battleaxe-steel-2h = Steel Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-steel-1h = Steel Cleaver
-    .desc = {""}
-
-weapon-axe-poleaxe-steel-2h = Steel Poleaxe
-    .desc = {""}
-
-weapon-axe-labrys-steel-2h = Steel Labrys
-    .desc = {""}
-
-weapon-axe-axe-steel-2h = Steel Axe
-    .desc = {""}
-
-weapon-axe-axe-steel-1h = Steel Hatchet
-    .desc = {""}
-
-weapon-sword-longsword-bronze-2h = Bronze Longsword
-    .desc = {""}
-
-weapon-sword-longsword-bronze-1h = Bronze Shortsword
-    .desc = {""}
-
-weapon-sword-zweihander-bronze-2h = Bronze Zweihander
-    .desc = {""}
-
-weapon-sword-greatsword-bronze-2h = Bronze Greatsword
-    .desc = {""}
-
-weapon-sword-katana-bronze-2h = Bronze Katana
-    .desc = {""}
-
-weapon-sword-katana-bronze-1h = Bronze Swiftblade
-    .desc = {""}
-
-weapon-sword-sabre-bronze-2h = Bronze Sabre
-    .desc = {""}
-
-weapon-sword-sabre-bronze-1h = Bronze Scimitar
-    .desc = {""}
-
-weapon-sword-ornate-bronze-2h = Bronze Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-bronze-1h = Bronze Rapier
-    .desc = {""}
-
-weapon-sword-sawblade-bronze-2h = Bronze Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-bronze-1h = Bronze Sawback
-    .desc = {""}
-
-weapon-sceptre-crozier-wood = Wooden Crozier
-    .desc = {""}
-
-weapon-sceptre-sceptre-wood = Wooden Sceptre
-    .desc = {""}
-
-weapon-sceptre-cane-wood = Wooden Cane
-    .desc = {""}
-
-weapon-sceptre-ornate-wood = Wooden Ornate Sceptre
-    .desc = {""}
-
-weapon-sceptre-arbor-wood = Wooden Arbor
-    .desc = {""}
-
-weapon-sceptre-crook-wood = Wooden Crook
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-wood = Wooden Grandsceptre
-    .desc = {""}
-
-weapon-staff-brand-bamboo = Bamboo Brand
-    .desc = {""}
-
-weapon-staff-grandstaff-bamboo = Bamboo Grandstaff
-    .desc = {""}
-
-weapon-staff-pole-bamboo = Bamboo Pole
-    .desc = {""}
-
-weapon-staff-staff-bamboo = Bamboo Staff
-    .desc = {""}
-
-weapon-staff-rod-bamboo = Bamboo Rod
-    .desc = {""}
-
-weapon-staff-longpole-bamboo = Bamboo Longpole
-    .desc = {""}
-
-weapon-staff-ornate-bamboo = Bamboo Ornate Staff
-    .desc = {""}
-
-weapon-hammer-warhammer-orichalcum-2h = Orichalcum Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-orichalcum-1h = Orichalcum Mallet
-    .desc = {""}
-
-weapon-hammer-greathammer-orichalcum-2h = Orichalcum Greathammer
-    .desc = {""}
-
-weapon-hammer-greatmace-orichalcum-2h = Orichalcum Greatmace
-    .desc = {""}
-
-weapon-hammer-hammer-orichalcum-2h = Orichalcum Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-orichalcum-1h = Orichalcum Club
-    .desc = {""}
-
-weapon-hammer-spikedmace-orichalcum-2h = Orichalcum Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-orichalcum-1h = Orichalcum Mace
-    .desc = {""}
-
-weapon-hammer-ornate-orichalcum-2h = Orichalcum Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-orichalcum-1h = Orichalcum Cudgel
-    .desc = {""}
-
-weapon-hammer-maul-orichalcum-2h = Orichalcum Maul
-    .desc = {""}
-
-weapon-bow-shortbow-ironwood = Ironwood Shortbow
-    .desc = {""}
-
-weapon-bow-greatbow-ironwood = Ironwood Greatbow
-    .desc = {""}
-
-weapon-bow-ornate-ironwood = Ironwood Ornate Bow
-    .desc = {""}
-
-weapon-bow-longbow-ironwood = Ironwood Longbow
-    .desc = {""}
-
-weapon-bow-warbow-ironwood = Ironwood Warbow
-    .desc = {""}
-
-weapon-bow-composite-ironwood = Ironwood Composite Bow
-    .desc = {""}
-
-weapon-bow-bow-ironwood = Ironwood Bow
-    .desc = {""}
-
-weapon-hammer-ornate-cobalt-2h = Cobalt Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-cobalt-1h = Cobalt Cudgel
-    .desc = {""}
-
-weapon-hammer-hammer-cobalt-2h = Cobalt Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-cobalt-1h = Cobalt Club
-    .desc = {""}
-
-weapon-hammer-greatmace-cobalt-2h = Cobalt Greatmace
-    .desc = {""}
-
-weapon-hammer-spikedmace-cobalt-2h = Cobalt Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-cobalt-1h = Cobalt Mace
-    .desc = {""}
-
-weapon-hammer-greathammer-cobalt-2h = Cobalt Greathammer
-    .desc = {""}
-
-weapon-hammer-maul-cobalt-2h = Cobalt Maul
-    .desc = {""}
-
-weapon-hammer-warhammer-cobalt-2h = Cobalt Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-cobalt-1h = Cobalt Mallet
-    .desc = {""}
-
-weapon-staff-ornate-wood = Wooden Ornate Staff
-    .desc = {""}
-
-weapon-staff-pole-wood = Wooden Pole
-    .desc = {""}
-
-weapon-staff-rod-wood = Wooden Rod
-    .desc = {""}
-
-weapon-staff-brand-wood = Wooden Brand
-    .desc = {""}
-
-weapon-staff-grandstaff-wood = Wooden Grandstaff
-    .desc = {""}
-
-weapon-staff-staff-wood = Wooden Staff
-    .desc = {""}
-
-weapon-staff-longpole-wood = Wooden Longpole
-    .desc = {""}
-
-weapon-hammer-ornate-steel-2h = Steel Ornate Hammer
-    .desc = {""}
-
-weapon-hammer-ornate-steel-1h = Steel Cudgel
-    .desc = {""}
-
-weapon-hammer-hammer-steel-2h = Steel Hammer
-    .desc = {""}
-
-weapon-hammer-hammer-steel-1h = Steel Club
-    .desc = {""}
-
-weapon-hammer-greathammer-steel-2h = Steel Greathammer
-    .desc = {""}
-
-weapon-hammer-spikedmace-steel-2h = Steel Spiked Mace
-    .desc = {""}
-
-weapon-hammer-spikedmace-steel-1h = Steel Mace
-    .desc = {""}
-
-weapon-hammer-greatmace-steel-2h = Steel Greatmace
-    .desc = {""}
-
-weapon-hammer-maul-steel-2h = Steel Maul
-    .desc = {""}
-
-weapon-hammer-warhammer-steel-2h = Steel Warhammer
-    .desc = {""}
-
-weapon-hammer-warhammer-steel-1h = Steel Mallet
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-bamboo = Bamboo Grandsceptre
-    .desc = {""}
-
-weapon-sceptre-cane-bamboo = Bamboo Cane
-    .desc = {""}
-
-weapon-sceptre-crozier-bamboo = Bamboo Crozier
-    .desc = {""}
-
-weapon-sceptre-crook-bamboo = Bamboo Crook
-    .desc = {""}
-
-weapon-sceptre-sceptre-bamboo = Bamboo Sceptre
-    .desc = {""}
-
-weapon-sceptre-arbor-bamboo = Bamboo Arbor
-    .desc = {""}
-
-weapon-sceptre-ornate-bamboo = Bamboo Ornate Sceptre
-    .desc = {""}
-
-weapon-staff-grandstaff-ironwood = Ironwood Grandstaff
-    .desc = {""}
-
-weapon-staff-rod-ironwood = Ironwood Rod
-    .desc = {""}
-
-weapon-staff-brand-ironwood = Ironwood Brand
-    .desc = {""}
-
-weapon-staff-longpole-ironwood = Ironwood Longpole
-    .desc = {""}
-
-weapon-staff-staff-ironwood = Ironwood Staff
-    .desc = {""}
-
-weapon-staff-pole-ironwood = Ironwood Pole
-    .desc = {""}
-
-weapon-staff-ornate-ironwood = Ironwood Ornate Staff
-    .desc = {""}
-
-weapon-staff-ornate-eldwood = Eldwood Ornate Staff
-    .desc = {""}
-
-weapon-staff-longpole-eldwood = Eldwood Longpole
-    .desc = {""}
-
-weapon-staff-rod-eldwood = Eldwood Rod
-    .desc = {""}
-
-weapon-staff-pole-eldwood = Eldwood Pole
-    .desc = {""}
-
-weapon-staff-staff-eldwood = Eldwood Staff
-    .desc = {""}
-
-weapon-staff-brand-eldwood = Eldwood Brand
-    .desc = {""}
-
-weapon-staff-grandstaff-eldwood = Eldwood Grandstaff
-    .desc = {""}
-
-weapon-sceptre-arbor-eldwood = Eldwood Arbor
-    .desc = {""}
-
-weapon-sceptre-crook-eldwood = Eldwood Crook
-    .desc = {""}
-
-weapon-sceptre-crozier-eldwood = Eldwood Crozier
-    .desc = {""}
-
-weapon-sceptre-cane-eldwood = Eldwood Cane
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-eldwood = Eldwood Grandsceptre
-    .desc = {""}
-
-weapon-sceptre-ornate-eldwood = Eldwood Ornate Sceptre
-    .desc = {""}
-
-weapon-sceptre-sceptre-eldwood = Eldwood Sceptre
-    .desc = {""}
-
-weapon-sword-sabre-bloodsteel-2h = Bloodsteel Sabre
-    .desc = {""}
-
-weapon-sword-sabre-bloodsteel-1h = Bloodsteel Scimitar
-    .desc = {""}
-
-weapon-sword-zweihander-bloodsteel-2h = Bloodsteel Zweihander
-    .desc = {""}
-
-weapon-sword-greatsword-bloodsteel-2h = Bloodsteel Greatsword
-    .desc = {""}
-
-weapon-sword-katana-bloodsteel-2h = Bloodsteel Katana
-    .desc = {""}
-
-weapon-sword-katana-bloodsteel-1h = Bloodsteel Swiftblade
-    .desc = {""}
-
-weapon-sword-longsword-bloodsteel-2h = Bloodsteel Longsword
-    .desc = {""}
-
-weapon-sword-longsword-bloodsteel-1h = Bloodsteel Shortsword
-    .desc = {""}
-
-weapon-sword-ornate-bloodsteel-2h = Bloodsteel Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-bloodsteel-1h = Bloodsteel Rapier
-    .desc = {""}
-
-weapon-sword-sawblade-bloodsteel-2h = Bloodsteel Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-bloodsteel-1h = Bloodsteel Sawback
-    .desc = {""}
-
-weapon-sword-sabre-orichalcum-2h = Orichalcum Sabre
-    .desc = {""}
-
-weapon-sword-sabre-orichalcum-1h = Orichalcum Scimitar
-    .desc = {""}
-
-weapon-sword-greatsword-orichalcum-2h = Orichalcum Greatsword
-    .desc = {""}
-
-weapon-sword-sawblade-orichalcum-2h = Orichalcum Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-orichalcum-1h = Orichalcum Sawback
-    .desc = {""}
-
-weapon-sword-longsword-orichalcum-2h = Orichalcum Longsword
-    .desc = {""}
-
-weapon-sword-longsword-orichalcum-1h = Orichalcum Shortsword
-    .desc = {""}
-
-weapon-sword-katana-orichalcum-2h = Orichalcum Katana
-    .desc = {""}
-
-weapon-sword-katana-orichalcum-1h = Orichalcum Swiftblade
-    .desc = {""}
-
-weapon-sword-zweihander-orichalcum-2h = Orichalcum Zweihander
-    .desc = {""}
-
-weapon-sword-ornate-orichalcum-2h = Orichalcum Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-orichalcum-1h = Orichalcum Rapier
-    .desc = {""}
-
-weapon-axe-poleaxe-bronze-2h = Bronze Poleaxe
-    .desc = {""}
-
-weapon-axe-ornate-bronze-2h = Bronze Ornate Axe
-    .desc = {""}
-
-weapon-axe-ornate-bronze-1h = Bronze Kilonda
-    .desc = {""}
-
-weapon-axe-labrys-bronze-2h = Bronze Labrys
-    .desc = {""}
-
-weapon-axe-battleaxe-bronze-2h = Bronze Battleaxe
-    .desc = {""}
-
-weapon-axe-battleaxe-bronze-1h = Bronze Cleaver
-    .desc = {""}
-
-weapon-axe-axe-bronze-2h = Bronze Axe
-    .desc = {""}
-
-weapon-axe-axe-bronze-1h = Bronze Hatchet
-    .desc = {""}
-
-weapon-axe-jagged-bronze-2h = Bronze Jagged Axe
-    .desc = {""}
-
-weapon-axe-jagged-bronze-1h = Bronze Tomahawk
-    .desc = {""}
-
-weapon-axe-greataxe-bronze-2h = Bronze Greataxe
-    .desc = {""}
-
-weapon-sceptre-sceptre-hardwood = Hardwood Sceptre
-    .desc = {""}
-
-weapon-sceptre-cane-hardwood = Hardwood Cane
-    .desc = {""}
-
-weapon-sceptre-arbor-hardwood = Hardwood Arbor
-    .desc = {""}
-
-weapon-sceptre-crozier-hardwood = Hardwood Crozier
-    .desc = {""}
-
-weapon-sceptre-ornate-hardwood = Hardwood Ornate Sceptre
-    .desc = {""}
-
-weapon-sceptre-crook-hardwood = Hardwood Crook
-    .desc = {""}
-
-weapon-sceptre-grandsceptre-hardwood = Hardwood Grandsceptre
-    .desc = {""}
-
-weapon-sword-longsword-cobalt-2h = Cobalt Longsword
-    .desc = {""}
-
-weapon-sword-longsword-cobalt-1h = Cobalt Shortsword
-    .desc = {""}
-
-weapon-sword-sawblade-cobalt-2h = Cobalt Sawblade
-    .desc = {""}
-
-weapon-sword-sawblade-cobalt-1h = Cobalt Sawback
-    .desc = {""}
-
-weapon-sword-greatsword-cobalt-2h = Cobalt Greatsword
-    .desc = {""}
-
-weapon-sword-katana-cobalt-2h = Cobalt Katana
-    .desc = {""}
-
-weapon-sword-katana-cobalt-1h = Cobalt Swiftblade
-    .desc = {""}
-
-weapon-sword-zweihander-cobalt-2h = Cobalt Zweihander
-    .desc = {""}
-
-weapon-sword-ornate-cobalt-2h = Cobalt Ornate Sword
-    .desc = {""}
-
-weapon-sword-ornate-cobalt-1h = Cobalt Rapier
-    .desc = {""}
-
-weapon-sword-sabre-cobalt-2h = Cobalt Sabre
-    .desc = {""}
-
-weapon-sword-sabre-cobalt-1h = Cobalt Scimitar
-    .desc = {""}
diff --git a/assets/voxygen/i18n/en/item/weapon/musical_instrument.ftl b/assets/voxygen/i18n/en/item/weapon/musical_instrument.ftl
deleted file mode 100644
index dc2decc..0000000
--- a/assets/voxygen/i18n/en/item/weapon/musical_instrument.ftl
+++ /dev/null
@@ -1,44 +0,0 @@
-weapon-tool-wooden_bass = Double Bass
-    .desc = Wooden Bass.
-
-weapon-tool-wooden_flute = Flute
-    .desc = Wooden Flute.
-
-weapon-tool-glass_flute = Glass Flute
-    .desc = What's the Cardinal doing with it?
-
-weapon-tool-wooden_guitar = Guitar
-    .desc = Wooden Guitar.
-
-weapon-tool-black_velvet_guitar = Dark Guitar
-    .desc = Sounds edgy.
-
-weapon-tool-icy_talharpa = Icy Talharpa
-    .desc = Icy Talharpa.
-
-weapon-tool-wooden_kalimba = Kalimba
-    .desc = Wooden Kalimba.
-
-weapon-tool-wooden_lute = Lute
-    .desc = Wooden Lute.
-
-weapon-tool-wooden_lyre = Lyre
-    .desc = Wooden Lyre.
-
-weapon-tool-melodica = Melodica
-    .desc = Wooden Melodica.
-
-weapon-tool-wooden_sitar = Sitar
-    .desc = Wooden Sitar.
-
-weapon-tool-washboard = Washboard
-    .desc = Washboard.
-
-weapon-tool-wildskin_drum = Wildskin Drum
-    .desc = one, two, you know what to do!
-
-weapon-tool-steeltonguedrum = Steeltongue Drum
-    .desc = Steeltongue Drum.
-
-weapon-tool-shamisen = Shamisen
-    .desc = Shamisen.
diff --git a/assets/voxygen/i18n/en/item/weapon/npc.ftl b/assets/voxygen/i18n/en/item/weapon/npc.ftl
deleted file mode 100644
index 047a1c1..0000000
--- a/assets/voxygen/i18n/en/item/weapon/npc.ftl
+++ /dev/null
@@ -1,461 +0,0 @@
-### This file contains non-player-facing items.
-### Feel free to ignore them.
-
-common-items-npc_weapons-biped_small-mandragora = Mandragora
-    .desc = Testing
-
-common-items-npc_weapons-biped_small-myrmidon-hoplite = Hoplite Spear
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-myrmidon-marksman = Marksman Bow
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-myrmidon-strategian = Strategian Axe
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-sahagin-sniper = Sniper Bow
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-sahagin-sorcerer = Sorcerer Staff
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-sahagin-spearman = Spearman Spear
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-adlet-hunter = Hunter Spear
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-adlet-icepicker = Icepicker Pick
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-adlet-tracker = Tracker Bow
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-gnarling-chieftain = Chieftain Staff
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-gnarling-greentotem = Gnarling Green Totem
-    .desc = Yeet
-
-common-items-npc_weapons-biped_small-gnarling-logger = Logger Axe
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-gnarling-mugger = Mugger Dagger
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-gnarling-redtotem = Gnarling Red Totem
-    .desc = Yeet
-
-common-items-npc_weapons-biped_small-gnarling-stalker = Stalker Blowgun
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-gnarling-whitetotem = Gnarling White Totem
-    .desc = Yeet
-
-common-items-npc_weapons-biped_small-boreal-bow = Boreal Bow
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-boreal-hammer = Boreal Hammer
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-haniwa-archer = Archer Bow
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-haniwa-guard = Guard Spear
-    .desc = {""}
-
-common-items-npc_weapons-biped_small-haniwa-soldier = Soldier Sword
-    .desc = {""}
-
-common-items-npc_weapons-bow-bipedlarge-velorite = Giant Velorite Bow
-    .desc = Infused with Velorite power.
-
-common-items-npc_weapons-bow-saurok_bow = Saurok bow
-    .desc = Placeholder
-
-common-items-npc_weapons-bow-terracotta_besieger_bow = Terracotta Besieger Bow
-    .desc = Placeholder
-
-common-items-npc_weapons-axe-gigas_frost_axe = Frost Gigas Axe
-    .desc = Placeholder
-
-common-items-npc_weapons-axe-minotaur_axe = Minotaur Axe
-    .desc = Placeholder
-
-common-items-npc_weapons-axe-oni_blue_axe = Blue Oni Axe
-    .desc = Placeholder
-
-common-items-npc_weapons-staff-bipedlarge-cultist = Giant Cultist Staff
-    .desc = The fire gives off no heat.
-
-common-items-npc_weapons-staff-mindflayer_staff = Mindflayer Staff
-    .desc = Placeholder
-
-common-items-npc_weapons-staff-ogre_staff = Ogre Staff
-    .desc = Placeholder
-
-common-items-npc_weapons-staff-saurok_staff = Saurok Staff
-    .desc = Placeholder
-
-common-items-npc_weapons-sword-adlet_elder_sword = Adlet Elder Sword
-    .desc = Placeholder
-
-common-items-npc_weapons-sword-bipedlarge-cultist = Giant Cultist Greatsword
-    .desc = This belonged to an evil Cult Leader.
-
-common-items-npc_weapons-sword-dullahan_sword = Dullahan Sword
-    .desc = Placeholder
-
-common-items-npc_weapons-sword-pickaxe_velorite_sword = Velorite Pickaxe
-    .desc = {""}
-
-common-items-npc_weapons-sword-saurok_sword = Saurok Sword
-    .desc = Placeholder
-
-common-items-npc_weapons-sword-haniwa_general_sword = Haniwa General Sword
-    .desc = Placeholder
-
-common-items-npc_weapons-sword-terracotta_pursuer_sword = Terracotta Pursuer Sword
-    .desc = Placeholder
-
-common-items-npc_weapons-unique-akhlut = Quad Med Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-beast_claws = Beast Claws
-    .desc = Was attached to a beast.
-
-common-items-npc_weapons-unique-birdlargebasic = Bird Large Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-birdlargebreathe = Bird Large Breathe
-    .desc = testing123
-
-common-items-npc_weapons-unique-birdlargefire = Bird Large Fire
-    .desc = Fiery touch of a mighty aerial beast
-
-common-items-npc_weapons-unique-birdmediumbasic = Bird Medium Basic
-    .desc = BiteBiteBite!!! FightFightFight!!!
-
-common-items-npc_weapons-unique-bushly = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-cardinal = Caduceus
-    .desc = The snakes seem to be alive
-
-common-items-npc_weapons-unique-clay_golem_fist = Clay Golem Fists
-    .desc = Yeet.
-
-common-items-npc_weapons-unique-iron_dwarf = IronDwarf
-    .desc = testing123
-
-common-items-npc_weapons-unique-cloudwyvern = Cloud Wyvern
-    .desc = testing123
-
-common-items-npc_weapons-unique-coral_golem_fist = Coral Golem Fists
-    .desc = Yeet
-
-common-items-npc_weapons-unique-crab_pincer = Crab Pincer
-    .desc = testing123
-
-common-items-npc_weapons-unique-dagon = Dagon Kit
-    .desc = Ocean Power!
-
-common-items-npc_weapons-unique-driggle = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-emberfly = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-fiery_tornado = FieryTornado
-    .desc = Fiery Tornado weapon
-
-common-items-npc_weapons-unique-flamekeeper_staff = Flamekeeper Staff
-    .desc = Flamekeeper Staff
-
-common-items-npc_weapons-unique-cursekeeper_sceptre = Cursekeeper Sceptre
-    .desc = Cursekeeper Sceptre
-
-common-items-npc_weapons-unique-cursekeeper_sceptre_fake = Cursekeeper Sceptre
-    .desc = Cursekeeper Sceptre
-
-common-items-npc_weapons-unique-jiangshi = Jiangshi Magic
-    .desc = Jiangshi Magic
-
-common-items-npc_weapons-unique-mogwai = Mogwai Magic
-    .desc = Mogwai Magic
-
-common-items-npc_weapons-unique-shamanic_spirit = Shamanic Spirit
-    .desc = Shamanic Spirit
-
-common-items-npc_weapons-unique-terracotta_demolisher_fist = Terracotta Demolisher Fist
-    .desc = Terracotta Demolisher Fist
-
-common-items-npc_weapons-unique-terracotta_statue = Terracotta Statue
-    .desc = Terracotta Statue
-
-common-items-npc_weapons-unique-iron_golem_fist = Iron Golem Fists
-    .desc = Yeet
-
-common-items-npc_weapons-hammer-forgemaster_hammer = Forgemaster Hammer
-    .desc = Yeet
-
-common-items-npc_weapons-unique-snaretongue = Snaretongue
-    .desc = Yeet
-
-common-items-npc_weapons-unique-flamethrower = Flamethrower
-    .desc = Throwing Flames
-
-common-items-npc_weapons-unique-flamewyvern = Flame Wyvern
-    .desc = testing123
-
-common-items-npc_weapons-unique-frostfang = Frostfang
-    .desc = testing123
-
-common-items-npc_weapons-unique-frostwyvern = Frost Wyvern
-    .desc = testing123
-
-common-items-npc_weapons-unique-haniwa_sentry = Haniwa Sentry
-    .desc = Rotating turret weapon
-
-common-items-npc_weapons-unique-hermit_alligator = Hermit Alligator Teeth
-    .desc = Grrr!
-
-common-items-npc_weapons-unique-husk = Husk
-    .desc = testing123
-
-common-items-npc_weapons-unique-husk_brute = Husk Brute
-    .desc = testing123
-
-common-items-npc_weapons-unique-irrwurz = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-mossysnail = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-organ = Organ Aura
-    .desc = Motivational Tune
-
-common-items-npc_weapons-unique-quadlowbasic = Quad Low Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadlowbeam = Quad Small Beam
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadlowbreathe = Quad Low Breathe
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadlowquick = Quad Low Quick
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadlowtail = Quad Low Tail
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedbasic = Quad Med Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedbasicgentle = Quad Med Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedcharge = Quad Med Charge
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedhoof = Quad Med Hoof
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedjump = Quad Med Jump
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadmedquick = Quad Med Quick
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadsmallbasic = Quad Small Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-darkhound = Darkhound
-    .desc = testing123
-
-common-items-npc_weapons-unique-rocksnapper = Rocksnapper
-    .desc = testing123
-
-common-items-npc_weapons-unique-roshwalr = Roshwalr
-    .desc = testing123
-
-common-items-npc_weapons-unique-sea_bishop_sceptre = Sea Bishop Sceptre
-    .desc = Hits like a wave.
-
-common-items-npc_weapons-unique-seawyvern = Sea Wyvern
-    .desc = testing123
-
-common-items-npc_weapons-unique-simpleflyingbasic = Simple Flying Melee
-    .desc = I believe I can fly!!!!!
-
-common-items-npc_weapons-unique-stone_golems_fist = Stone Golem's Fist
-    .desc = Was attached to a mighty stone golem.
-
-common-items-npc_weapons-unique-theropodbasic = Theropod Basic
-    .desc = testing123
-
-common-items-npc_weapons-unique-theropodbird = Theropod Bird
-    .desc = testing123
-
-common-items-npc_weapons-unique-theropodcharge = Theropod Charge
-    .desc = testing123
-
-common-items-npc_weapons-unique-theropodsmall = Theropod Small
-    .desc = testing123
-
-common-items-npc_weapons-unique-tidal_claws = Tidal Claws
-    .desc = Snip snap
-
-common-items-npc_weapons-unique-tidal_totem = Tidal Totem
-    .desc = Yeet
-
-common-items-npc_weapons-unique-tornado = Tornado
-    .desc = Tornado weapon
-
-common-items-npc_weapons-unique-treantsapling = Starter Grace
-    .desc = Fret not, newbies shant cry.
-
-common-items-npc_weapons-unique-turret = Turret
-    .desc = Turret weapon
-
-common-items-npc_weapons-unique-tursus_claws = Tursus Claws
-    .desc = Was attached to a beast.
-
-common-items-npc_weapons-unique-wealdwyvern = Weald Wyvern
-    .desc = testing123
-
-common-items-npc_weapons-unique-wendigo_magic = Wendigo Magic
-    .desc = spook.
-
-common-items-npc_weapons-unique-wood_golem_fist = Wood Golem Fists
-    .desc = Yeet
-
-common-items-npc_weapons-unique-ancient_effigy_eyes = Ancient Effigy Eyes
-    .desc = testing123
-
-common-items-npc_weapons-unique-claysteed = Claysteed Hoof
-    .desc = testing123
-
-common-items-npc_weapons-unique-gravewarden_fist = Gravewarden Fist
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-antlion = Antlion
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-blackwidow = Black Widow
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-cavespider = Cave Spider
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-dagonite = Dagonite
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-hornbeetle = Horn Beetle
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-leafbeetle = Leaf Beetle
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-moltencrawler = Molten Crawler
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-mosscrawler = Moss Crawler
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-tarantula = Tarantula
-    .desc = testing123
-
-common-items-npc_weapons-unique-arthropods-weevil = Weevil
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-asp = Asp
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-basilisk = Basilisk
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-deadwood = Deadwood
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-hakulaq = Hakulaq
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-icedrake = Ice Drake
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-lavadrake = Lava Drake
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-maneater = Maneater
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_low-tortoise = Tortoise
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-alpaca = Alpaca
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-antelope = Antelope
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-donkey = Donkey
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-grolgar = Grolgar
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-highland = Highland
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-horse = Horse
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-moose = Moose
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-mouflon = Mouflon
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_medium-wolf = Wolf
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_small-boar = Boar
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_small-hyena = Hyena
-    .desc = testing123
-
-common-items-npc_weapons-unique-quadruped_small-rodent = Rodent
-    .desc = testing123
-
-common-items-npc_weapons-unique-theropod-yale = Yale
-    .desc = testing123
-
-common-items-npc_weapons-hammer-bipedlarge-cultist = Giant Cultist Warhammer
-    .desc = This belonged to an evil Cult Leader.
-
-common-items-npc_weapons-hammer-cyclops_hammer = Cyclops Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-harvester_scythe = Harvester Sythe
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-ogre_hammer = Ogre Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-oni_red_hammer = Red Oni Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-troll_hammer = Troll Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-wendigo_hammer = Wendigo Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-yeti_hammer = Yeti Hammer
-    .desc = Placeholder
-
-common-items-npc_weapons-hammer-terracotta_punisher_club = Terracotta Punisher Club
-    .desc = Placeholder
diff --git a/assets/voxygen/i18n/en/item/weapon/primary_component.ftl b/assets/voxygen/i18n/en/item/weapon/primary_component.ftl
deleted file mode 100644
index c4e8d27..0000000
--- a/assets/voxygen/i18n/en/item/weapon/primary_component.ftl
+++ /dev/null
@@ -1,755 +0,0 @@
-weapon-component-sword-greatsword-iron = Iron Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-iron = Iron Katana Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-iron = Iron Sawblade
-    .desc = {""}
-
-weapon-component-sword-sabre-iron = Iron Sabre Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-iron = Iron Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-sword-longsword-iron = Iron Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-zweihander-iron = Iron Zweihander Blade
-    .desc = {""}
-
-weapon-component-bow-shortbow-wood = Wooden Shortbow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-wood = Wooden Longbow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-wood = Wooden Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-greatbow-wood = Wooden Greatbow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-wood = Wooden Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-bow-wood = Wooden Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-wood = Wooden Warbow Limbs
-    .desc = {""}
-
-weapon-component-hammer-maul-bronze = Bronze Maul Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-bronze = Bronze Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-bronze = Bronze Greatmace Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-bronze = Bronze Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-bronze = Bronze Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-warhammer-bronze = Bronze Warhammer Head
-    .desc = {""}
-
-weapon-component-hammer-ornate-bronze = Bronze Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-maul-bloodsteel = Bloodsteel Maul Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-bloodsteel = Bloodsteel Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-ornate-bloodsteel = Bloodsteel Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-bloodsteel = Bloodsteel Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-bloodsteel = Bloodsteel Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-bloodsteel = Bloodsteel Greatmace Head
-    .desc = {""}
-
-weapon-component-hammer-warhammer-bloodsteel = Bloodsteel Warhammer Head
-    .desc = {""}
-
-weapon-component-sceptre-ornate-frostwood = Frostwood Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-frostwood = Frostwood Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-frostwood = Frostwood Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-frostwood = Frostwood Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-cane-frostwood = Frostwood Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crozier-frostwood = Frostwood Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-frostwood = Frostwood Arbor Shaft
-    .desc = {""}
-
-weapon-component-bow-bow-eldwood = Eldwood Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-eldwood = Eldwood Warbow Limbs
-    .desc = {""}
-
-weapon-component-bow-greatbow-eldwood = Eldwood Greatbow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-eldwood = Eldwood Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-eldwood = Eldwood Longbow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-eldwood = Eldwood Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-shortbow-eldwood = Eldwood Shortbow Limbs
-    .desc = {""}
-
-weapon-component-axe-axe-bloodsteel = Bloodsteel Axe Head
-    .desc = {""}
-
-weapon-component-axe-ornate-bloodsteel = Bloodsteel Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-bloodsteel = Bloodsteel Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-bloodsteel = Bloodsteel Battleaxe Head
-    .desc = {""}
-
-weapon-component-axe-greataxe-bloodsteel = Bloodsteel Greataxe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-bloodsteel = Bloodsteel Labrys Head
-    .desc = {""}
-
-weapon-component-axe-poleaxe-bloodsteel = Bloodsteel Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-poleaxe-cobalt = Cobalt Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-cobalt = Cobalt Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-cobalt = Cobalt Labrys Head
-    .desc = {""}
-
-weapon-component-axe-axe-cobalt = Cobalt Axe Head
-    .desc = {""}
-
-weapon-component-axe-ornate-cobalt = Cobalt Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-greataxe-cobalt = Cobalt Greataxe Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-cobalt = Cobalt Battleaxe Head
-    .desc = {""}
-
-weapon-component-hammer-maul-iron = Iron Maul Head
-    .desc = {""}
-
-weapon-component-hammer-ornate-iron = Iron Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-iron = Iron Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-iron = Iron Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-warhammer-iron = Iron Warhammer Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-iron = Iron Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-iron = Iron Greatmace Head
-    .desc = {""}
-
-weapon-component-sword-zweihander-steel = Steel Zweihander Blade
-    .desc = {""}
-
-weapon-component-sword-longsword-steel = Steel Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-steel = Steel Katana Blade
-    .desc = {""}
-
-weapon-component-sword-greatsword-steel = Steel Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-steel = Steel Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-steel = Steel Sawblade
-    .desc = {""}
-
-weapon-component-sword-sabre-steel = Steel Sabre Blade
-    .desc = {""}
-
-weapon-component-staff-grandstaff-hardwood = Hardwood Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-hardwood = Hardwood Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-hardwood = Hardwood Brand Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-hardwood = Hardwood Long Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-hardwood = Hardwood Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-ornate-hardwood = Hardwood Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-hardwood = Hardwood Pole Shaft
-    .desc = {""}
-
-weapon-component-axe-ornate-orichalcum = Orichalcum Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-orichalcum = Orichalcum Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-axe-orichalcum = Orichalcum Axe Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-orichalcum = Orichalcum Battleaxe Head
-    .desc = {""}
-
-weapon-component-axe-greataxe-orichalcum = Orichalcum Greataxe Head
-    .desc = {""}
-
-weapon-component-axe-poleaxe-orichalcum = Orichalcum Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-orichalcum = Orichalcum Labrys Head
-    .desc = {""}
-
-weapon-component-bow-greatbow-bamboo = Bamboo Greatbow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-bamboo = Bamboo Longbow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-bamboo = Bamboo Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-bamboo = Bamboo Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-shortbow-bamboo = Bamboo Shortbow Limbs
-    .desc = {""}
-
-weapon-component-bow-bow-bamboo = Bamboo Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-bamboo = Bamboo Warbow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-frostwood = Frostwood Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-frostwood = Frostwood Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-frostwood = Frostwood Warbow Limbs
-    .desc = {""}
-
-weapon-component-bow-shortbow-frostwood = Frostwood Shortbow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-frostwood = Frostwood Longbow Limbs
-    .desc = {""}
-
-weapon-component-bow-bow-frostwood = Frostwood Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-greatbow-frostwood = Frostwood Greatbow Limbs
-    .desc = {""}
-
-weapon-component-staff-ornate-frostwood = Frostwood Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-frostwood = Frostwood Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-frostwood = Frostwood Long Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-grandstaff-frostwood = Frostwood Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-frostwood = Frostwood Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-frostwood = Frostwood Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-frostwood = Frostwood Brand Shaft
-    .desc = {""}
-
-weapon-component-bow-greatbow-hardwood = Hardwood Greatbow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-hardwood = Hardwood Warbow Limbs
-    .desc = {""}
-
-weapon-component-bow-shortbow-hardwood = Hardwood Shortbow Limbs
-    .desc = {""}
-
-weapon-component-bow-bow-hardwood = Hardwood Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-hardwood = Hardwood Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-hardwood = Hardwood Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-hardwood = Hardwood Longbow Limbs
-    .desc = {""}
-
-weapon-component-sceptre-cane-ironwood = Ironwood Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-ornate-ironwood = Ironwood Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-ironwood = Ironwood Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-ironwood = Ironwood Arbor Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crozier-ironwood = Ironwood Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-ironwood = Ironwood Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-ironwood = Ironwood Sceptre Shaft
-    .desc = {""}
-
-weapon-component-axe-greataxe-iron = Iron Greataxe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-iron = Iron Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-iron = Iron Battleaxe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-iron = Iron Labrys Head
-    .desc = {""}
-
-weapon-component-axe-axe-iron = Iron Axe Head
-    .desc = {""}
-
-weapon-component-axe-ornate-iron = Iron Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-poleaxe-iron = Iron Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-greataxe-steel = Steel Greataxe Head
-    .desc = {""}
-
-weapon-component-axe-ornate-steel = Steel Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-steel = Steel Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-steel = Steel Battleaxe Head
-    .desc = {""}
-
-weapon-component-axe-poleaxe-steel = Steel Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-steel = Steel Labrys Head
-    .desc = {""}
-
-weapon-component-axe-axe-steel = Steel Axe Head
-    .desc = {""}
-
-weapon-component-sword-longsword-bronze = Bronze Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-zweihander-bronze = Bronze Zweihander Blade
-    .desc = {""}
-
-weapon-component-sword-greatsword-bronze = Bronze Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-bronze = Bronze Katana Blade
-    .desc = {""}
-
-weapon-component-sword-sabre-bronze = Bronze Sabre Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-bronze = Bronze Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-bronze = Bronze Sawblade
-    .desc = {""}
-
-weapon-component-sceptre-crozier-wood = Wooden Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-wood = Wooden Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-cane-wood = Wooden Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-ornate-wood = Wooden Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-wood = Wooden Arbor Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-wood = Wooden Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-wood = Wooden Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-bamboo = Bamboo Brand Shaft
-    .desc = {""}
-
-weapon-component-staff-grandstaff-bamboo = Bamboo Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-bamboo = Bamboo Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-bamboo = Bamboo Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-bamboo = Bamboo Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-bamboo = Bamboo Long Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-ornate-bamboo = Bamboo Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-hammer-warhammer-orichalcum = Orichalcum Warhammer Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-orichalcum = Orichalcum Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-orichalcum = Orichalcum Greatmace Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-orichalcum = Orichalcum Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-orichalcum = Orichalcum Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-ornate-orichalcum = Orichalcum Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-maul-orichalcum = Orichalcum Maul Head
-    .desc = {""}
-
-weapon-component-bow-shortbow-ironwood = Ironwood Shortbow Limbs
-    .desc = {""}
-
-weapon-component-bow-greatbow-ironwood = Ironwood Greatbow Limbs
-    .desc = {""}
-
-weapon-component-bow-ornate-ironwood = Ironwood Ornate Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-longbow-ironwood = Ironwood Longbow Limbs
-    .desc = {""}
-
-weapon-component-bow-warbow-ironwood = Ironwood Warbow Limbs
-    .desc = {""}
-
-weapon-component-bow-composite-ironwood = Ironwood Composite Bow Limbs
-    .desc = {""}
-
-weapon-component-bow-bow-ironwood = Ironwood Bow Limbs
-    .desc = {""}
-
-weapon-component-hammer-ornate-cobalt = Cobalt Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-cobalt = Cobalt Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-cobalt = Cobalt Greatmace Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-cobalt = Cobalt Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-cobalt = Cobalt Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-maul-cobalt = Cobalt Maul Head
-    .desc = {""}
-
-weapon-component-hammer-warhammer-cobalt = Cobalt Warhammer Head
-    .desc = {""}
-
-weapon-component-staff-ornate-wood = Wooden Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-wood = Wooden Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-wood = Wooden Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-wood = Wooden Brand Shaft
-    .desc = {""}
-
-weapon-component-staff-grandstaff-wood = Wooden Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-wood = Wooden Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-wood = Wooden Long Pole Shaft
-    .desc = {""}
-
-weapon-component-hammer-ornate-steel = Steel Ornate Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-hammer-steel = Steel Hammer Head
-    .desc = {""}
-
-weapon-component-hammer-greathammer-steel = Steel Greathammer Head
-    .desc = {""}
-
-weapon-component-hammer-spikedmace-steel = Steel Spiked Mace Head
-    .desc = {""}
-
-weapon-component-hammer-greatmace-steel = Steel Greatmace Head
-    .desc = {""}
-
-weapon-component-hammer-maul-steel = Steel Maul Head
-    .desc = {""}
-
-weapon-component-hammer-warhammer-steel = Steel Warhammer Head
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-bamboo = Bamboo Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-cane-bamboo = Bamboo Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crozier-bamboo = Bamboo Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-bamboo = Bamboo Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-bamboo = Bamboo Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-bamboo = Bamboo Arbor Shaft
-    .desc = {""}
-
-weapon-component-sceptre-ornate-bamboo = Bamboo Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-staff-grandstaff-ironwood = Ironwood Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-ironwood = Ironwood Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-ironwood = Ironwood Brand Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-ironwood = Ironwood Long Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-ironwood = Ironwood Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-ironwood = Ironwood Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-ornate-ironwood = Ironwood Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-ornate-eldwood = Eldwood Ornate Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-longpole-eldwood = Eldwood Long Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-rod-eldwood = Eldwood Rod Shaft
-    .desc = {""}
-
-weapon-component-staff-pole-eldwood = Eldwood Pole Shaft
-    .desc = {""}
-
-weapon-component-staff-staff-eldwood = Eldwood Staff Shaft
-    .desc = {""}
-
-weapon-component-staff-brand-eldwood = Eldwood Brand Shaft
-    .desc = {""}
-
-weapon-component-staff-grandstaff-eldwood = Eldwood Grandstaff Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-eldwood = Eldwood Arbor Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-eldwood = Eldwood Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crozier-eldwood = Eldwood Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-cane-eldwood = Eldwood Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-eldwood = Eldwood Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-ornate-eldwood = Eldwood Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-eldwood = Eldwood Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sword-sabre-bloodsteel = Bloodsteel Sabre Blade
-    .desc = {""}
-
-weapon-component-sword-zweihander-bloodsteel = Bloodsteel Zweihander Blade
-    .desc = {""}
-
-weapon-component-sword-greatsword-bloodsteel = Bloodsteel Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-bloodsteel = Bloodsteel Katana Blade
-    .desc = {""}
-
-weapon-component-sword-longsword-bloodsteel = Bloodsteel Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-bloodsteel = Bloodsteel Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-bloodsteel = Bloodsteel Sawblade
-    .desc = {""}
-
-weapon-component-sword-sabre-orichalcum = Orichalcum Sabre Blade
-    .desc = {""}
-
-weapon-component-sword-greatsword-orichalcum = Orichalcum Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-orichalcum = Orichalcum Sawblade
-    .desc = {""}
-
-weapon-component-sword-longsword-orichalcum = Orichalcum Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-orichalcum = Orichalcum Katana Blade
-    .desc = {""}
-
-weapon-component-sword-zweihander-orichalcum = Orichalcum Zweihander Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-orichalcum = Orichalcum Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-axe-poleaxe-bronze = Bronze Poleaxe Head
-    .desc = {""}
-
-weapon-component-axe-ornate-bronze = Bronze Ornate Axe Head
-    .desc = {""}
-
-weapon-component-axe-labrys-bronze = Bronze Labrys Head
-    .desc = {""}
-
-weapon-component-axe-battleaxe-bronze = Bronze Battleaxe Head
-    .desc = {""}
-
-weapon-component-axe-axe-bronze = Bronze Axe Head
-    .desc = {""}
-
-weapon-component-axe-jagged-bronze = Bronze Jagged Axe Head
-    .desc = {""}
-
-weapon-component-axe-greataxe-bronze = Bronze Greataxe Head
-    .desc = {""}
-
-weapon-component-sceptre-sceptre-hardwood = Hardwood Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-cane-hardwood = Hardwood Cane Shaft
-    .desc = {""}
-
-weapon-component-sceptre-arbor-hardwood = Hardwood Arbor Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crozier-hardwood = Hardwood Crozier Shaft
-    .desc = {""}
-
-weapon-component-sceptre-ornate-hardwood = Hardwood Ornate Sceptre Shaft
-    .desc = {""}
-
-weapon-component-sceptre-crook-hardwood = Hardwood Crook Shaft
-    .desc = {""}
-
-weapon-component-sceptre-grandsceptre-hardwood = Hardwood Grandsceptre Shaft
-    .desc = {""}
-
-weapon-component-sword-longsword-cobalt = Cobalt Longsword Blade
-    .desc = {""}
-
-weapon-component-sword-sawblade-cobalt = Cobalt Sawblade
-    .desc = {""}
-
-weapon-component-sword-greatsword-cobalt = Cobalt Greatsword Blade
-    .desc = {""}
-
-weapon-component-sword-katana-cobalt = Cobalt Katana Blade
-    .desc = {""}
-
-weapon-component-sword-zweihander-cobalt = Cobalt Zweihander Blade
-    .desc = {""}
-
-weapon-component-sword-ornate-cobalt = Cobalt Ornate Sword Blade
-    .desc = {""}
-
-weapon-component-sword-sabre-cobalt = Cobalt Sabre Blade
-    .desc = {""}
diff --git a/assets/voxygen/i18n/en/item/weapon/projectile.ftl b/assets/voxygen/i18n/en/item/weapon/projectile.ftl
deleted file mode 100644
index 1c86611..0000000
--- a/assets/voxygen/i18n/en/item/weapon/projectile.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-object-bomb = Bomb
-    .desc = A highly explosive device, demolitionists adore them!
-
-weapon-projectile-fireworks_blue = Firework Blue
-    .desc = Recommended clearance: 42 chonks.
-
-weapon-projectile-fireworks_green = Firework Green
-    .desc = Watch out for trees.
-
-weapon-projectile-fireworks_purple = Firework Purple
-    .desc = Cult favourite.
-
-weapon-projectile-fireworks_red = Firework Red
-    .desc = Humans sometimes use these as a flare in a pinch.
-
-weapon-projectile-fireworks_white = Firework White
-    .desc = Twinkles like the stars.
-
-weapon-projectile-fireworks_yellow = Firework Yellow
-    .desc = The Great Doctor passed away after testing this contraption indoors.
-
-object-surprise_egg = Surprise Egg
-    .desc = Explosive Easter Special.
diff --git a/assets/voxygen/i18n/en/item/weapon/secondary_component.ftl b/assets/voxygen/i18n/en/item/weapon/secondary_component.ftl
deleted file mode 100644
index d08b152..0000000
--- a/assets/voxygen/i18n/en/item/weapon/secondary_component.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-weapon-component-bow-grip-long = Long Bow Grip
-    .desc = {""}
-
-weapon-component-bow-grip-medium = Medium Bow Grip
-    .desc = {""}
-
-weapon-component-bow-grip-short = Short Bow Grip
-    .desc = {""}
-
-weapon-component-axe-haft-long = Long Axe Haft
-    .desc = {""}
-
-weapon-component-axe-haft-medium = Medium Axe Haft
-    .desc = {""}
-
-weapon-component-axe-haft-short = Short Axe Haft
-    .desc = {""}
-
-weapon-component-staff-core-heavy = Heavy Pyrocore
-    .desc = {""}
-
-weapon-component-staff-core-light = Light Pyrocore
-    .desc = {""}
-
-weapon-component-staff-core-medium = Pyrocore
-    .desc = {""}
-
-weapon-component-sword-hilt-long = Long Sword Hilt
-    .desc = {""}
-
-weapon-component-sword-hilt-medium = Medium Sword Hilt
-    .desc = {""}
-
-weapon-component-sword-hilt-short = Short Sword Hilt
-    .desc = {""}
-
-weapon-component-sceptre-core-heavy = Heavy Biocore
-    .desc = {""}
-
-weapon-component-sceptre-core-light = Light Biocore
-    .desc = {""}
-
-weapon-component-sceptre-core-medium = Biocore
-    .desc = {""}
-
-weapon-component-hammer-shaft-long = Long Hammer Haft
-    .desc = {""}
-
-weapon-component-hammer-shaft-medium = Medium Hammer Haft
-    .desc = {""}
-
-weapon-component-hammer-shaft-short = Short Hammer Haft
-    .desc = {""}
diff --git a/assets/voxygen/i18n/en/item/weapon/tool.ftl b/assets/voxygen/i18n/en/item/weapon/tool.ftl
deleted file mode 100644
index c94ef54..0000000
--- a/assets/voxygen/i18n/en/item/weapon/tool.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-weapon-tool-broom = Broom
-    .desc = It's beginning to fall apart.
-
-weapon-tool-fishing_rod_blue = Fishing Rod
-    .desc = Smells of fish.
-
-weapon-tool-golf_club = Golf Club
-    .desc = Peasant swatter. Fiercely anti-urbanist. Climate crisis? What climate crisis?
-
-weapon-tool-hoe_green = Hoe
-    .desc = It's stained with dirt.
-
-weapon-tool-pitchfork = Pitchfork
-    .desc = One of the prongs is broken.
-
-weapon-tool-rake = Rake
-    .desc = Held together with twine.
-
-weapon-tool-shovel_green = Shovel
-    .desc = It's covered in manure.
-
-weapon-tool-shovel_gold = Shovel
-    .desc = It's been recently cleaned.
-
-weapon-tool-pickaxe_green = Pickaxe
-    .desc = It has a chipped edge.
-
-weapon-tool-pickaxe_steel = Steel Pickaxe
-    .desc = Allows for swift excavation of any ore in sight.
-
-weapon-tool-pickaxe_stone = Stone Pickaxe
-    .desc = Strike the earth!
diff --git a/assets/voxygen/i18n/en/item/weapon/weapon.ftl b/assets/voxygen/i18n/en/item/weapon/weapon.ftl
deleted file mode 100644
index bab1ad1..0000000
--- a/assets/voxygen/i18n/en/item/weapon/weapon.ftl
+++ /dev/null
@@ -1,98 +0,0 @@
-weapon-shield-wood-0 = A Tattered Targe
-    .desc = Should withstand a few more hits, hopefully...
-
-weapon-shield-starter = Wooden Shield
-    .desc = May not withstand fire.
-
-weapon-dagger-dagger_basic-0 = Suspicious Paper Knife
-    .desc = Opens letters quickly.
-
-weapon-dagger-dagger_cult-0 = Magical Cultist Dagger
-    .desc = This belonged to an evil Cult Leader.
-
-weapon-dagger-dagger_rusty = Rusty Dagger
-    .desc = Easily concealed.
-
-weapon-bow-sagitta = Sagitta
-    .desc = Said to have slain a dragon with a single arrow.
-
-weapon-bow-starter = Uneven Bow
-    .desc = Someone carved their initials into it.
-
-weapon-bow-velorite = Velorite Bow
-    .desc = Infused with Velorite power.
-
-weapon-sword-starter_1h = Damaged Gladius
-    .desc = This blade has seen better days, but surely it will last.
-
-weapon-axe-2haxe_malachite-0 = Malachite Axe
-    .desc = Etched axe head decorated with malachite on the blades to provide magical properties.
-
-weapon-axe-parashu = Parashu
-    .desc = Said to be able to cleave the heavens.
-
-weapon-axe-2haxe_rusty = Notched Axe
-    .desc = Every dent tells the story of a chopped tree.
-
-weapon-staff-firestaff_cultist = Cultist Staff
-    .desc = The fire gives off no heat.
-
-weapon-staff-laevateinn = Laevateinn
-    .desc = Can shatter the gate of death.
-
-weapon-staff-firestaff_humble_stick = Humble Stick
-    .desc = Walking stick with a sharpened end.
-
-weapon-staff-firestaff_starter = Gnarled Rod
-    .desc = Smells like resin and magic.
-
-weapon-sword-caladbolg = Caladbolg
-    .desc = You sense an eldritch presence watching you.
-
-weapon-sword-cultist = Magical Cultist Greatsword
-    .desc = This belonged to an evil Cult Leader.
-
-weapon-sword-frost-0 = Frost Cleaver
-    .desc = Radiates a freezing aura.
-
-weapon-sword-frost-1 = Frost Saw
-    .desc = Forged from a single piece of eternal ice.
-
-weapon-sword-starter = Damaged Greatsword
-    .desc = The blade could snap at any moment, but you hope it will endure future fights.
-
-weapon-sceptre-amethyst = Amethyst Staff
-    .desc = Its stone is the closest thing from perfection.
-
-weapon-sceptre-caduceus = Caduceus
-    .desc = The snakes seem to be alive.
-
-weapon-sceptre-root_evil = The Root of Evil
-    .desc = 'Everything comes at a price...'
-
-weapon-sceptre-ore-nature = Velorite Sceptre
-    .desc = Heals your allies with the mystical Velorite aura.
-
-weapon-sceptre-wood-simple = Naturalist Walking Stick
-    .desc = Heals your allies with the power of nature.
-
-weapon-hammer-burnt_drumstick = Burnt Drumstick
-    .desc = Might need more practice...
-
-weapon-hammer-cult_purp-0 = Magical Cultist Warhammer
-    .desc = This belonged to an evil Cult Leader.
-
-weapon-hammer-2hhammer_flimsy = Flimsy Hammer
-    .desc = The head is barely secured.
-
-weapon-hammer-2hhammer_rusty = Crude Mallet
-    .desc = Breaks bones like sticks and stones.
-
-weapon-hammer-2hhammer_mjolnir = Mjolnir
-    .desc = It's crackling with lightning.
-
-weapon-hammer-2hhammer_starter = Sturdy Old Hammer
-    .desc = 'Property of...' The rest is missing.
-
-weapon-hammer-craftsman = Craftsman Hammer
-    .desc = Used to craft various items.
diff --git a/assets/voxygen/i18n/en/main.ftl b/assets/voxygen/i18n/en/main.ftl
deleted file mode 100644
index aa86bc5..0000000
--- a/assets/voxygen/i18n/en/main.ftl
+++ /dev/null
@@ -1,110 +0,0 @@
-main-username = Username
-main-server = Server
-main-password = Password
-main-connecting = Connecting
-main-creating_world = Creating world
-main-tip = Tip:
-main-unbound_key_tip = unbound
-main-notice =
-    Welcome to the alpha version of Veloren!
-
-    Before you dive into the fun, please keep a few things in mind:
-
-    - This is a very early alpha. Expect bugs, extremely unfinished gameplay, unpolished mechanics, and missing features.
-
-    - If you have constructive feedback or bug reports, you can contact us on our GitLab repository and on our Discord or Matrix server.
-
-    - Veloren is open source. You are free to play, modify, and redistribute the game in accordance to version 3 of the GNU General Public license.
-
-    - Veloren is a non-profit community project, and everybody working on it is a volunteer.
-    If you like what you see, you are welcome to join any of our working groups!
-
-    Thanks for taking the time to read this notice, we hope you enjoy the game!
-
-    ~ The development team
-main-login_process =
-    About multiplayer mode:
-
-    Please note that you need an account to play on servers with authentication enabled.
-
-    You can create an account at:
-    https://veloren.net/account/
-main-singleplayer-new = New
-main-singleplayer-delete = Delete
-main-singleplayer-regenerate = Regenerate
-main-singleplayer-create_custom = Create Custom
-main-singleplayer-seed = Seed
-main-singleplayer-day_length = Day duration
-main-singleplayer-random_seed = Random
-main-singleplayer-size_lg = Logarithmic size
-main-singleplayer-map_large_warning = Warning: Large worlds will take a long time to start for the first time.
-main-singleplayer-world_name = World name
-main-singleplayer-map_scale = Vertical scaling
-main-singleplayer-map_erosion_quality = Erosion quality
-main-singleplayer-map_shape = Shape
-main-singleplayer-play = Play
-main-singleplayer-generate_and_play = Generate & Play
-menu-singleplayer-confirm_delete = Are you sure you want to delete "{ $world_name }"?
-menu-singleplayer-confirm_regenerate = Are you sure you want to regenerate "{ $world_name }"?
-main-login-server_not_found = Server not found.
-main-login-authentication_error = Authentication error on server.
-main-login-internal_error = Internal error on client. Hint: The player character might have been deleted.
-main-login-failed_auth_server_url_invalid = Failed to connect to authentication server.
-main-login-insecure_auth_scheme = The HTTP authentication scheme is not supported. It's insecure! For development purposes, HTTP is allowed for 'localhost' or debug builds.
-main-login-server_full = Server is full.
-main-login-untrusted_auth_server = Authentication server not trusted.
-main-login-timeout = Timeout: Server did not respond in time. Hint: the server might be currently overloaded or there are issues on the network.
-main-login-server_shut_down = Server shut down.
-main-login-network_error = Network error.
-main-login-network_wrong_version = Mismatched server and client version. Hint: You might need to update your game client.
-main-login-failed_sending_request = Request to authentication server failed.
-main-login-invalid_character = The selected character is invalid.
-main-login-client_crashed = Client crashed.
-main-login-not_on_whitelist = You are not a member in the whitelist of the server you have attempted to join.
-main-login-banned = You have been banned with the following reason:
-main-login-kicked = You have been kicked with the following reason:
-main-login-select_language = Select a language
-main-login-client_version = Client version
-main-login-server_version = Server version
-main-login-client_init_failed = Client failed to initialize: { $init_fail_reason }
-main-login-username_bad_characters = Username contains invalid characters! (Only alphanumeric, '_' and '-' are allowed).
-main-login-username_too_long = Username is too long! Max length is: { $max_len }
-main-servers-select_server = Select a server
-main-servers-singleplayer_error = Failed to connect to internal server: { $sp_error }
-main-servers-network_error = Server network/socket error: { $raw_error }
-main-servers-participant_error = Participant disconnect/protocol error: { $raw_error }
-main-servers-stream_error = Client connection/compression/(de)serialization error: { $raw_error }
-main-servers-database_error = Server database error: { $raw_error }
-main-servers-persistence_error = Server persistence error (Probably Asset/Character Data related): { $raw_error }
-main-servers-other_error = Server general error: { $raw_error }
-main-server-rules = This server has rules that must be accepted.
-main-server-rules-seen-before = These rules have changed since the last time you accepted them.
-main-credits = Credits
-main-credits-created_by = created by
-main-credits-music = Music
-main-credits-fonts = Fonts
-main-credits-other_art = Other Art
-main-credits-contributors = Contributors
-loading-tips =
-    .a0 = Press '{ $gameinput-togglelantern }' to light your lantern.
-    .a1 = Press '{ $gameinput-help }' to see all default key bindings.
-    .a2 = You can type /say or /s to only chat with players directly around you.
-    .a3 = You can type /region or /r to only chat with players a couple of hundred blocks around you.
-    .a4 = Admins can use the /build command to enter build mode.
-    .a5 = You can type /group or /g to only chat with players in your current group.
-    .a6 = To send private messages type /tell followed by a player name and your message.
-    .a7 = Keep an eye out for food, chests and other loot spread all around the world!
-    .a8 = Inventory filled with food? Try crafting better food from it!
-    .a9 = Wondering what there is to do? Try out one of the dungeons marked on the map!
-    .a10 = Don't forget to adjust the graphics for your system. Press '{ $gameinput-settings }' to open the settings.
-    .a11 = Playing with others is fun! Press '{ $gameinput-social }' to see who is online.
-    .a12 = Press '{ $gameinput-dance }' to dance. Party!
-    .a13 = Press '{ $gameinput-glide }' to open your Glider and conquer the skies.
-    .a14 = Veloren is still in Pre-Alpha. We do our best to improve it every day!
-    .a15 = If you want to join the dev team or just have a chat with us, join our Discord server.
-    .a16 = You can toggle showing your amount of health on the health bar in the settings.
-    .a17 = Sit near a campfire (with the '{ $gameinput-sit }' key) to slowly recover from your injuries.
-    .a18 = Need more bags or better armor to continue your journey? Press '{ $gameinput-crafting }' to open the crafting menu!
-    .a19 = Press '{ $gameinput-roll }' to roll. Rolling can be used to move faster and dodge enemy attacks.
-    .a20 = Wondering what an item is used for? Search 'input:<item name>' in crafting to see what recipes it's used in.
-    .a21 = You can take screenshots with '{ $gameinput-screenshot }'.
diff --git a/assets/voxygen/i18n/en/npc.ftl b/assets/voxygen/i18n/en/npc.ftl
deleted file mode 100644
index 1ef4b1d..0000000
--- a/assets/voxygen/i18n/en/npc.ftl
+++ /dev/null
@@ -1,316 +0,0 @@
-## Generic NPC messages
-
-npc-speech-villager =
-    .a0 = I love cheese.
-npc-speech-villager_open =
-    .a0 = I wonder what the Catoblepas thinks when it eats grass.
-    .a1 = What do you suppose makes Glowing Remains glow?
-    .a2 = Have you ever heard of the ferocious Land Sharks? I hear they live in deserts.
-    .a3 = I wonder what is on the other side of the mountains.
-    .a4 = I left some cheese with my sibling. Now I don't know if it exists or not. I call it Schrödinger's cheese.
-    .a5 = Have you ever caught a firefly?
-    .a6 = They say shiny gems of all kinds can be found in caves.
-    .a7 = I just can't understand where those sauroks keep coming from.
-npc-speech-villager_adventurous =
-    .a0 = I hope to make my own glider someday.
-    .a1 = I'd like to go spelunking in a cave when I'm stronger.
-npc-speech-villager_closed =
-    .a0 = You're not from around here are you?
-    .a2 = They say mushrooms are good for your health. Never eat them myself.
-    .a3 = To be, or not to be? I think I'll be a farmer.
-npc-speech-villager_conscientious =
-    .a0 = I keep busy. There's always something to do.
-    .a1 = I hope it rains soon. Would be good for the crops.
-npc-speech-villager_busybody =
-    .a0 = People should talk less and work more.
-npc-speech-villager_unconscientious =
-    .a0 = I think it's time for second breakfast!
-    .a1 = I wish was my house wasn't such a mess. But then I'd have to tidy up! Haha!
-    .a2 = Now where did I leave that thing...
-npc-speech-villager_extroverted =
-    .a0 = You won't believe what I did this weekend!
-    .a1 = Top of the morning to you!
-    .a2 = What do you think about this weather?
-    .a3 = I'm just crackers about cheese!
-    .a4 = Don't forget the crackers!
-    .a5 = I simply adore dwarven cheese. I wish I could make it.
-    .a6 = I had a wonderful dream about cheese last night. What does it mean?
-    .a7 = I love honey! And I hate bees.
-npc-speech-villager_sociable =
-    .a0 = Won't you come in? We were just about to have some cheese!
-    .a1 = Would you like to see my garden? Okay, maybe some other time.
-npc-speech-villager_introverted =
-    .a0 = Hi.
-    .a1 = Oh me? I'm nothing special.
-npc-speech-villager_agreeable =
-    .a0 = How are you today?
-    .a1 = Just tell me if you need anything.
-    .a2 = Have you seen my cat?
-npc-speech-villager_worried =
-    .a0 = Be careful, alright? There are so many dangers out there.
-npc-speech-villager_disagreeable =
-    .a0 = I say it like it is. If people don't like that, too bad.
-    .a1 = People are too easily offended.
-npc-speech-villager_neurotic =
-    .a0 = Thinking about those dungeons makes me scared. I hope someone will clear them out.
-    .a1 = Someone should do something about those cultists. Preferably not me.
-    .a2 = I have the feeling something bad will happen.
-    .a3 = I wish someone would keep the wolves away from the village.
-npc-speech-villager_sad_loner =
-    .a0 = I'm so lonely.
-    .a1 = ... Sorry about this awkward silence. I'm not so good with people.
-npc-speech-villager_seeker =
-    .a0 = I want to see the world one day. There's got to be more to life than this village.
-npc-speech-villager_stable =
-    .a0 = Isn't it such a lovely day?
-    .a1 = Life's not too bad.
-    .a2 = Lovely day for a stroll in the woods!
-npc-speech-villager_decline_trade =
-    .a0 = Sorry, I don't have anything to trade.
-    .a1 = Trade? Like I got anything that may interest you.
-    .a2 = My house is mine, I won't trade it for anything.
-npc-speech-villager_busy =
-    .a0 = Sorry, I can't speak with you right now.
-    .a1 = We'll talk later, I'm busy.
-npc-speech-merchant_advertisement =
-    .a0 = Can I interest you in a trade?
-    .a1 = Do you want to trade with me?
-    .a2 = I have plenty of goods. Do you want to take a look?
-npc-speech-merchant_busy =
-    .a0 = Please wait, I'm only one person.
-    .a1 = Just a moment, let me finish.
-    .a2 = I'm busy, come back later.
-npc-speech-merchant_trade_successful =
-    .a0 = Thank you for trading with me!
-    .a1 = Thank you!
-npc-speech-merchant_trade_declined =
-    .a0 = Maybe another time, have a good day!
-    .a1 = Too bad, maybe next time, then!
-npc-speech-merchant_trade_cancelled_hostile =
-    .a0 = Sorry to cut it short, we have a problem to solve here!
-    .a1 = We'll trade later, I need to take care of this first!
-npc-speech-ambush =
-    .a0 = It's unwise to travel alone!
-    .a1 = Like stealing candy from a baby!
-npc-speech-villager_cultist_alarm =
-    .a0 = Lookout! There is a cultist on the loose!
-    .a1 = To arms! The cultists are attacking!
-    .a2 = How dare the cultists attack our village!
-    .a3 = Death to the cultists!
-    .a4 = Cultists will not be tolerated here!
-    .a5 = Murderous cultist!
-    .a6 = Taste the edge of my sword, you dirty cultist!
-    .a7 = Nothing can clean the blood from your hands, cultist!
-    .a8 = Billions of blistering blue barnacles! A cultist among us!
-    .a9 = The evils of this cultist are about to be over!
-    .a10 = This cultist is mine!
-    .a11 = Prepare to meet your maker, foul cultist!
-    .a12 = I see a cultist! Get them!
-    .a13 = I see a cultist! Attack!
-    .a14 = I see a cultist! Don't let them escape!
-    .a15 = Would the most honorable cultist care for some DEATH?!
-    .a16 = Never forgive! Never forget! Cultist, regret!
-    .a17 = Die, cultist!
-    .a18 = Your reign of terror will seize!
-    .a19 = Here's for all that you've done!
-    .a20 = We don't take kindly to your types around here.
-    .a21 = You should have stayed underground!
-npc-speech-villager_under_attack =
-    .a0 = Help, I'm under attack!
-    .a1 = Help! I'm under attack!
-    .a2 = Ouch! I'm under attack!
-    .a3 = Ouch! I'm under attack! Help!
-    .a4 = Help me! I'm under attack!
-    .a5 = I'm under attack! Help!
-    .a6 = I'm under attack! Help me!
-    .a7 = Help!
-    .a8 = Help! Help!
-    .a9 = Help! Help! Help!
-    .a10 = I'm under attack!
-    .a11 = AAAHHH! I'm under attack!
-    .a12 = AAAHHH! I'm under attack! Help!
-    .a13 = Help! We're under attack!
-    .a14 = Help! Murderer!
-    .a15 = Help! There's a murderer on the loose!
-    .a16 = Help! They're trying to kill me!
-    .a17 = Guards, I'm under attack!
-    .a18 = Guards! I'm under attack!
-    .a19 = I'm under attack! Guards!
-    .a20 = Help! Guards! I'm under attack!
-    .a21 = Guards! Come quick!
-    .a22 = Guards! Guards!
-    .a23 = Guards! There's a villain attacking me!
-    .a24 = Guards, slay this foul villain!
-    .a25 = Guards! There's a murderer!
-    .a26 = Guards! Help me!
-    .a27 = You won't get away with this! Guards!
-    .a28 = You fiend!
-    .a29 = Help me!
-    .a30 = Help! Please!
-    .a31 = Ouch! Guards! Help!
-    .a32 = They're coming for me!
-    .a33 = Help! Help! I'm being repressed!
-    .a34 = Ah, now we see the violence inherent in the system.
-    .a35 = 'Tis but a scratch!
-    .a36 = Stop that!
-    .a37 = What did I ever do to you?!
-    .a38 = Please stop attacking me!
-    .a39 = Hey! Watch where you point that thing!
-    .a40 = Heinous wretch, be gone with you!
-    .a41 = Stop it! Go away!
-    .a42 = Now you're making me mad!
-    .a43 = Oi! Who do you think you are?!
-    .a44 = I'll have your head for that!
-    .a45 = Stop, please! I carry nothing of value!
-    .a46 = I'll set my brother on you, he's bigger than I am!
-    .a47 = Nooo, I'm telling mother!
-    .a48 = Curse you!
-    .a49 = Please don't do that.
-    .a50 = That wasn't very nice!
-    .a51 = Your weapon works, you can put it away now!
-    .a52 = Spare me!
-    .a53 = Please, I have a family!
-    .a54 = I'm too young to die!
-    .a55 = Can we talk about this?
-    .a56 = Violence is never the answer!
-    .a57 = Today is turning out to be a very bad day...
-    .a58 = Hey, that hurt!
-    .a59 = Eek!
-    .a60 = How rude!
-    .a61 = Stop, I beg you!
-    .a62 = A pox upon you!
-    .a63 = This isn't fun.
-    .a64 = How dare you?!
-    .a65 = You'll pay for that!
-    .a66 = Keep that up and you'll be sorry!
-    .a67 = Don't make me hurt you!
-    .a68 = There must be some misunderstanding!
-    .a69 = You don't need to do this!
-    .a70 = Be gone, fiend!
-    .a71 = That really hurt!
-    .a72 = Why would you do that?
-    .a73 = By the spirits, cease!
-    .a74 = You must have me confused with someone else!
-    .a75 = I don't deserve this!
-    .a76 = Please don't do that again.
-    .a77 = Guards, throw this monster in the lake!
-    .a78 = I'll set my tarasque on you!
-    .a79 = Why meeeeeee?
-npc-speech-villager_enemy_killed =
-    .a0 = I have destroyed my enemy!
-    .a1 = Finally at peace!
-    .a2 = ... now what was I doing?
-npc-speech-menacing =
-    .a0 = I'm warning you!
-    .a1 = Any closer and I'll attack!
-    .a2 = You don't scare me!
-    .a3 = Get away from here!
-    .a4 = Turn around if you want to live!
-    .a5 = You're not welcome here!
-npc-speech-cultist_low_health_fleeing =
-    .a0 = Retreat for the cause!
-    .a1 = Retreat!
-    .a2 = Curse you!
-    .a3 = I will curse you in the afterlife!
-    .a4 = I must rest!
-    .a5 = They're too strong!
-npc-speech-moving_on =
-    .a0 = I've spent enough time here, onward to { $site }!
-npc-speech-migrating =
-    .a0 = I'm no longer happy living here. Time to migrate to { $site }.
-    .a1 = Time to move to { $site }, I've had it with this place.
-npc-speech-night_time =
-    .a0 = It's dark, time to head home.
-    .a1 = I'm tired.
-    .a2 = My bed beckons!
-npc-speech-day_time =
-    .a0 = A new day begins!
-    .a1 = I never liked waking up...
-npc-speech-start_hunting =
-    .a0 = Time to go hunting!
-npc-speech-guard_thought =
-    .a0 = My brother's out fighting ogres. What do I get? Guard duty...
-    .a1 = Just one more patrol, then I can head home.
-    .a2 = No bandits are going to get past me.
-npc-speech-merchant_sell_undirected =
-    .a0 = All my goods are of the highest quality!
-    .a1 = Does anybody want to buy my wares?
-    .a2 = I've got the best offers in town.
-    .a3 = Looking for supplies? I've got you covered.
-npc-speech-merchant_sell_directed =
-    .a0 = You there! Are you in need of a new thingamabob?
-    .a1 = Are you hungry? I'm sure I've got some cheese you can buy.
-    .a2 = You look like you could do with some new armour!
-
-## NPC site hints
-## Available variables:
-## - $dir references npc-speech-dir-* variables below
-## - $dist references npc-speech-dist-* variables below
-## - $site represents hard-coded site in the world
-
-npc-speech-tell_site =
-    .a0 = There's { $site } { $dir } of here. Have you visited it?
-    .a1 = You should visit { $site } some time.
-    .a2 = If you travel { $dist } { $dir }, you can get to { $site }.
-    .a3 = { $dir } you'll find { $site }, it's { $dist }.
-
-npc-speech-site =
-    .a0 = Don't you think our village is the best?
-    .a1 = Welcome to { $site } !
-    .a2 = { $site } is a pleasant village to live in.
-
-## NPC monster hints
-## Available variables:
-## - $dir references npc-speech-dir-* variables below
-## - $dist references npc-speech-dist-* variables below
-## - $body references body-npc-speech-* variables in `body` component
-
-npc-speech-tell_monster =
-    .a0 = They say there's { $body } { $dir }, { $dist }...
-    .a1 = You think you're tough? There's { $body } { $dir }.
-
-## Direction hints, used ONLY in npc-speech-tell* above
-
-npc-speech-dir_north = to the north
-npc-speech-dir_north_east = to the north-east
-npc-speech-dir_east = to the east
-npc-speech-dir_south_east = to the south-east
-npc-speech-dir_south = to the south
-npc-speech-dir_south_west = to the south-west
-npc-speech-dir_west = to the west
-npc-speech-dir_north_west = to the north-west
-
-## Distance hints, used ONLY in npc-speech-tell* above
-
-npc-speech-dist_very_far = very far away
-npc-speech-dist_far = far away
-npc-speech-dist_ahead = some way away
-npc-speech-dist_near = nearby
-npc-speech-dist_near_to = very close
-
-## NPC proposals
-
-npc-speech-arena = Let's sit over there!
-
-## NPC reactions
-
-npc-speech-witness_murder =
-    .a0 = Murderer!
-    .a1 = How could you do this?
-    .a2 = Aaargh!
-npc-speech-witness_enemy_murder =
-    .a0 = My Hero!
-    .a1 = Finally someone did it!
-    .a2 = Yeaah!
-npc-speech-witness_death =
-    .a0 = No!
-    .a1 = This is terrible!
-    .a2 = Oh my goodness!
-npc-speech-welcome-aboard =
-    .a0 = Welcome aboard!
-    .a1 = Can I see your ticket... just kidding it's free!
-    .a2 = Have a nice ride!
-npc-speech-night =
-    .a0 = Lanterns are handy for getting around at night!
-    .a1 = I hope we are alone in the dark...
-    .a2 = Boo!
diff --git a/rust-toolchain b/rust-toolchain
index bf867e0..e936f91 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2024-07-07
diff --git a/src/bot.rs b/src/bot.rs
index 8f4f0a3..fa5a773 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -931,11 +931,6 @@ impl Bot {
     fn handle_position_and_orientation(&mut self) -> Result<(), String> {
         if let Some(current_position) = self.client.current::<Pos>() {
             if current_position != self.position {
-                debug!(
-                    "Updating position from {} to {}",
-                    current_position.0, self.position.0
-                );
-
                 let entity = self.client.entity();
                 let ecs = self.client.state_mut().ecs();
                 let mut position_state = ecs.write_storage::<Pos>();
@@ -948,11 +943,6 @@ impl Bot {
 
         if let Some(current_orientation) = self.client.current::<Ori>() {
             if current_orientation != self.orientation {
-                debug!(
-                    "Updating orientation from {:?} to {:?}",
-                    current_orientation, self.orientation
-                );
-
                 let entity = self.client.entity();
                 let ecs = self.client.state_mut().ecs();
                 let mut orientation_state = ecs.write_storage::<Ori>();