diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a932a81175..788cecef48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ variables:
 stages:
     - optional-builds
     - check-compile
-    - post
+    - build-post
+    - publish
 
 before_script:
     - source $HOME/.cargo/env
@@ -70,7 +71,7 @@ check:
     tags:
         - veloren-docker
     script:
-        - RUSTFLAGS="-D warnings" cargo check
+        - RUSTFLAGS="-D warnings" cargo check --locked
 
 code-quality:
     stage: check-compile
@@ -90,29 +91,30 @@ security:
 
 # --
 
-# -- post build
+# -- build-post
 
 unittests:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
         - echo "Workaround, cargo tests fails due some rust files are already deleted, so we just stack cargo test. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo test || cargo test || cargo test || cargo test
+        - cargo test || ( sleep 10 && cargo test ) || ( sleep 10 && cargo test ) || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test
 
 coverage:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
-        - cargo tarpaulin -v
+        - echo "Workaround, tarpaulin fails due some rust files are already deleted, so we just stack tarpaulin. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
+        - cargo tarpaulin -v || ( sleep 10 && cargo tarpaulin -v ) || ( sleep 10 && cargo tarpaulin -v ) || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
 
 benchmarks:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
@@ -121,14 +123,26 @@ benchmarks:
         - unset DISABLE_GIT_LFS_CHECK
         - cargo bench
 
+localization-status:
+    variables:
+        GIT_DEPTH: 0
+    stage: build-post
+    when: delayed
+    start_in: 5 seconds
+    allow_failure: true
+    tags:
+        - veloren-docker
+    script:
+        - cargo test -q test_all_localizations -- --nocapture --ignored
+
 linux:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -147,13 +161,13 @@ linux:
         expire_in: 1 week
 
 windows:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -169,4 +183,52 @@ windows:
             - LICENSE
         expire_in: 1 week
 
+macos:
+    stage: build-post
+    when: delayed
+    start_in: 5 seconds
+    only:
+        refs:
+            - /^r[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
+            - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
+        - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
+        - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
+    artifacts:
+        paths:
+            - veloren-server-cli
+            - veloren-voxygen
+            - assets/
+            - LICENSE
+        expire_in: 1 week
+# --
+
+# -- publish
+
+docker:
+    stage: publish
+    when: delayed
+    start_in: 5 seconds
+    image:
+      name: gcr.io/kaniko-project/executor:debug
+      entrypoint: [""]
+    dependencies:
+        - linux
+    before_script:
+        - ls "$CI_PROJECT_DIR/server-cli/"
+    only:
+      refs:
+          - /^r[0-9]+\.[0-9]+\.[0-9]+/
+          - /^v[0-9]+\.[0-9]+/
+          - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-server"
+
 # --
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
new file mode 100644
index 0000000000..c1aa0c58d8
--- /dev/null
+++ b/.gitlab/CODEOWNERS
@@ -0,0 +1,28 @@
+# Defines people who should approve to certain parts of the codebase
+
+/assets/ @assetsandvisualdesign @frontend
+/chat-cli/ @frontend
+/client/ @backend @networking
+/common/ @backend @networking
+/server/ @backend @networking
+/server-cli/ @frontend
+#/voxygen/ @someone
+/voxygen/anim/ @animation
+/voxygen/audio/ @audio 
+#/voxygen/hud/ @someone
+#/voxygen/menu / @someone
+#/voxygen/mesh/ @someone
+/voxygen/render/ @rendering 
+#/voxygen/scene/ @someone
+#/voxygen/ui/ @someone 
+/world/ @worldgen
+
+# All files related to documentation or game unrelated content needs to be approved by the meta group
+*.md @meta
+*.nix @meta
+.gitignore @meta
+.gitattributes @meta
+.gitlab-ci.yml @meta
+rust-toolchain @meta
+LICENSE @meta
+.cargo/ @meta
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d7c26394..f0f8bc8c16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added rotating orientation marker to main-map
 - Added daily Mac builds
 - Allow spawning individual pet species, not just generic body kinds.
+- Configurable fonts
+- Tanslation status tracking
+- Added gamma setting
+- Added new orc hairstyles
+- Added sfx for wielding/unwielding weapons
+- Fixed NPCs attacking the player forever after killing them
+- Added sfx for collecting, dropping and using inventory items
+- New attack animation
+- weapon control system
+- Game pauses when in singleplayer and pause menu
+- Added authentication system (to play on the official server register on https://account.veloren.net)
+- Added gamepad/controller support
+- Added player feedback when attempting to pickup an item with a full inventory
 
 ### Changed
+
 - Brighter / higher contrast main-map
 - Removed highlighting of non-collectible sprites
+- Fixed /give_exp ignoring player argument
+- Extend run sfx to small animals to prevent sneak attacks by geese.
+- Decreased clientside latency of ServerEvent mediated effects (e.g. projectiles, inventory operations, etc)
 
 ### Removed
 
diff --git a/Cargo.lock b/Cargo.lock
index 482cc225c5..a2c3455bdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,11 +134,40 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "auth-common"
+version = "0.1.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
+dependencies = [
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "authc"
+version = "1.0.0"
+source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97"
+dependencies = [
+ "auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
+ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "autocfg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "backtrace"
 version = "0.3.40"
@@ -159,6 +188,11 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base-x"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "base64"
 version = "0.9.3"
@@ -176,6 +210,11 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bincode"
 version = "1.2.0"
@@ -267,6 +306,11 @@ dependencies = [
  "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -277,6 +321,11 @@ name = "byteorder"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bytes"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "c2-chacha"
 version = "0.2.3"
@@ -324,6 +373,10 @@ dependencies = [
 name = "cc"
 version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "cexpr"
@@ -391,11 +444,6 @@ dependencies = [
  "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "claxon"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "clipboard-win"
 version = "2.2.0"
@@ -458,9 +506,9 @@ dependencies = [
 [[package]]
 name = "conrod_core"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
- "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
+ "conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
  "copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -473,7 +521,7 @@ dependencies = [
 [[package]]
 name = "conrod_derive"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -483,7 +531,7 @@ dependencies = [
 [[package]]
 name = "conrod_winit"
 version = "0.63.0"
-source = "git+https://gitlab.com/veloren/conrod.git#d28fd18c3092d4c26cf6df11673da195b3bc01db"
+source = "git+https://gitlab.com/veloren/conrod.git?branch=hide_text#92925b122dfed139169c7d7687b3ca15c0cb5a2e"
 
 [[package]]
 name = "const-random"
@@ -531,11 +579,25 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
@@ -740,6 +802,14 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ct-logs"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "daggy"
 version = "0.5.0"
@@ -803,6 +873,11 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "dispatch"
 version = "0.1.4"
@@ -840,11 +915,24 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dtoa"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.6.2"
@@ -989,6 +1077,69 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-channel"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-io"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-task"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-util"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gdk"
 version = "0.8.0"
@@ -1117,6 +1268,38 @@ dependencies = [
  "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "gilrs"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gilrs-core 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gilrs-core"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "io-kit-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libudev-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusty-xinput 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gio"
 version = "0.4.1"
@@ -1143,6 +1326,20 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "git2"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "gl_generator"
 version = "0.11.0"
@@ -1343,6 +1540,24 @@ dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "h2"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -1362,6 +1577,11 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "hibitset"
 version = "0.6.2"
@@ -1376,6 +1596,25 @@ name = "hound"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "http"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "http-body"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -1389,6 +1628,46 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -1399,6 +1678,16 @@ dependencies = [
  "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "idna"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "image"
 version = "0.22.3"
@@ -1454,6 +1743,15 @@ name = "instant"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "io-kit-sys"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1475,6 +1773,14 @@ name = "itoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "jobserver"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.1.16"
@@ -1484,6 +1790,14 @@ dependencies = [
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1523,6 +1837,19 @@ name = "libc"
 version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "libgit2-sys"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libssh2-sys 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "libloading"
 version = "0.5.2"
@@ -1532,6 +1859,39 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "libssh2-sys"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "line_drawing"
 version = "0.7.0"
@@ -1642,6 +2002,11 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "mime_guess"
 version = "1.8.7"
@@ -1653,36 +2018,29 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mime_guess"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "minifb"
-version = "0.13.0"
-source = "git+https://github.com/emoon/rust_minifb.git#bac71b297920c1f7ab5d6e384673d3ae5cc7d46d"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "minimp3"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "minimp3-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slice-deque 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "minimp3-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.21"
@@ -1778,6 +2136,18 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "nix"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -1961,6 +2331,23 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "openssl-probe"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "orbclient"
 version = "0.3.27"
@@ -2129,6 +2516,34 @@ dependencies = [
  "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "pin-project"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "piston-float"
 version = "0.3.0"
@@ -2202,6 +2617,11 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "0.3.8"
@@ -2469,7 +2889,7 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2554,16 +2974,63 @@ dependencies = [
 ]
 
 [[package]]
-name = "rodio"
-version = "0.9.0"
-source = "git+https://github.com/RustAudio/rodio?rev=e5474a2#e5474a2ef15f2d0a3bae2538de159b6d3e5bdf79"
+name = "reqwest"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rodio"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "claxon 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "minimp3 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2615,6 +3082,17 @@ dependencies = [
  "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rust-argon2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
@@ -2636,6 +3114,29 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rusttype"
 version = "0.7.9"
@@ -2660,6 +3161,16 @@ dependencies = [
  "stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rusty-xinput"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.2"
@@ -2686,6 +3197,15 @@ dependencies = [
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "scoped_threadpool"
 version = "0.1.9"
@@ -2696,6 +3216,15 @@ name = "scopeguard"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sct"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sdl2"
 version = "0.32.2"
@@ -2718,6 +3247,26 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "security-framework"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -2759,6 +3308,17 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -2816,16 +3376,6 @@ name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "slice-deque"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "smallvec"
 version = "0.6.13"
@@ -2932,6 +3482,53 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3076,6 +3673,46 @@ dependencies = [
  "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.5"
@@ -3084,6 +3721,11 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "treeculler"
 version = "0.1.0"
@@ -3092,6 +3734,11 @@ dependencies = [
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "tuple_utils"
 version = "0.3.0"
@@ -3113,6 +3760,14 @@ dependencies = [
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -3144,6 +3799,11 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "untrusted"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "url"
 version = "1.7.2"
@@ -3154,6 +3814,30 @@ dependencies = [
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "url"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "uuid"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "uuid"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "uvth"
 version = "3.1.1"
@@ -3164,6 +3848,16 @@ dependencies = [
  "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vek"
 version = "0.9.11"
@@ -3191,6 +3885,7 @@ dependencies = [
 name = "veloren-client"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3206,6 +3901,7 @@ dependencies = [
 name = "veloren-common"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3237,6 +3933,7 @@ dependencies = [
 name = "veloren-server"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3273,11 +3970,12 @@ dependencies = [
 name = "veloren-voxygen"
 version = "0.5.0"
 dependencies = [
+ "authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)",
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
- "conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)",
+ "conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
+ "conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)",
  "cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3291,6 +3989,8 @@ dependencies = [
  "gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_device_gl 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_window_glutin 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gilrs 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "glsl-include 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)",
@@ -3300,14 +4000,14 @@ dependencies = [
  "msgbox 0.4.0 (git+https://github.com/bekker/msgbox-rs.git?rev=68fe39a)",
  "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rodio 0.9.0 (git+https://github.com/RustAudio/rodio?rev=e5474a2)",
+ "rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)",
  "treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)",
+ "uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "veloren-client 0.5.0",
  "veloren-common 0.5.0",
@@ -3330,7 +4030,7 @@ dependencies = [
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)",
+ "minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3352,6 +4052,11 @@ name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -3367,11 +4072,82 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wasi"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "wayland-client"
 version = "0.21.13"
@@ -3479,6 +4255,32 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "web-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -3542,7 +4344,7 @@ dependencies = [
  "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3550,6 +4352,14 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winres"
 version = "0.1.11"
@@ -3624,10 +4434,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum auth-common 0.1.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
+"checksum authc 1.0.0 (git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97)" = "<none>"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+"checksum base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92"
 "checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
@@ -3639,8 +4454,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
+"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 "checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
@@ -3655,22 +4472,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
 "checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum claxon 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f86c952727a495bda7abaf09bafdee1a939194dd793d9a8e26281df55ac43b00"
 "checksum clipboard-win 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
 "checksum cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
 "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
 "checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
-"checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
-"checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
-"checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
+"checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
+"checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
+"checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git?branch=hide_text)" = "<none>"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 "checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
@@ -3690,6 +4508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
 "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
+"checksum ct-logs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
 "checksum daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
@@ -3697,12 +4516,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
+"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 "checksum dispatch 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605"
 "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
 "checksum dot_vox 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11afd3251e588f2770226659b2a1d55ec2f8aaf2ca42bdcdbd01ff53b4a81e70"
 "checksum downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
 "checksum draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 "checksum euc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd"
 "checksum euclid 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1"
@@ -3721,6 +4543,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
+"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
+"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
+"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
+"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
+"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
+"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
+"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
@@ -3732,8 +4562,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gfx_gl 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8525888d909a6424b04f9136976f07a85fc1f3704555c1a73897e258326c8319"
 "checksum gfx_window_glutin 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)" = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
 "checksum gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af"
+"checksum gilrs 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "122bb249f904e5f4ac73fc514b9b2ce6cce3af511f5df00ffc8000e47de6b290"
+"checksum gilrs-core 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6bdd4ea2d919ecb594362fa26b0f172729b9ee9b95e407fbad95e0a49cadc143"
 "checksum gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2db9fad8f1b0d4c7338a210a6cbdf081dcc1a3c223718c698c4f313f6c288acb"
 "checksum gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a57872499171d279f8577ce83837da4cae62b08dd32892236ed67ab7ea61030"
+"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
 "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
 "checksum gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
 "checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
@@ -3752,30 +4585,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91"
 "checksum guillotiere 0.4.2 (git+https://github.com/Imberflur/guillotiere)" = "<none>"
 "checksum gzip-header 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639"
+"checksum h2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d5c295d1c0c68e4e42003d75f908f5e16a1edd1cbe0b0d02e4dc2006a384f47"
 "checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47e7292fd9f7fe89fa35c98048f2d0a69b79ed243604234d18f6f8a1aa6f408d"
 "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
+"checksum http-body 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+"checksum hyper 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b15203263d1faa615f9337d79c1d37959439dc46c2b4faab33286fadc2a1c5"
+"checksum hyper-rustls 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4be8aaefbe7545dc42ae925afb55a0098f226a3fe5ef721872806f44f57826"
 "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
 "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
 "checksum inotify 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc39ee997811267bf8aa0b10e1674c5bea6caacc1957eede5ea45251fe33c6d5"
 "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
 "checksum instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6c346c299e3fe8ef94dc10c2c0253d858a69aac1245157a3bf4125915d528caf"
+"checksum io-kit-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
+"checksum js-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
 "checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
+"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
+"checksum libssh2-sys 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc"
+"checksum libudev-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
 "checksum line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
@@ -3791,10 +4638,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-"checksum minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
-"checksum minimp3 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "542e9bed56860c5070a09939eee0e2df6f8f73f60304ddf56d620947e7017239"
-"checksum minimp3-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c109ae05c00ad6e3a53fab101e2f234545bdd010f0fffd399355efaf70817817"
+"checksum mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+"checksum minifb 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c"
 "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -3803,6 +4650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
+"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 "checksum noise 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "337525774dd8a197b613a01ea88058ef0ed023e5ed1e4b7e93de478e1f2bf770"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
@@ -3822,6 +4670,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
 "checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
 "checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
@@ -3841,6 +4691,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+"checksum pin-project 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c"
+"checksum pin-project-internal 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f"
+"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
+"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
 "checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199"
 "checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611"
 "checksum pistoncore-input 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f"
@@ -3850,6 +4704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
@@ -3879,7 +4734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
-"checksum raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9db80d08d3ed847ce4fb3def46de0af4bfb6155bd09bd6eaf28b5ac72541c1f1"
+"checksum raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
 "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
@@ -3889,29 +4744,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rodio 0.9.0 (git+https://github.com/RustAudio/rodio?rev=e5474a2)" = "<none>"
+"checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2"
+"checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
+"checksum rodio 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
 "checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rust-argon2 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum rustls 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
+"checksum rustls-native-certs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 "checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 "checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
+"checksum rusty-xinput 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum scan_fmt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "faf737f37ca340201889b5f48ecde47f233e9da3cbf3d04be27883adac39b4da"
+"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+"checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
+"checksum security-framework 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "97bbedbe81904398b6ebb054b3e912f99d55807125790f3198ac990d98def5b0"
+"checksum security-framework-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06fd2f23e31ef68dd2328cc383bd493142e46107a3a0e24f7d734e3f3b80fe4c"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
@@ -3920,7 +4786,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum shrev 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum slice-deque 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffddf594f5f597f63533d897427a570dbaa9feabaaa06595b74b71b7014507d7"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
 "checksum smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
@@ -3933,6 +4798,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+"checksum stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+"checksum stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+"checksum stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+"checksum stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
@@ -3949,23 +4818,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
+"checksum tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616"
+"checksum tokio-rustls 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
+"checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
+"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
 "checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 "checksum uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf"
+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb3ca8ea588deba055424cc1a79a830428b2f6c270b8d8f91946f660fa4d8ee"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
+"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wasm-bindgen 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
+"checksum wasm-bindgen-backend 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
+"checksum wasm-bindgen-futures 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "457414a91863c0ec00090dba537f88ab955d93ca6555862c29b6d860990b8a8a"
+"checksum wasm-bindgen-macro 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
+"checksum wasm-bindgen-macro-support 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
+"checksum wasm-bindgen-shared 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
 "checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
 "checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
@@ -3976,6 +4865,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
 "checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
+"checksum web-sys 0.3.36 (registry+https://github.com/rust-lang/crates.io-index)" = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
+"checksum webpki 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
+"checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
@@ -3984,6 +4876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
 "checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 "checksum winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
diff --git a/README.md b/README.md
index 4ffbf053c8..60d017207d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,9 @@ Currently the communication of contributors happens mainly on our [official Disc
 
 ## Useful Links
 
+[Sign Up](https://account.veloren.net) - Here you can create an online account for Veloren.
+This will be needed to play on auth-enabled servers, including the official server.
+
 [The Book](https://book.veloren.net) - A collection of all important information relating to Veloren. It includes information on how to compile Veloren and how to contribute.
 
 [Future Plans](https://gitlab.com/veloren/veloren/milestones) - Go here for information about Veloren's development roadmap and what we're currently working on.
diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index eade9f7ae3..d8bb02f0a7 100644
--- a/assets/common/npc_names.json
+++ b/assets/common/npc_names.json
@@ -19,6 +19,7 @@
                 "Colborn",
                 "Dagfinn",
                 "Dagrod",
+                "Digbod",
                 "Dimian",
                 "Domnhar",
                 "Ebraheim",
@@ -458,6 +459,10 @@
             "peacock": {
                 "keyword": "peacock",
                 "generic": "Peacock"
+            },
+            "eagle": {
+                "keyword": "eagle",
+                "generic": "Eagle"
             }
         }
     },
diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron
index 8310f26c09..9add266bf9 100644
--- a/assets/voxygen/audio/sfx.ron
+++ b/assets/voxygen/audio/sfx.ron
@@ -23,5 +23,77 @@
             ],
             threshold: 0.5,
         ),
+        Wield(Sword): (
+            files: [
+                "voxygen.audio.sfx.weapon.sword_out",
+            ],
+            threshold: 0.5,
+        ),
+        Unwield(Sword): (
+            files: [
+                "voxygen.audio.sfx.weapon.sword_in",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Collected): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Swapped): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Given): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_item",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Dropped): (
+            files: [
+                "voxygen.audio.sfx.footsteps.stepgrass_4",
+            ],
+            threshold: 0.5,
+        ),
+        Inventory(Consumed(Potion)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.liquid",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(PotionMinor)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.liquid",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Apple)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.apple",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Mushroom)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed(Cheese)): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(CollectFailed): (
+            files: [
+                "voxygen.audio.sfx.inventory.add_failed",
+            ],
+            threshold: 0.3,
+        )
     }
 )
\ No newline at end of file
diff --git a/assets/voxygen/audio/sfx/inventory/add_failed.wav b/assets/voxygen/audio/sfx/inventory/add_failed.wav
new file mode 100644
index 0000000000..6e5d3abe97
--- /dev/null
+++ b/assets/voxygen/audio/sfx/inventory/add_failed.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7cf98460ef3c627df1603e34b9b2b4443f54dc9bfafccaccaba6719f4214085
+size 51216
diff --git a/assets/voxygen/audio/sfx/inventory/add_item.wav b/assets/voxygen/audio/sfx/inventory/add_item.wav
new file mode 100644
index 0000000000..380dc30d4d
--- /dev/null
+++ b/assets/voxygen/audio/sfx/inventory/add_item.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f811babdffe01795b1ff75827ab8e968b61baff8243ea031390dc49152885950
+size 40140
diff --git a/assets/voxygen/audio/sfx/inventory/consumable/apple.wav b/assets/voxygen/audio/sfx/inventory/consumable/apple.wav
new file mode 100644
index 0000000000..286d8aade0
--- /dev/null
+++ b/assets/voxygen/audio/sfx/inventory/consumable/apple.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c4d2931431c26b95a4d41b2e137b3db74456b8b9db54d7c48defb9d7bb67689
+size 70152
diff --git a/assets/voxygen/audio/sfx/inventory/consumable/food.wav b/assets/voxygen/audio/sfx/inventory/consumable/food.wav
new file mode 100644
index 0000000000..ea39de567a
--- /dev/null
+++ b/assets/voxygen/audio/sfx/inventory/consumable/food.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fd5074d0ec517b626e95bc34cb75e735d48dbb99473ffeadb79d90734f52f7d
+size 31208
diff --git a/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav b/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav
new file mode 100644
index 0000000000..fa0db211f4
--- /dev/null
+++ b/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c3a38dede30bb4a8c13644bd43be5fe261f177f3c65f88e5d02da5b9ba68a97
+size 21548
diff --git a/assets/voxygen/audio/sfx/weapon/sword_in.wav b/assets/voxygen/audio/sfx/weapon/sword_in.wav
new file mode 100644
index 0000000000..24061231f9
--- /dev/null
+++ b/assets/voxygen/audio/sfx/weapon/sword_in.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:181cb4e801f82a55ad1916b861dfc1dc14f56b2716841bf94f320eadda41c8d1
+size 44272
diff --git a/assets/voxygen/audio/sfx/weapon/sword_out.wav b/assets/voxygen/audio/sfx/weapon/sword_out.wav
new file mode 100644
index 0000000000..4233e07a57
--- /dev/null
+++ b/assets/voxygen/audio/sfx/weapon/sword_out.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6026f1942a4b6e5dcda65a5984debdf9e025bf98ea30a282f9f7c3ba5c78be5b
+size 48620
diff --git a/assets/voxygen/element/buttons/button.png b/assets/voxygen/element/buttons/button.png
new file mode 100644
index 0000000000..4bbab4126b
--- /dev/null
+++ b/assets/voxygen/element/buttons/button.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea5c3ef55df49a9b32fa1f23700267f05c730921fbbf014f6d1765799b6582f4
+size 1717
diff --git a/assets/voxygen/element/buttons/button_hover.png b/assets/voxygen/element/buttons/button_hover.png
new file mode 100644
index 0000000000..3d8e07addc
--- /dev/null
+++ b/assets/voxygen/element/buttons/button_hover.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9945fdcb8f103ab61e0f5ea80d090e8ffb8f081fb25e03bdd8f2d808a52248e3
+size 2185
diff --git a/assets/voxygen/element/buttons/button_press.png b/assets/voxygen/element/buttons/button_press.png
new file mode 100644
index 0000000000..693ab36c9e
--- /dev/null
+++ b/assets/voxygen/element/buttons/button_press.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05c3c6b22f543380cb3a9099651c571fea10940bec73f83f9767c4c23ef01ff9
+size 2264
diff --git a/assets/voxygen/element/frames/banner.vox b/assets/voxygen/element/frames/banner.vox
index 23ed569d7a..c22657d78e 100644
--- a/assets/voxygen/element/frames/banner.vox
+++ b/assets/voxygen/element/frames/banner.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17691947a87f25cd45d5d115b22116a0be7905b6791be92e35a7153a1d0cde2b
+oid sha256:9a6975e66ab8b86e71d5e8a4014674242128aa1b1015f32d0552d3f229051927
 size 78932
diff --git a/assets/voxygen/element/frames/banner_small_top.png b/assets/voxygen/element/frames/banner_small_top.png
new file mode 100644
index 0000000000..13bdb3eac9
--- /dev/null
+++ b/assets/voxygen/element/frames/banner_small_top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11bbd57a069713669c4248baab471901dc7fe5e52948c6e2582101e9e38d58fd
+size 670
diff --git a/assets/voxygen/element/frames/banner_top.png b/assets/voxygen/element/frames/banner_top.png
new file mode 100644
index 0000000000..a8f9c1a224
--- /dev/null
+++ b/assets/voxygen/element/frames/banner_top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f03ab3f90d7abe2ccd67de23b7a7f1e026cb97c8e202a60165397d61b8f9dce
+size 4881
diff --git a/assets/voxygen/element/frames/enemybar-0.vox b/assets/voxygen/element/frames/enemybar-0.vox
deleted file mode 100644
index 86d8e7b3d9..0000000000
--- a/assets/voxygen/element/frames/enemybar-0.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bb91912f72a88fb39e4a06dd6a847b0e4512a934ce193cb1325abb91549e455
-size 60720
diff --git a/assets/voxygen/element/frames/enemybar.png b/assets/voxygen/element/frames/enemybar.png
index 82515fb6c0..61b5273433 100644
--- a/assets/voxygen/element/frames/enemybar.png
+++ b/assets/voxygen/element/frames/enemybar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfa1034410f86cc56f8ca737054ff8a8bf71dd4d696fa3bd8195d866cb4405d3
-size 1607
+oid sha256:7c4bad1314144f662c8970136ee954e8a56849b65b39a26caa22148b00c44bfd
+size 245
diff --git a/assets/voxygen/element/frames/enemybar_bg.png b/assets/voxygen/element/frames/enemybar_bg.png
new file mode 100644
index 0000000000..18748b44f3
--- /dev/null
+++ b/assets/voxygen/element/frames/enemybar_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c1214e73e70dcff9b3623d776167b9aae1731cffae41d4dc57549e955372695
+size 178
diff --git a/assets/voxygen/element/frames/esc_menu.vox b/assets/voxygen/element/frames/esc_menu.vox
index b4637818c8..de72424efe 100644
--- a/assets/voxygen/element/frames/esc_menu.vox
+++ b/assets/voxygen/element/frames/esc_menu.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8e4a0d231a08ead9cb4677531d5aae0391ac69548e5cba8c7bfb98e3c22b85e
-size 79856
+oid sha256:2b588ad596f31ccdc3826a5a59c45601c81c8916c56c5b266f5d82bf87f18ace
+size 75292
diff --git a/assets/voxygen/element/icons/elf_m.png b/assets/voxygen/element/icons/elf_m.png
index 0d0788e78a..26f18519a4 100644
--- a/assets/voxygen/element/icons/elf_m.png
+++ b/assets/voxygen/element/icons/elf_m.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07f0a96fec50bfef3d3ae62ecdec05749d01dea6feae396f16a1de25804133bc
-size 15846
+oid sha256:f9accfbd032585de6fbcf7570bd8f14f13efc392793b1d7bd94a1c246cbec43a
+size 19534
diff --git a/assets/voxygen/element/misc_bg/textbox_bot.png b/assets/voxygen/element/misc_bg/textbox_bot.png
new file mode 100644
index 0000000000..e944fe5eff
--- /dev/null
+++ b/assets/voxygen/element/misc_bg/textbox_bot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79e8e39281ebb9293b804ea0535635d69cc455ab4bb6d1103b84ec91e77990c1
+size 6377
diff --git a/assets/voxygen/element/misc_bg/textbox_mid.png b/assets/voxygen/element/misc_bg/textbox_mid.png
new file mode 100644
index 0000000000..9c271c6c21
--- /dev/null
+++ b/assets/voxygen/element/misc_bg/textbox_mid.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d9097face16955fac82b30dbe896796aea1b589db5c9cda2f87d9bc7f63f3a7
+size 6103
diff --git a/assets/voxygen/element/misc_bg/textbox_top.png b/assets/voxygen/element/misc_bg/textbox_top.png
new file mode 100644
index 0000000000..1f2067cd01
--- /dev/null
+++ b/assets/voxygen/element/misc_bg/textbox_top.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d770f17e438f4119cba20d54020acac26445467f968015028a3b476c2e97ea83
+size 6358
diff --git a/assets/voxygen/font/haxrcorp_4089_cyrillic_altgr_extended.ttf b/assets/voxygen/font/haxrcorp_4089_cyrillic_altgr_extended.ttf
new file mode 100644
index 0000000000..28a2f56603
--- /dev/null
+++ b/assets/voxygen/font/haxrcorp_4089_cyrillic_altgr_extended.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9fe6b6694620909217869f4f3fdce28d9ce9e5f0720c5a601903c95669dc428
+size 22120
diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index fcf50d5956..a9ab34bd68 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -17,6 +17,28 @@ VoxygenLocalization(
         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,
+        ),
+    },
     string_map: {
         /// Start Common section
         // Texts used in multiple locations with the same formatting
@@ -43,6 +65,8 @@ VoxygenLocalization(
         "common.disclaimer": "Disclaimer",
         "common.cancel": "Cancel",
         "common.none": "None",
+        "common.error": "Error",
+        "common.fatal_error": "Fatal Error",
 
         // Message when connection to the server is lost
         "common.connection_lost": r#"Connection lost!
@@ -91,12 +115,25 @@ Thanks for taking the time to read this notice, we hope you enjoy the game!
         // Login process description
         "main.login_process": r#"Information on the Login Process:
 
-Put in any username. No Account needed yet.
-                                        
-Character names and appearances will be saved locally.
+If you are having issues signing in:
 
-Levels/Items are not saved yet."#,
+Please note that you now need an account
+to play on auth-enabled servers.
 
+You can create an account over at
+
+https://account.veloren.net."#,
+        "main.login.server_not_found": "Server not found",
+        "main.login.authentication_error": "Auth error on server",
+        "main.login.server_full": "Server is full",
+        "main.login.untrusted_auth_server": "Auth server not trusted",
+        "main.login.outdated_client_or_server": "ServerWentMad: Probably versions are incompatible, check for updates.",
+        "main.login.timeout": "Timeout: Server did not respond in time. (Overloaded or network issues).",
+        "main.login.server_shut_down": "Server shut down",
+        "main.login.already_logged_in": "You are already logged into the server.",
+        "main.login.network_error": "Network error",
+        "main.login.failed_sending_request": "Request to Auth server failed",
+        "main.login.client_crashed": "Client crashed",
 
         /// End Main screen section
 
@@ -186,6 +223,7 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.view_distance": "View Distance",
         "hud.settings.maximum_fps": "Maximum FPS",
         "hud.settings.fov": "Field of View (deg)",
+        "hud.settings.gamma": "Gamma",
         "hud.settings.antialiasing_mode": "AntiAliasing Mode",
         "hud.settings.cloud_rendering_mode": "Cloud Rendering Mode",
         "hud.settings.fluid_rendering_mode": "Fluid Rendering Mode",
@@ -335,4 +373,4 @@ Willpower
         "esc_menu.quit_game": "Quit Game",
         /// End Escape Menu Section
     }
-)
\ No newline at end of file
+)
diff --git a/assets/voxygen/i18n/fr_FR.ron b/assets/voxygen/i18n/fr_FR.ron
index d1cbbb75c6..6d5c4d581c 100644
--- a/assets/voxygen/i18n/fr_FR.ron
+++ b/assets/voxygen/i18n/fr_FR.ron
@@ -4,7 +4,29 @@ VoxygenLocalization(
         language_name: "Français",
         language_identifier: "fr_FR",
     ),
-    convert_utf8_to_ascii: true,
+    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: 0.9,
+        ),
+    },
     string_map: {
         // Common texts used in multiple locations
         "common.username": "pseudo",
@@ -16,7 +38,7 @@ VoxygenLocalization(
         "common.languages": "Langues",
         "common.interface": "Interface",
         "common.gameplay": "Gameplay",
-        "common.controls": "Controles",
+        "common.controls": "Contrôles",
         "common.video": "Video",
         "common.sound": "Audio",
         "common.resume": "Reprendre",
diff --git a/assets/voxygen/net.veloren.veloren.appdata.xml b/assets/voxygen/net.veloren.veloren.appdata.xml
new file mode 100644
index 0000000000..1192abe8fc
--- /dev/null
+++ b/assets/voxygen/net.veloren.veloren.appdata.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Artem Polishchuk <ego.cordatus@gmail.com> -->
+<component type="desktop-application">
+    <id>net.veloren.veloren.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0-or-later</project_license>
+    <content_rating type="oars-1.0">
+        <content_attribute id="social-chat">intense</content_attribute>
+        <content_attribute id="social-info">mild</content_attribute>
+        <content_attribute id="violence-cartoon">mild</content_attribute>
+        <content_attribute id="violence-fantasy">mild</content_attribute>
+    </content_rating>
+    <name>Veloren</name>
+    <summary>
+        Veloren is a multiplayer voxel RPG written in Rust. It is inspired
+        by games such as Cube World, Legend of Zelda: Breath of the Wild,
+        Dwarf Fortress and Minecraft.
+    </summary>
+    <description>
+        <p>
+            Welcome To Veloren!
+        </p><p>
+            Veloren is a multiplayer voxel RPG written in Rust. Veloren takes
+            inspiration from games such as Cube World, Minecraft and Dwarf
+            Fortress. The game is currently under heavy development, but is
+            playable.
+        </p><p>
+            Development
+        </p><p>
+            Currently the communication of contributors happens mainly on our
+            official Discord server (https://discord.gg/kjwJwjK). You can join
+            it to keep up with the development, talk to us or contribute
+            something yourself. Anyone who shows genuine effort to help is
+            welcome in our team. You don't have to know how to program to
+            contribute!
+        </p>
+    </description>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://media.discordapp.net/attachments/634860358623821835/643034796548947968/screenshot_1573381825305.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://media.discordapp.net/attachments/597826574095613962/643102462781423616/screenshot_1573397958545.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://cdn.discordapp.com/attachments/634860358623821835/646518917577310219/screenshot_1574211401431.png</image>
+        </screenshot>
+    </screenshots>
+    <keywords>
+        <keyword>sandbox</keyword>
+        <keyword>world</keyword>
+        <keyword>multiplayer</keyword>
+    </keywords>
+    <url type="homepage">https://veloren.net</url>
+    <url type="bugtracker">https://gitlab.com/veloren/veloren/issues</url>
+    <url type="faq">https://gitlab.com/veloren/veloren#faq</url>
+    <url type="help">https://book.veloren.net/</url>
+    <provides>
+        <binary>veloren-voxygen</binary>
+    </provides>
+</component>
diff --git a/assets/voxygen/net.veloren.veloren.desktop b/assets/voxygen/net.veloren.veloren.desktop
new file mode 100644
index 0000000000..5e4f2cd02e
--- /dev/null
+++ b/assets/voxygen/net.veloren.veloren.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Veloren
+Comment=Veloren is a multiplayer voxel RPG written in Rust
+Exec=veloren-voxygen
+Categories=Game;Simulation;
+Keywords=veloren;sandbox;world;blocks;nodes;multiplayer;roleplaying;
+Icon=net.veloren.veloren.png
+Terminal=false
diff --git a/assets/voxygen/net.veloren.veloren.png b/assets/voxygen/net.veloren.veloren.png
new file mode 100644
index 0000000000..c849ca552b
--- /dev/null
+++ b/assets/voxygen/net.veloren.veloren.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7162cb9f05336af0b35e7b8e923716161dc4df418c8e3fd9918c71ad5a875201
+size 33292
diff --git a/assets/voxygen/shaders/include/globals.glsl b/assets/voxygen/shaders/include/globals.glsl
index 471320a7ef..e0e97949e2 100644
--- a/assets/voxygen/shaders/include/globals.glsl
+++ b/assets/voxygen/shaders/include/globals.glsl
@@ -12,4 +12,5 @@ uniform u_globals {
 	uvec4 light_shadow_count;
 	uvec4 medium;
 	ivec4 select_pos;
+	vec4 gamma;
 };
diff --git a/assets/voxygen/shaders/postprocess-frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl
index 4193bda525..cd0c87a772 100644
--- a/assets/voxygen/shaders/postprocess-frag.glsl
+++ b/assets/voxygen/shaders/postprocess-frag.glsl
@@ -45,7 +45,7 @@ void main() {
 	//hsva_color.z = 1.0 - 1.0 / (1.0 * hsva_color.z + 1.0);
 	//vec4 final_color = vec4(hsv2rgb(hsva_color.rgb), hsva_color.a);
 	
-	vec4 final_color = aa_color;    
+	vec4 final_color = pow(aa_color, gamma);
 
 	if (medium.x == 1u) {
 		final_color *= vec4(0.2, 0.2, 0.8, 1.0);
diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron
index 8dde25c342..6951c0e7af 100644
--- a/assets/voxygen/voxel/bird_medium_center_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_center_manifest.ron
@@ -111,4 +111,32 @@
             center: ("npc.peacock.female.tail"),
         )
     ),
+    (Eagle, Male): (
+        head: (
+            offset: (-2.0, -2.0, -3.5),
+            center: ("npc.eagle.female.head"),
+        ),
+        torso: (
+            offset: (-3.0, -4.5, -4.5),
+            center: ("npc.eagle.female.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -3.5, -3.5),
+            center: ("npc.eagle.female.tail"),
+        )
+    ),
+    (Eagle, Female): (
+        head: (
+            offset: (-2.0, -2.0, -3.5),
+            center: ("npc.eagle.female.head"),
+        ),
+        torso: (
+            offset: (-3.0, -4.5, -4.5),
+            center: ("npc.eagle.female.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -3.5, -3.5),
+            center: ("npc.eagle.female.tail"),
+        )
+    ),
 })
\ No newline at end of file
diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
index 3fef62853c..a934c5695e 100644
--- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
@@ -143,4 +143,40 @@
             lateral: ("npc.peacock.female.leg_r"),
         )
     ),
+    (Eagle, Male): (
+        wing_l: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.male.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.male.leg_r"),
+        )
+    ),
+    (Eagle, Female): (
+        wing_l: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.female.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -13.0),
+            lateral: ("npc.eagle.female.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.5, 0.0, -8.0),
+            lateral: ("npc.eagle.female.leg_r"),
+        )
+    ),
 })
\ No newline at end of file
diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox
index ce8052be51..bec886a3da 100644
--- a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox
+++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f97e6c9ead050281570fb72235a943581a784a1459abf7e180cc73d17ff6894
-size 55685
+oid sha256:17cfb5e4f716fdb7c9c7617247a38f24c7ee72348c5ed2016e51dbec594a674b
+size 57958
diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox
new file mode 100644
index 0000000000..b6594f60c9
--- /dev/null
+++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b589c82819788d4613403fcde382adb3789e6d55e19ca3fb497f39d438a02acd
+size 57914
diff --git a/assets/voxygen/voxel/figure/beard/human/human-0.vox b/assets/voxygen/voxel/figure/beard/human/human-0.vox
index e607c7e7c3..85e6a409fc 100644
--- a/assets/voxygen/voxel/figure/beard/human/human-0.vox
+++ b/assets/voxygen/voxel/figure/beard/human/human-0.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d493cbef02c10163092d61ea2c7a4246178e6955b99cae1e3500d5f66d846005
-size 1240
+oid sha256:d0c5efe8f1645d8104ab07e6412440614febc9b8ca95fdfdc0f0e8ffaee4f331
+size 55723
diff --git a/assets/voxygen/voxel/figure/hair/elf/male-2.vox b/assets/voxygen/voxel/figure/hair/elf/male-2.vox
index 08f7052d22..dac3a25e4e 100644
--- a/assets/voxygen/voxel/figure/hair/elf/male-2.vox
+++ b/assets/voxygen/voxel/figure/hair/elf/male-2.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e878845d35138cb1ab16ca78baf9d561cfa901330a52db1700301afb191152b9
-size 57002
+oid sha256:4c42e7da38ad6ef36e53c1fcfae73531f1dbf8adbf83b96a0f0f2981a248a5b7
+size 57026
diff --git a/assets/voxygen/voxel/figure/hair/human/male-20.vox b/assets/voxygen/voxel/figure/hair/human/male-20.vox
index 08f7052d22..dac3a25e4e 100644
--- a/assets/voxygen/voxel/figure/hair/human/male-20.vox
+++ b/assets/voxygen/voxel/figure/hair/human/male-20.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e878845d35138cb1ab16ca78baf9d561cfa901330a52db1700301afb191152b9
-size 57002
+oid sha256:4c42e7da38ad6ef36e53c1fcfae73531f1dbf8adbf83b96a0f0f2981a248a5b7
+size 57026
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-0.vox b/assets/voxygen/voxel/figure/hair/orc/female-0.vox
new file mode 100644
index 0000000000..504d5a244e
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:722ff5a49bd37bbc2da3cc1e6ea1f19b2ad38d88fede8dd5c96355a1269009fc
+size 58642
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-1.vox b/assets/voxygen/voxel/figure/hair/orc/female-1.vox
new file mode 100644
index 0000000000..1af8813a08
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43b5e82e7fa965429288b1e6985e4449edc9e6a4b8d7386187d62153fd79d630
+size 58266
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-2.vox b/assets/voxygen/voxel/figure/hair/orc/female-2.vox
new file mode 100644
index 0000000000..cf5f854aef
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bc1d189819717568b92fc327e98d6c4c096cbe28eeb7595688137a5055a497a
+size 58810
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-3.vox b/assets/voxygen/voxel/figure/hair/orc/female-3.vox
new file mode 100644
index 0000000000..496c9266d2
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71ebeb3025d03aa0300a9ce1924932faa5616451e726aa72e573b2aaf2a283b4
+size 59946
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-4.vox b/assets/voxygen/voxel/figure/hair/orc/female-4.vox
new file mode 100644
index 0000000000..b38b1b738c
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0032b74cd99c530ff56872324407353fb84b524e03bca1617ed88ab1e61978ba
+size 58378
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-5.vox b/assets/voxygen/voxel/figure/hair/orc/female-5.vox
new file mode 100644
index 0000000000..c2513264c0
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f2c75b22f7587adb3960ac15db9841bd249f0fee37fabd3de0859a8e27a0eca
+size 60158
diff --git a/assets/voxygen/voxel/figure/hair/orc/female-6.vox b/assets/voxygen/voxel/figure/hair/orc/female-6.vox
new file mode 100644
index 0000000000..bbfcfc7b23
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/orc/female-6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54950e3b327e36e547467518511baaf04cb99a282488e7da45db88eccba8d7e0
+size 59566
diff --git a/assets/voxygen/voxel/figure/hair/orc/female.vox b/assets/voxygen/voxel/figure/hair/orc/female.vox
deleted file mode 100644
index 93e9ab8de6..0000000000
--- a/assets/voxygen/voxel/figure/hair/orc/female.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db3808a3e095615c2951b7a6e4b3f0263069a3471ecacb92d4cbc49dbff707ce
-size 44995
diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron
index c599e1dfbc..9e67fcb95b 100644
--- a/assets/voxygen/voxel/humanoid_head_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_head_manifest.ron
@@ -27,6 +27,7 @@
             Some(("figure.hair.human.male-20", (-3, -4, -7))),
         ],
         beard: [            
+            None,
             Some(("figure.beard.human.human-0", (4, 6, -2))),
             Some(("figure.beard.human.human-1", (5, 10, -2))),
             Some(("figure.beard.human.human-2", (3, 7, -3))),         
@@ -92,17 +93,24 @@
         ],
     ),	
     (Orc, Female): (
-        offset: (-8.0, -3.0, -6.0),
-        head: ("figure.head.orc.female", (0, 2, 0)),
-        eyes: ("figure.eyes.orc.female-0", (3, 9, 2)),
+        offset: (-8.0, -2.5, -6.0),
+        head: ("figure.head.orc.female", (0, 1, 0)),
+        eyes: ("figure.eyes.orc.female-0", (3, 8, 2)),
         hair: [
-            Some(("figure.hair.orc.female", (5, -2, 0))),
+            Some(("figure.hair.orc.female-0", (-2, -8, 0))),
+            Some(("figure.hair.orc.female-1", (-2, -8, 0))),
+            Some(("figure.hair.orc.female-2", (-2, -8, 0))), 
+            Some(("figure.hair.orc.female-3", (-2, -8, -4))),      
+            Some(("figure.hair.orc.female-4", (-2, -8, 0))), 
+            Some(("figure.hair.orc.female-5", (-2, -8, -4))),  
+            Some(("figure.hair.orc.female-6", (-2, -8, -4))),    
         ],
         beard: [None],
         accessory: [
             None,
-            Some(("figure.accessory.orc.earring-female-0", (2, 5, 1))), 
-            Some(("figure.accessory.orc.warpaint-female-0", (3, 5, 1))),
+            Some(("figure.accessory.orc.earring-female-0", (2, 4, 1))), 
+            Some(("figure.accessory.orc.warpaint-female-0", (-2, -4, -7))),
+            Some(("figure.accessory.orc.warpaint-female-1", (-2, -4, -7))),
             ],
     ),
     (Elf, Male): (
@@ -239,6 +247,7 @@
             Some(("figure.hair.danari.male-1", (3, 1, 2))),
         ],  
         beard: [
+            None,
             Some(("figure.beard.danari.danari-0", (4, 6, -1))),
             ],
         accessory: [            
diff --git a/assets/voxygen/voxel/npc/eagle/female/head.vox b/assets/voxygen/voxel/npc/eagle/female/head.vox
new file mode 100644
index 0000000000..3aeffecc8c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491
+size 1608
diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
new file mode 100644
index 0000000000..38e5e2c5c6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6e82c2c806c245f8fdebb830b0763a1aa796593c041ad4ace556c8e413f5aa9
+size 55651
diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
new file mode 100644
index 0000000000..a2ec2f7233
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ecb3129efdb691a6b81d691bd34e01920bf0c9703d9e76bd6fafaeac978146f
+size 55651
diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox
new file mode 100644
index 0000000000..f7bfb10410
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/tail.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10fe121790e8434a04bcfc1288693d8ac30171aa991a15e7533fcb62290e2368
+size 55675
diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox
new file mode 100644
index 0000000000..c299b03331
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/torso.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f2df57bf231b5cdf34ce748f51394bc5fa67fff021244408babd2fbb40ce7f3
+size 56619
diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
new file mode 100644
index 0000000000..c989207c3c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9c4bc7aac5811e9189116501858b5a1cf12187e6e08d6798e6810c04154ffdf
+size 56027
diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
new file mode 100644
index 0000000000..b2aa360724
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65369f781827ace2267b450a5c40027748f1077a1245d5493c166571349af727
+size 56027
diff --git a/assets/voxygen/voxel/npc/eagle/male/head.vox b/assets/voxygen/voxel/npc/eagle/male/head.vox
new file mode 100644
index 0000000000..3aeffecc8c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491
+size 1608
diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox
new file mode 100644
index 0000000000..38e5e2c5c6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6e82c2c806c245f8fdebb830b0763a1aa796593c041ad4ace556c8e413f5aa9
+size 55651
diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox
new file mode 100644
index 0000000000..a2ec2f7233
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ecb3129efdb691a6b81d691bd34e01920bf0c9703d9e76bd6fafaeac978146f
+size 55651
diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox
new file mode 100644
index 0000000000..f7bfb10410
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/tail.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10fe121790e8434a04bcfc1288693d8ac30171aa991a15e7533fcb62290e2368
+size 55675
diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox
new file mode 100644
index 0000000000..c299b03331
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/torso.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f2df57bf231b5cdf34ce748f51394bc5fa67fff021244408babd2fbb40ce7f3
+size 56619
diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox
new file mode 100644
index 0000000000..c989207c3c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9c4bc7aac5811e9189116501858b5a1cf12187e6e08d6798e6810c04154ffdf
+size 56027
diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox
new file mode 100644
index 0000000000..b2aa360724
--- /dev/null
+++ b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65369f781827ace2267b450a5c40027748f1077a1245d5493c166571349af727
+size 56027
diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
index 6afce36256..8e3d3b12d6 100644
--- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
@@ -386,7 +386,7 @@
             central: ("npc.lion.male.ears"),
         ),
         tail: (
-            offset: (-0.5, -1.0, -8.0),
+            offset: (-0.5, -1.0, -1.0),
             central: ("npc.lion.male.tail"),
         ),
     ),
@@ -417,7 +417,7 @@
         ),
         tail: (
             offset: (-0.5, -1.0, -1.0),
-            central: ("npc.lion.male.tail"),
+            central: ("npc.lion.female.tail"),
         ),
     ),
     (Tarasque, Male): (
diff --git a/assets/world/structure/dungeon/meso_sewer_temple.vox b/assets/world/structure/dungeon/meso_sewer_temple.vox
index a4b07531d5..212170d4ed 100644
--- a/assets/world/structure/dungeon/meso_sewer_temple.vox
+++ b/assets/world/structure/dungeon/meso_sewer_temple.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8245d680ce679cbbe9c88fce5111151a22922623824007a95ca95f382de62e7
+oid sha256:c4c8d26d1273cff385a660bb3d8aaeda94263e77c9fdcda63ceaac7366d9de03
 size 1384956
diff --git a/chat-cli/src/main.rs b/chat-cli/src/main.rs
index b74c1ea87f..312094231c 100644
--- a/chat-cli/src/main.rs
+++ b/chat-cli/src/main.rs
@@ -51,7 +51,9 @@ fn main() {
     println!("Players online: {:?}", client.get_players());
 
     client
-        .register(comp::Player::new(username, None), password)
+        .register(username, password, |provider| {
+            provider == "https://auth.veloren.net"
+        })
         .unwrap();
 
     let (tx, rx) = mpsc::channel();
diff --git a/client/Cargo.toml b/client/Cargo.toml
index a67b2db65d..9d649f0b01 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,3 +15,4 @@ log = "0.4.8"
 specs = "0.15.1"
 vek = { version = "0.9.9", features = ["serde"] }
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
diff --git a/client/src/error.rs b/client/src/error.rs
index 154387e16c..b81e806286 100644
--- a/client/src/error.rs
+++ b/client/src/error.rs
@@ -1,3 +1,4 @@
+use authc::AuthClientError;
 use common::net::PostError;
 
 #[derive(Debug)]
@@ -7,11 +8,18 @@ pub enum Error {
     ServerTimeout,
     ServerShutdown,
     TooManyPlayers,
-    InvalidAuth,
+    AlreadyLoggedIn,
+    AuthErr(String),
+    AuthClientError(AuthClientError),
+    AuthServerNotTrusted,
     //TODO: InvalidAlias,
     Other(String),
 }
 
 impl From<PostError> for Error {
-    fn from(err: PostError) -> Self { Error::Network(err) }
+    fn from(err: PostError) -> Self { Self::Network(err) }
+}
+
+impl From<AuthClientError> for Error {
+    fn from(err: AuthClientError) -> Self { Self::AuthClientError(err) }
 }
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 90ecb651c6..6d7b6f7405 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -5,6 +5,7 @@ pub mod error;
 
 // Reexports
 pub use crate::error::Error;
+pub use authc::AuthClientError;
 pub use specs::{
     join::Join,
     saveload::{Marker, MarkerAllocator},
@@ -13,10 +14,13 @@ pub use specs::{
 
 use byteorder::{ByteOrder, LittleEndian};
 use common::{
-    comp::{self, ControlEvent, Controller, ControllerInputs, InventoryManip},
+    comp::{
+        self, ControlEvent, Controller, ControllerInputs, InventoryManip, InventoryUpdateEvent,
+    },
+    event::{EventBus, SfxEvent, SfxEventItem},
     msg::{
         validate_chat_msg, ChatMsgValidationError, ClientMsg, ClientState, PlayerListUpdate,
-        RequestStateError, ServerError, ServerInfo, ServerMsg, MAX_BYTES_CHAT_MSG,
+        RegisterError, RequestStateError, ServerInfo, ServerMsg, MAX_BYTES_CHAT_MSG,
     },
     net::PostBox,
     state::State,
@@ -39,11 +43,11 @@ use vek::*;
 // The duration of network inactivity until the player is kicked
 // @TODO: in the future, this should be configurable on the server
 // and be provided to the client
-const SERVER_TIMEOUT: Duration = Duration::from_secs(20);
+const SERVER_TIMEOUT: f64 = 20.0;
 
 // After this duration has elapsed, the user will begin getting kick warnings in
 // their chat window
-const SERVER_TIMEOUT_GRACE_PERIOD: Duration = Duration::from_secs(14);
+const SERVER_TIMEOUT_GRACE_PERIOD: f64 = 14.0;
 
 pub enum Event {
     Chat {
@@ -63,8 +67,8 @@ pub struct Client {
 
     postbox: PostBox<ClientMsg, ServerMsg>,
 
-    last_server_ping: Instant,
-    last_server_pong: Instant,
+    last_server_ping: f64,
+    last_server_pong: f64,
     last_ping_delta: f64,
 
     tick: u64,
@@ -85,13 +89,13 @@ impl Client {
         let mut postbox = PostBox::to(addr)?;
 
         // Wait for initial sync
-        let (state, entity, server_info, world_map) = match postbox.next_message() {
-            Some(ServerMsg::InitialSync {
+        let (state, entity, server_info, world_map) = match postbox.next_message()? {
+            ServerMsg::InitialSync {
                 entity_package,
                 server_info,
                 time_of_day,
                 world_map: (map_size, world_map),
-            }) => {
+            } => {
                 // TODO: Display that versions don't match in Voxygen
                 if server_info.git_hash != common::util::GIT_HASH.to_string() {
                     log::warn!(
@@ -104,6 +108,8 @@ impl Client {
                     );
                 }
 
+                log::debug!("Auth Server: {:?}", server_info.auth_provider);
+
                 // Initialize `State`
                 let mut state = State::default();
                 let entity = state.ecs_mut().apply_entity_package(entity_package);
@@ -128,9 +134,7 @@ impl Client {
 
                 (state, entity, server_info, (world_map, map_size))
             },
-            Some(ServerMsg::Error(ServerError::TooManyPlayers)) => {
-                return Err(Error::TooManyPlayers);
-            },
+            ServerMsg::TooManyPlayers => return Err(Error::TooManyPlayers),
             _ => return Err(Error::ServerWentMad),
         };
 
@@ -151,8 +155,8 @@ impl Client {
 
             postbox,
 
-            last_server_ping: Instant::now(),
-            last_server_pong: Instant::now(),
+            last_server_ping: 0.0,
+            last_server_pong: 0.0,
             last_ping_delta: 0.0,
 
             tick: 0,
@@ -171,16 +175,40 @@ impl Client {
     }
 
     /// Request a state transition to `ClientState::Registered`.
-    pub fn register(&mut self, player: comp::Player, password: String) -> Result<(), Error> {
-        self.postbox
-            .send_message(ClientMsg::Register { player, password });
+    pub fn register(
+        &mut self,
+        username: String,
+        password: String,
+        mut auth_trusted: impl FnMut(&str) -> bool,
+    ) -> Result<(), Error> {
+        // Authentication
+        let token_or_username = self.server_info.auth_provider.as_ref().map(|addr|
+                // Query whether this is a trusted auth server
+                if auth_trusted(&addr) {
+                    Ok(authc::AuthClient::new(addr)
+                        .sign_in(&username, &password)?
+                        .serialize())
+                } else {
+                    Err(Error::AuthServerNotTrusted)
+                }
+        ).unwrap_or(Ok(username))?;
+
+        self.postbox.send_message(ClientMsg::Register {
+            view_distance: self.view_distance,
+            token_or_username,
+        });
         self.client_state = ClientState::Pending;
+
         loop {
-            match self.postbox.next_message() {
-                Some(ServerMsg::StateAnswer(Err((RequestStateError::Denied, _)))) => {
-                    break Err(Error::InvalidAuth);
+            match self.postbox.next_message()? {
+                ServerMsg::StateAnswer(Err((RequestStateError::RegisterDenied(err), state))) => {
+                    self.client_state = state;
+                    break Err(match err {
+                        RegisterError::AlreadyLoggedIn => Error::AlreadyLoggedIn,
+                        RegisterError::AuthError(err) => Error::AuthErr(err),
+                    });
                 },
-                Some(ServerMsg::StateAnswer(Ok(ClientState::Registered))) => break Ok(()),
+                ServerMsg::StateAnswer(Ok(ClientState::Registered)) => break Ok(()),
                 _ => {},
             }
         }
@@ -194,10 +222,7 @@ impl Client {
     }
 
     /// Send disconnect message to the server
-    pub fn request_logout(&mut self) {
-        self.postbox.send_message(ClientMsg::Disconnect);
-        self.client_state = ClientState::Pending;
-    }
+    pub fn request_logout(&mut self) { self.postbox.send_message(ClientMsg::Disconnect); }
 
     /// Request a state transition to `ClientState::Registered` from an ingame
     /// state.
@@ -377,13 +402,14 @@ impl Client {
                 }
             }
         }
+
         // Handle new messages from the server.
         frontend_events.append(&mut self.handle_new_messages()?);
 
         // 3) Update client local data
 
         // 4) Tick the client's LocalState
-        self.state.tick(dt, add_foreign_systems);
+        self.state.tick(dt, add_foreign_systems, true);
 
         // 5) Terrain
         let pos = self
@@ -479,9 +505,9 @@ impl Client {
         }
 
         // Send a ping to the server once every second
-        if Instant::now().duration_since(self.last_server_ping) > Duration::from_secs(1) {
+        if self.state.get_time() - self.last_server_ping > 1. {
             self.postbox.send_message(ClientMsg::Ping);
-            self.last_server_ping = Instant::now();
+            self.last_server_ping = self.state.get_time();
         }
 
         // 6) Update the server about the player's physics attributes.
@@ -526,16 +552,14 @@ impl Client {
         // Check that we have an valid connection.
         // Use the last ping time as a 1s rate limiter, we only notify the user once per
         // second
-        if Instant::now().duration_since(self.last_server_ping) > Duration::from_secs(1) {
-            let duration_since_last_pong = Instant::now().duration_since(self.last_server_pong);
+        if self.state.get_time() - self.last_server_ping > 1. {
+            let duration_since_last_pong = self.state.get_time() - self.last_server_pong;
 
             // Dispatch a notification to the HUD warning they will be kicked in {n} seconds
-            if duration_since_last_pong.as_secs() >= SERVER_TIMEOUT_GRACE_PERIOD.as_secs() {
-                if let Some(seconds_until_kick) =
-                    SERVER_TIMEOUT.checked_sub(duration_since_last_pong)
-                {
+            if duration_since_last_pong >= SERVER_TIMEOUT_GRACE_PERIOD {
+                if self.state.get_time() - duration_since_last_pong > 0. {
                     frontend_events.push(Event::DisconnectionNotification(
-                        seconds_until_kick.as_secs(),
+                        (self.state.get_time() - duration_since_last_pong).round() as u64,
                     ));
                 }
             }
@@ -546,10 +570,8 @@ impl Client {
         if new_msgs.len() > 0 {
             for msg in new_msgs {
                 match msg {
-                    ServerMsg::Error(e) => match e {
-                        ServerError::TooManyPlayers => return Err(Error::ServerWentMad),
-                        ServerError::InvalidAuth => return Err(Error::InvalidAuth),
-                        //TODO: ServerError::InvalidAlias => return Err(Error::InvalidAlias),
+                    ServerMsg::TooManyPlayers => {
+                        return Err(Error::ServerWentMad);
                     },
                     ServerMsg::Shutdown => return Err(Error::ServerShutdown),
                     ServerMsg::InitialSync { .. } => return Err(Error::ServerWentMad),
@@ -589,11 +611,10 @@ impl Client {
 
                     ServerMsg::Ping => self.postbox.send_message(ClientMsg::Pong),
                     ServerMsg::Pong => {
-                        self.last_server_pong = Instant::now();
+                        self.last_server_pong = self.state.get_time();
 
-                        self.last_ping_delta = Instant::now()
-                            .duration_since(self.last_server_ping)
-                            .as_secs_f64();
+                        self.last_ping_delta =
+                            (self.state.get_time() - self.last_server_ping).round();
                     },
                     ServerMsg::ChatMsg { message, chat_type } => {
                         frontend_events.push(Event::Chat { message, chat_type })
@@ -669,8 +690,26 @@ impl Client {
                             self.state.write_component(entity, character_state);
                         }
                     },
-                    ServerMsg::InventoryUpdate(inventory) => {
-                        self.state.write_component(self.entity, inventory)
+                    ServerMsg::InventoryUpdate(inventory, event) => {
+                        match event {
+                            InventoryUpdateEvent::CollectFailed => {
+                                frontend_events.push(Event::Chat {
+                                    message: String::from(
+                                        "Failed to collect item. Your inventory may be full!",
+                                    ),
+                                    chat_type: ChatType::Meta,
+                                })
+                            },
+                            _ => {
+                                self.state.write_component(self.entity, inventory);
+                            },
+                        }
+
+                        self.state
+                            .ecs()
+                            .read_resource::<EventBus<SfxEventItem>>()
+                            .emitter()
+                            .emit(SfxEventItem::at_player_position(SfxEvent::Inventory(event)));
                     },
                     ServerMsg::TerrainChunkUpdate { key, chunk } => {
                         if let Ok(chunk) = chunk {
@@ -687,10 +726,6 @@ impl Client {
                         self.client_state = state;
                     },
                     ServerMsg::StateAnswer(Err((error, state))) => {
-                        if error == RequestStateError::Denied {
-                            warn!("Connection denied!");
-                            return Err(Error::InvalidAuth);
-                        }
                         warn!(
                             "StateAnswer: {:?}. Server thinks client is in state {:?}.",
                             error, state
@@ -698,13 +733,14 @@ impl Client {
                     },
                     ServerMsg::Disconnect => {
                         frontend_events.push(Event::Disconnect);
+                        self.postbox.send_message(ClientMsg::Terminate);
                     },
                 }
             }
         } else if let Some(err) = self.postbox.error() {
             return Err(err.into());
         // We regularily ping in the tick method
-        } else if Instant::now().duration_since(self.last_server_pong) > SERVER_TIMEOUT {
+        } else if self.state.get_time() - self.last_server_pong > SERVER_TIMEOUT {
             return Err(Error::ServerTimeout);
         }
         Ok(frontend_events)
diff --git a/common/Cargo.toml b/common/Cargo.toml
index f28f688c43..f70c8c1b6c 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -30,9 +30,10 @@ hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
 find_folder = "0.3.0"
 parking_lot = "0.9.0"
 crossbeam = "=0.7.2"
-notify = "5.0.0-pre.1"
+notify = "5.0.0-pre.2"
 indexmap = "1.3.0"
 sum_type = "0.2.0"
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs
index 477250c767..6447925f3a 100644
--- a/common/src/comp/body/bird_medium.rs
+++ b/common/src/comp/body/bird_medium.rs
@@ -31,6 +31,7 @@ pub enum Species {
     Chicken = 1,
     Goose = 2,
     Peacock = 3,
+    Eagle = 4,
 }
 
 /// Data representing per-species generic data.
@@ -42,6 +43,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub chicken: SpeciesMeta,
     pub goose: SpeciesMeta,
     pub peacock: SpeciesMeta,
+    pub eagle: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -54,15 +56,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Chicken => &self.chicken,
             Species::Goose => &self.goose,
             Species::Peacock => &self.peacock,
+            Species::Eagle => &self.eagle,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 4] = [
+pub const ALL_SPECIES: [Species; 5] = [
     Species::Duck,
     Species::Chicken,
     Species::Goose,
     Species::Peacock,
+    Species::Eagle,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs
index 3239141073..557956e790 100644
--- a/common/src/comp/body/humanoid.rs
+++ b/common/src/comp/body/humanoid.rs
@@ -131,10 +131,10 @@ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 11] = [
     //(228, 208, 147), // Gold Blonde
     //(228, 223, 141), // Platinum Blonde
     (199, 131, 58), // Summer Blonde
-    (107, 76, 51),  // Oak Brown
-    //(203, 154, 98),  // Light Brown
-    (64, 32, 18),  // Chocolate Brown
-    (86, 72, 71),  // Ash Brown
+    (107, 76, 51),  // Oak Skin4
+    //(203, 154, 98),  // Light Skin4
+    (64, 32, 18),  // Skin7 Skin4
+    (86, 72, 71),  // Ash Skin4
     (57, 56, 61),  // Raven Black
     (101, 83, 95), // Matte Purple
     (101, 57, 90), // Witch Purple
@@ -148,10 +148,10 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
     (199, 131, 58),  // Summer Blonde
-    (107, 76, 51),   // Oak Brown
-    (203, 154, 98),  // Light Brown
-    (64, 32, 18),    // Chocolate Brown
-    (86, 72, 71),    // Ash Brown
+    (107, 76, 51),   // Oak Skin4
+    (203, 154, 98),  // Light Skin4
+    (64, 32, 18),    // Skin7 Skin4
+    (86, 72, 71),    // Ash Skin4
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
@@ -172,10 +172,10 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
     (199, 131, 58),  // Summer Blonde
-    (107, 76, 51),   // Oak Brown
-    (203, 154, 98),  // Light Brown
-    (64, 32, 18),    // Chocolate Brown
-    (86, 72, 71),    // Ash Brown
+    (107, 76, 51),   // Oak Skin4
+    (203, 154, 98),  // Light Skin4
+    (64, 32, 18),    // Skin7 Skin4
+    (86, 72, 71),    // Ash Skin4
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
@@ -195,10 +195,10 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
     (199, 131, 58),  // Summer Blonde
-    (107, 76, 51),   // Oak Brown
-    (203, 154, 98),  // Light Brown
-    (64, 32, 18),    // Chocolate Brown
-    (86, 72, 71),    // Ash Brown
+    (107, 76, 51),   // Oak Skin4
+    (203, 154, 98),  // Light Skin4
+    (64, 32, 18),    // Skin7 Skin4
+    (86, 72, 71),    // Ash Skin4
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
@@ -215,11 +215,11 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [
 ];
 pub const ORC_HAIR_COLORS: [(u8, u8, u8); 10] = [
     (66, 66, 59), // Wise Grey
-    //(107, 76, 51),  // Oak Brown
-    //(203, 154, 98), // Light Brown
-    (64, 32, 18),  // Chocolate Brown
-    (54, 30, 26),  // Dark Chocolate
-    (86, 72, 71),  // Ash Brown
+    //(107, 76, 51),  // Oak Skin4
+    //(203, 154, 98), // Light Skin4
+    (64, 32, 18),  // Skin7 Skin4
+    (54, 30, 26),  // Dark Skin7
+    (86, 72, 71),  // Ash Skin4
     (57, 56, 61),  // Raven Black
     (101, 83, 95), // Matte Purple
     (101, 57, 90), // Witch Purple
@@ -232,10 +232,10 @@ pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (228, 208, 147), // Gold Blonde
     //(228, 223, 141), // Platinum Blonde
     (199, 131, 58),  // Summer Blonde
-    (107, 76, 51),   // Oak Brown
-    (203, 154, 98),  // Light Brown
-    (64, 32, 18),    // Chocolate Brown
-    (86, 72, 71),    // Ash Brown
+    (107, 76, 51),   // Oak Skin4
+    (203, 154, 98),  // Light Skin4
+    (64, 32, 18),    // Skin7 Skin4
+    (86, 72, 71),    // Ash Skin4
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
@@ -261,30 +261,59 @@ pub const DANARI_SKIN_COLORS: [Skin; 4] = [
     Skin::DanariThree,
     Skin::DanariFour,
 ];
-pub const DWARF_SKIN_COLORS: [Skin; 5] = [
-    Skin::Pale,
-    Skin::White,
-    Skin::Tanned,
+pub const DWARF_SKIN_COLORS: [Skin; 14] = [
+    Skin::Skin1,
+    Skin::Skin2,
+    Skin::Skin3,
+    Skin::Skin4,
+    Skin::Skin5,
+    Skin::Skin6,
+    Skin::Skin7,
+    Skin::Skin8,
+    Skin::Skin9,
+    Skin::Skin10,
+    Skin::Skin11,
+    Skin::Skin12,
     Skin::Iron,
     Skin::Steel,
 ];
-pub const ELF_SKIN_COLORS: [Skin; 7] = [
-    Skin::Pale,
+pub const ELF_SKIN_COLORS: [Skin; 14] = [
+    Skin::Skin1,
+    Skin::Skin2,
+    Skin::Skin3,
+    Skin::Skin5,
+    Skin::Skin6,
+    Skin::Skin7,
+    Skin::Skin8,
+    Skin::Skin9,
+    Skin::Skin10,
+    Skin::Skin11,
+    Skin::Skin12,
     Skin::ElfOne,
     Skin::ElfTwo,
     Skin::ElfThree,
-    Skin::White,
-    Skin::Tanned,
-    Skin::TannedBrown,
 ];
-pub const HUMAN_SKIN_COLORS: [Skin; 5] = [
-    Skin::Pale,
-    Skin::White,
-    Skin::Tanned,
-    Skin::TannedBrown,
-    Skin::TannedDarkBrown,
+pub const HUMAN_SKIN_COLORS: [Skin; 18] = [
+    Skin::Skin1,
+    Skin::Skin2,
+    Skin::Skin3,
+    Skin::Skin4,
+    Skin::Skin5,
+    Skin::Skin6,
+    Skin::Skin7,
+    Skin::Skin8,
+    Skin::Skin9,
+    Skin::Skin10,
+    Skin::Skin11,
+    Skin::Skin12,
+    Skin::Skin13,
+    Skin::Skin14,
+    Skin::Skin15,
+    Skin::Skin16,
+    Skin::Skin17,
+    Skin::Skin18,
 ];
-pub const ORC_SKIN_COLORS: [Skin; 4] = [Skin::OrcOne, Skin::OrcTwo, Skin::OrcThree, Skin::Brown];
+pub const ORC_SKIN_COLORS: [Skin; 4] = [Skin::OrcOne, Skin::OrcTwo, Skin::OrcThree, Skin::OrcFour];
 pub const UNDEAD_SKIN_COLORS: [Skin; 3] = [Skin::UndeadOne, Skin::UndeadTwo, Skin::UndeadThree];
 
 // Eye colors
@@ -293,22 +322,31 @@ pub const DANARI_EYE_COLORS: [EyeColor; 3] = [
     EyeColor::LoyalBrown,
     EyeColor::ViciousRed,
 ];
-pub const DWARF_EYE_COLORS: [EyeColor; 3] = [
+pub const DWARF_EYE_COLORS: [EyeColor; 4] = [
     EyeColor::CuriousGreen,
     EyeColor::LoyalBrown,
     EyeColor::NobleBlue,
+    EyeColor::CornflowerBlue,
 ];
-pub const ELF_EYE_COLORS: [EyeColor; 3] = [
+pub const ELF_EYE_COLORS: [EyeColor; 4] = [
     EyeColor::NobleBlue,
+    EyeColor::CornflowerBlue,
     EyeColor::CuriousGreen,
     EyeColor::LoyalBrown,
 ];
-pub const HUMAN_EYE_COLORS: [EyeColor; 3] = [
+pub const HUMAN_EYE_COLORS: [EyeColor; 4] = [
     EyeColor::NobleBlue,
+    EyeColor::CornflowerBlue,
     EyeColor::CuriousGreen,
     EyeColor::LoyalBrown,
 ];
-pub const ORC_EYE_COLORS: [EyeColor; 2] = [EyeColor::LoyalBrown, EyeColor::ExoticPurple];
+pub const ORC_EYE_COLORS: [EyeColor; 5] = [
+    EyeColor::LoyalBrown,
+    EyeColor::ExoticPurple,
+    EyeColor::AmberOrange,
+    EyeColor::PineGreen,
+    EyeColor::CornflowerBlue,
+];
 pub const UNDEAD_EYE_COLORS: [EyeColor; 5] = [
     EyeColor::ViciousRed,
     EyeColor::PumpkinOrange,
@@ -365,7 +403,7 @@ impl Race {
         self.skin_colors()
             .get(val as usize)
             .copied()
-            .unwrap_or(Skin::Tanned)
+            .unwrap_or(Skin::Skin3)
     }
 
     pub fn num_skin_colors(self) -> u8 { self.skin_colors().len() as u8 }
@@ -389,7 +427,7 @@ impl Race {
             (Race::Elf, BodyType::Male) => 4,
             (Race::Human, BodyType::Female) => 19,
             (Race::Human, BodyType::Male) => 17,
-            (Race::Orc, BodyType::Female) => 1,
+            (Race::Orc, BodyType::Female) => 7,
             (Race::Orc, BodyType::Male) => 8,
             (Race::Undead, BodyType::Female) => 4,
             (Race::Undead, BodyType::Male) => 3,
@@ -406,7 +444,7 @@ impl Race {
             (Race::Elf, BodyType::Male) => 1,
             (Race::Human, BodyType::Female) => 1,
             (Race::Human, BodyType::Male) => 1,
-            (Race::Orc, BodyType::Female) => 3,
+            (Race::Orc, BodyType::Female) => 4,
             (Race::Orc, BodyType::Male) => 5,
             (Race::Undead, BodyType::Female) => 1,
             (Race::Undead, BodyType::Male) => 1,
@@ -534,6 +572,10 @@ pub enum EyeColor {
     MagicPurple = 7,
     ToxicGreen = 8,
     ExoticPurple = 9,
+    SulfurYellow = 10,
+    AmberOrange = 11,
+    PineGreen = 12,
+    CornflowerBlue = 13,
 }
 impl EyeColor {
     pub fn light_rgb(self) -> Rgb<u8> {
@@ -548,6 +590,10 @@ impl EyeColor {
             EyeColor::MagicPurple => Rgb::new(137, 4, 177),
             EyeColor::ToxicGreen => Rgb::new(1, 223, 1),
             EyeColor::ExoticPurple => Rgb::new(95, 32, 111),
+            EyeColor::SulfurYellow => Rgb::new(235, 198, 94),
+            EyeColor::AmberOrange => Rgb::new(137, 46, 1),
+            EyeColor::PineGreen => Rgb::new(0, 78, 56),
+            EyeColor::CornflowerBlue => Rgb::new(18, 66, 90),
         }
     }
 
@@ -563,6 +609,10 @@ impl EyeColor {
             EyeColor::MagicPurple => Rgb::new(110, 3, 143),
             EyeColor::ToxicGreen => Rgb::new(1, 185, 1),
             EyeColor::ExoticPurple => Rgb::new(69, 23, 80),
+            EyeColor::SulfurYellow => Rgb::new(209, 176, 84),
+            EyeColor::AmberOrange => Rgb::new(112, 40, 1),
+            EyeColor::PineGreen => Rgb::new(0, 54, 38),
+            EyeColor::CornflowerBlue => Rgb::new(13, 47, 64),
         }
     }
 
@@ -580,12 +630,12 @@ pub const ALL_ACCESSORIES: [Accessory; 2] = [Accessory::Nothing, Accessory::Some
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Skin {
-    Pale = 0,
-    White = 1,
-    Tanned = 2,
-    Brown = 3,
-    TannedBrown = 4,
-    TannedDarkBrown = 5,
+    Skin1 = 0,
+    Skin2 = 1,
+    Skin3 = 2,
+    Skin4 = 3,
+    Skin5 = 4,
+    Skin6 = 5,
     Iron = 6,
     Steel = 7,
     DanariOne = 8,
@@ -601,16 +651,41 @@ pub enum Skin {
     UndeadOne = 18,
     UndeadTwo = 19,
     UndeadThree = 20,
+    Skin7 = 21,
+    Skin8 = 22,
+    Skin9 = 23,
+    Skin10 = 24,
+    Skin11 = 25,
+    Skin12 = 26,
+    Skin13 = 27,
+    Skin14 = 28,
+    Skin15 = 29,
+    Skin16 = 30,
+    Skin17 = 31,
+    Skin18 = 32,
+    OrcFour = 33,
 }
 impl Skin {
     pub fn rgb(self) -> Rgb<u8> {
         let color = match self {
-            Self::Pale => (252, 211, 179),
-            Self::White => (253, 195, 164),
-            Self::Tanned => (222, 181, 151),
-            Self::Brown => (123, 80, 45),
-            Self::TannedBrown => (135, 70, 50),
-            Self::TannedDarkBrown => (116, 61, 43),
+            Self::Skin1 => (255, 229, 200),
+            Self::Skin2 => (255, 218, 190),
+            Self::Skin3 => (255, 206, 180),
+            Self::Skin4 => (255, 195, 170),
+            Self::Skin5 => (240, 184, 160),
+            Self::Skin6 => (225, 172, 150),
+            Self::Skin7 => (210, 161, 140),
+            Self::Skin8 => (195, 149, 130),
+            Self::Skin9 => (180, 138, 120),
+            Self::Skin10 => (165, 126, 110),
+            Self::Skin11 => (150, 114, 100),
+            Self::Skin12 => (135, 103, 90),
+            Self::Skin13 => (120, 92, 80),
+            Self::Skin14 => (105, 80, 70),
+            Self::Skin15 => (90, 69, 60),
+            Self::Skin16 => (75, 57, 50),
+            Self::Skin17 => (60, 46, 40),
+            Self::Skin18 => (45, 34, 30),
             Self::Iron => (135, 113, 95),
             Self::Steel => (108, 94, 86),
             Self::DanariOne => (104, 168, 196),
@@ -623,6 +698,7 @@ impl Skin {
             Self::OrcOne => (61, 130, 42),
             Self::OrcTwo => (82, 117, 36),
             Self::OrcThree => (71, 94, 42),
+            Self::OrcFour => (97, 54, 29),
             Self::UndeadOne => (240, 243, 239),
             Self::UndeadTwo => (178, 178, 178),
             Self::UndeadThree => (145, 135, 121),
@@ -632,12 +708,24 @@ impl Skin {
 
     pub fn light_rgb(self) -> Rgb<u8> {
         let color = match self {
-            Self::Pale => (255, 227, 193),
-            Self::White => (255, 210, 180),
-            Self::Tanned => (239, 197, 164),
-            Self::Brown => (150, 104, 68),
-            Self::TannedBrown => (148, 85, 64),
-            Self::TannedDarkBrown => (132, 74, 56),
+            Self::Skin1 => (255, 229, 200),
+            Self::Skin2 => (255, 218, 190),
+            Self::Skin3 => (255, 206, 180),
+            Self::Skin4 => (255, 195, 170),
+            Self::Skin5 => (240, 184, 160),
+            Self::Skin6 => (225, 172, 150),
+            Self::Skin7 => (210, 161, 140),
+            Self::Skin8 => (195, 149, 130),
+            Self::Skin9 => (180, 138, 120),
+            Self::Skin10 => (165, 126, 110),
+            Self::Skin11 => (150, 114, 100),
+            Self::Skin12 => (135, 103, 90),
+            Self::Skin13 => (120, 92, 80),
+            Self::Skin14 => (105, 80, 70),
+            Self::Skin15 => (90, 69, 60),
+            Self::Skin16 => (75, 57, 50),
+            Self::Skin17 => (60, 46, 40),
+            Self::Skin18 => (45, 34, 30),
             Self::Iron => (144, 125, 106),
             Self::Steel => (120, 107, 99),
             Self::DanariOne => (116, 176, 208),
@@ -650,6 +738,7 @@ impl Skin {
             Self::OrcOne => (83, 165, 56),
             Self::OrcTwo => (92, 132, 46),
             Self::OrcThree => (84, 110, 54),
+            Self::OrcFour => (97, 54, 29),
             Self::UndeadOne => (254, 252, 251),
             Self::UndeadTwo => (190, 192, 191),
             Self::UndeadThree => (160, 151, 134),
@@ -659,12 +748,24 @@ impl Skin {
 
     pub fn dark_rgb(self) -> Rgb<u8> {
         let color = match self {
-            Self::Pale => (229, 192, 163),
-            Self::White => (239, 179, 150),
-            Self::Tanned => (208, 167, 135),
-            Self::Brown => (106, 63, 30),
-            Self::TannedBrown => (122, 58, 40),
-            Self::TannedDarkBrown => (100, 47, 32),
+            Self::Skin1 => (242, 217, 189),
+            Self::Skin2 => (242, 207, 189),
+            Self::Skin3 => (242, 197, 172),
+            Self::Skin4 => (242, 186, 162),
+            Self::Skin5 => (212, 173, 150),
+            Self::Skin6 => (212, 163, 142),
+            Self::Skin7 => (196, 151, 132),
+            Self::Skin8 => (181, 139, 121),
+            Self::Skin9 => (168, 129, 113),
+            Self::Skin10 => (153, 117, 103),
+            Self::Skin11 => (138, 105, 92),
+            Self::Skin12 => (122, 93, 82),
+            Self::Skin13 => (107, 82, 72),
+            Self::Skin14 => (92, 70, 62),
+            Self::Skin15 => (77, 59, 51),
+            Self::Skin16 => (61, 47, 41),
+            Self::Skin17 => (48, 37, 32),
+            Self::Skin18 => (33, 25, 22),
             Self::Iron => (124, 99, 82),
             Self::Steel => (96, 81, 72),
             Self::DanariOne => (92, 155, 183),
@@ -677,6 +778,7 @@ impl Skin {
             Self::OrcOne => (55, 114, 36),
             Self::OrcTwo => (70, 104, 29),
             Self::OrcThree => (60, 83, 32),
+            Self::OrcFour => (84, 47, 25),
             Self::UndeadOne => (229, 231, 230),
             Self::UndeadTwo => (165, 166, 164),
             Self::UndeadThree => (130, 122, 106),
diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index da958ee9b9..dd25ef9e4f 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -90,7 +90,7 @@ pub enum Armor {
     Necklace,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum Consumable {
     Apple,
     Cheese,
diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs
index f6833ff923..6861e59d01 100644
--- a/common/src/comp/inventory/mod.rs
+++ b/common/src/comp/inventory/mod.rs
@@ -1,12 +1,16 @@
 pub mod item;
 
 // Reexports
-pub use item::{Debug, Item, ItemKind, Tool};
+pub use item::{Consumable, Debug, Item, ItemKind, Tool};
 
 use crate::assets;
-use specs::{Component, HashMapStorage, NullStorage};
+use specs::{Component, FlaggedStorage, HashMapStorage};
+use specs_idvs::IDVStorage;
 use std::ops::Not;
 
+// The limit on distance between the entity and a collectible (squared)
+pub const MAX_PICKUP_RANGE_SQR: f32 = 64.0;
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Inventory {
     pub slots: Vec<Option<Item>>,
@@ -136,12 +140,38 @@ impl Component for Inventory {
     type Storage = HashMapStorage<Self>;
 }
 
-// ForceUpdate
+#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub enum InventoryUpdateEvent {
+    Init,
+    Used,
+    Consumed(Consumable),
+    Gave,
+    Given,
+    Swapped,
+    Dropped,
+    Collected,
+    CollectFailed,
+    Possession,
+    Debug,
+}
+
+impl Default for InventoryUpdateEvent {
+    fn default() -> Self { Self::Init }
+}
+
 #[derive(Copy, Clone, Debug, Default, Serialize, Deserialize)]
-pub struct InventoryUpdate;
+pub struct InventoryUpdate {
+    event: InventoryUpdateEvent,
+}
+
+impl InventoryUpdate {
+    pub fn new(event: InventoryUpdateEvent) -> Self { Self { event } }
+
+    pub fn event(&self) -> InventoryUpdateEvent { self.event }
+}
 
 impl Component for InventoryUpdate {
-    type Storage = NullStorage<Self>;
+    type Storage = FlaggedStorage<Self, IDVStorage<Self>>;
 }
 
 #[cfg(test)] mod test;
diff --git a/common/src/comp/mod.rs b/common/src/comp/mod.rs
index 24b1be9efb..1c49afab0b 100644
--- a/common/src/comp/mod.rs
+++ b/common/src/comp/mod.rs
@@ -28,7 +28,9 @@ pub use controller::{
 };
 pub use energy::{Energy, EnergySource};
 pub use inputs::CanBuild;
-pub use inventory::{item, Inventory, InventoryUpdate, Item, ItemKind};
+pub use inventory::{
+    item, Inventory, InventoryUpdate, InventoryUpdateEvent, Item, ItemKind, MAX_PICKUP_RANGE_SQR,
+};
 pub use last::Last;
 pub use location::{Waypoint, WaypointArea};
 pub use phys::{ForceUpdate, Gravity, Mass, Ori, PhysicsState, Pos, Scale, Sticky, Vel};
diff --git a/common/src/comp/player.rs b/common/src/comp/player.rs
index 2078b0efb8..b7a6aa1a3d 100644
--- a/common/src/comp/player.rs
+++ b/common/src/comp/player.rs
@@ -1,3 +1,4 @@
+use authc::Uuid;
 use specs::{Component, FlaggedStorage, NullStorage};
 use specs_idvs::IDVStorage;
 
@@ -7,20 +8,26 @@ const MAX_ALIAS_LEN: usize = 32;
 pub struct Player {
     pub alias: String,
     pub view_distance: Option<u32>,
+    uuid: Uuid,
 }
 
 impl Player {
-    pub fn new(alias: String, view_distance: Option<u32>) -> Self {
+    pub fn new(alias: String, view_distance: Option<u32>, uuid: Uuid) -> Self {
         Self {
             alias,
             view_distance,
+            uuid,
         }
     }
 
-    pub fn is_valid(&self) -> bool {
-        self.alias.chars().all(|c| c.is_alphanumeric() || c == '_')
-            && self.alias.len() <= MAX_ALIAS_LEN
+    pub fn is_valid(&self) -> bool { Self::alias_is_valid(&self.alias) }
+
+    pub fn alias_is_valid(alias: &str) -> bool {
+        alias.chars().all(|c| c.is_alphanumeric() || c == '_') && alias.len() <= MAX_ALIAS_LEN
     }
+
+    /// Not to be confused with uid
+    pub fn uuid(&self) -> Uuid { self.uuid }
 }
 
 impl Component for Player {
diff --git a/common/src/event.rs b/common/src/event.rs
index 919ca04c45..0ba59b7274 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -1,5 +1,5 @@
 use crate::{comp, sync::Uid};
-use comp::item::Tool;
+use comp::{item::Tool, InventoryUpdateEvent};
 use parking_lot::Mutex;
 use serde::Deserialize;
 use specs::Entity as EcsEntity;
@@ -9,22 +9,26 @@ use vek::*;
 pub struct SfxEventItem {
     pub sfx: SfxEvent,
     pub pos: Option<Vec3<f32>>,
+    pub vol: Option<f32>,
 }
 
 impl SfxEventItem {
-    pub fn new(sfx: SfxEvent, pos: Option<Vec3<f32>>) -> Self { Self { sfx, pos } }
+    pub fn new(sfx: SfxEvent, pos: Option<Vec3<f32>>, vol: Option<f32>) -> Self {
+        Self { sfx, pos, vol }
+    }
 
-    pub fn at_player_position(sfx: SfxEvent) -> Self { Self { sfx, pos: None } }
+    pub fn at_player_position(sfx: SfxEvent) -> Self {
+        Self {
+            sfx,
+            pos: None,
+            vol: None,
+        }
+    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Deserialize, Hash, Eq)]
 pub enum SfxEvent {
     Idle,
-    PlaceBlock,
-    RemoveBlock,
-    OpenChest,
-    ChatTellReceived,
-    OpenBag,
     Run,
     Roll,
     Climb,
@@ -36,10 +40,9 @@ pub enum SfxEvent {
     Fall,
     ExperienceGained,
     LevelUp,
-    LightLantern,
-    ExtinguishLantern,
-    Attack(Tool),
-    AttackWolf,
+    Wield(Tool),
+    Unwield(Tool),
+    Inventory(InventoryUpdateEvent),
 }
 
 pub enum LocalEvent {
diff --git a/common/src/msg/client.rs b/common/src/msg/client.rs
index b4022483ad..2b2ec63f33 100644
--- a/common/src/msg/client.rs
+++ b/common/src/msg/client.rs
@@ -4,8 +4,8 @@ use vek::*;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ClientMsg {
     Register {
-        player: comp::Player,
-        password: String,
+        view_distance: Option<u32>,
+        token_or_username: String,
     },
     Character {
         name: String,
@@ -35,4 +35,5 @@ pub enum ClientMsg {
         key: Vec2<i32>,
     },
     Disconnect,
+    Terminate,
 }
diff --git a/common/src/msg/mod.rs b/common/src/msg/mod.rs
index 1baee67e15..1c04fece94 100644
--- a/common/src/msg/mod.rs
+++ b/common/src/msg/mod.rs
@@ -6,7 +6,7 @@ pub mod server;
 pub use self::{
     client::ClientMsg,
     ecs_packet::EcsCompPacket,
-    server::{PlayerListUpdate, RequestStateError, ServerError, ServerInfo, ServerMsg},
+    server::{PlayerListUpdate, RegisterError, RequestStateError, ServerInfo, ServerMsg},
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
diff --git a/common/src/msg/server.rs b/common/src/msg/server.rs
index a9244b15f6..c517eec665 100644
--- a/common/src/msg/server.rs
+++ b/common/src/msg/server.rs
@@ -4,23 +4,17 @@ use crate::{
     terrain::{Block, TerrainChunk},
     ChatType,
 };
+use authc::AuthClientError;
 use hashbrown::HashMap;
 use vek::*;
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum RequestStateError {
-    Denied,
-    Already,
-    Impossible,
-    WrongMessage,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServerInfo {
     pub name: String,
     pub description: String,
     pub git_hash: String,
     pub git_date: String,
+    pub auth_provider: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -71,24 +65,37 @@ pub enum ServerMsg {
         entity: u64,
         character_state: comp::CharacterState,
     },
-    InventoryUpdate(comp::Inventory),
+    InventoryUpdate(comp::Inventory, comp::InventoryUpdateEvent),
     TerrainChunkUpdate {
         key: Vec2<i32>,
         chunk: Result<Box<TerrainChunk>, ()>,
     },
     TerrainBlockUpdates(HashMap<Vec3<i32>, Block>),
-    Error(ServerError),
     Disconnect,
     Shutdown,
+    TooManyPlayers,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum ServerError {
-    TooManyPlayers,
-    InvalidAuth,
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RequestStateError {
+    RegisterDenied(RegisterError),
+    Denied,
+    Already,
+    Impossible,
+    WrongMessage,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RegisterError {
+    AlreadyLoggedIn,
+    AuthError(String),
     //TODO: InvalidAlias,
 }
 
+impl From<AuthClientError> for RegisterError {
+    fn from(err: AuthClientError) -> Self { Self::AuthError(err.to_string()) }
+}
+
 impl ServerMsg {
     pub fn chat(message: String) -> ServerMsg {
         ServerMsg::ChatMsg {
diff --git a/common/src/net/post2.rs b/common/src/net/post2.rs
index bae88d25f2..ee9e7303e5 100644
--- a/common/src/net/post2.rs
+++ b/common/src/net/post2.rs
@@ -119,16 +119,16 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
 
     pub fn send_message(&mut self, msg: S) { let _ = self.send_tx.send(msg); }
 
-    pub fn next_message(&mut self) -> Option<R> {
-        if self.error.is_some() {
-            return None;
+    pub fn next_message(&mut self) -> Result<R, Error> {
+        if let Some(e) = self.error.clone() {
+            return Err(e);
         }
 
-        match self.recv_rx.recv().ok()? {
-            Ok(msg) => Some(msg),
+        match self.recv_rx.recv().map_err(|_| Error::ChannelFailure)? {
+            Ok(msg) => Ok(msg),
             Err(e) => {
-                self.error = Some(e);
-                None
+                self.error = Some(e.clone());
+                Err(e)
             },
         }
     }
diff --git a/common/src/state.rs b/common/src/state.rs
index c657785b25..0fbd3202d0 100644
--- a/common/src/state.rs
+++ b/common/src/state.rs
@@ -286,8 +286,35 @@ impl State {
         }
     }
 
+    // Run RegionMap tick to update entity region occupancy
+    pub fn update_region_map(&self) {
+        self.ecs.write_resource::<RegionMap>().tick(
+            self.ecs.read_storage::<comp::Pos>(),
+            self.ecs.read_storage::<comp::Vel>(),
+            self.ecs.entities(),
+        );
+    }
+
+    // Apply terrain changes
+    pub fn apply_terrain_changes(&self) {
+        let mut terrain = self.ecs.write_resource::<TerrainGrid>();
+        let mut modified_blocks = std::mem::replace(
+            &mut self.ecs.write_resource::<BlockChange>().blocks,
+            Default::default(),
+        );
+        // Apply block modifications
+        // Only include in `TerrainChanges` if successful
+        modified_blocks.retain(|pos, block| terrain.set(*pos, *block).is_ok());
+        self.ecs.write_resource::<TerrainChanges>().modified_blocks = modified_blocks;
+    }
+
     /// Execute a single tick, simulating the game state by the given duration.
-    pub fn tick(&mut self, dt: Duration, add_foreign_systems: impl Fn(&mut DispatcherBuilder)) {
+    pub fn tick(
+        &mut self,
+        dt: Duration,
+        add_foreign_systems: impl Fn(&mut DispatcherBuilder),
+        update_terrain_and_regions: bool,
+    ) {
         // Change the time accordingly.
         self.ecs.write_resource::<TimeOfDay>().0 += dt.as_secs_f64() * DAY_CYCLE_FACTOR;
         self.ecs.write_resource::<Time>().0 += dt.as_secs_f64();
@@ -297,12 +324,9 @@ impl State {
         // important physics events.
         self.ecs.write_resource::<DeltaTime>().0 = dt.as_secs_f32().min(MAX_DELTA_TIME);
 
-        // Run RegionMap tick to update entity region occupancy
-        self.ecs.write_resource::<RegionMap>().tick(
-            self.ecs.read_storage::<comp::Pos>(),
-            self.ecs.read_storage::<comp::Vel>(),
-            self.ecs.entities(),
-        );
+        if update_terrain_and_regions {
+            self.update_region_map();
+        }
 
         // Run systems to update the world.
         // Create and run a dispatcher for ecs systems.
@@ -315,16 +339,9 @@ impl State {
 
         self.ecs.maintain();
 
-        // Apply terrain changes
-        let mut terrain = self.ecs.write_resource::<TerrainGrid>();
-        let mut modified_blocks = std::mem::replace(
-            &mut self.ecs.write_resource::<BlockChange>().blocks,
-            Default::default(),
-        );
-        // Apply block modifications
-        // Only include in `TerrainChanges` if successful
-        modified_blocks.retain(|pos, block| terrain.set(*pos, *block).is_ok());
-        self.ecs.write_resource::<TerrainChanges>().modified_blocks = modified_blocks;
+        if update_terrain_and_regions {
+            self.apply_terrain_changes();
+        }
 
         // Process local events
         let events = self.ecs.read_resource::<EventBus<LocalEvent>>().recv_all();
diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs
index f2268d439c..9d8415ea28 100644
--- a/common/src/sys/agent.rs
+++ b/common/src/sys/agent.rs
@@ -153,7 +153,7 @@ impl<'a> System<'a> for Sys {
                         been_close,
                         ..
                     } => {
-                        if let (Some(tgt_pos), _tgt_stats, tgt_alignment) = (
+                        if let (Some(tgt_pos), Some(tgt_stats), tgt_alignment) = (
                             positions.get(*target),
                             stats.get(*target),
                             alignments
@@ -164,7 +164,8 @@ impl<'a> System<'a> for Sys {
                             // Don't attack entities we are passive towards
                             // TODO: This is here, it's a bit of a hack
                             if let Some(alignment) = alignment {
-                                if (*alignment).passive_towards(tgt_alignment) {
+                                if (*alignment).passive_towards(tgt_alignment) || tgt_stats.is_dead
+                                {
                                     do_idle = true;
                                     break 'activity;
                                 }
diff --git a/server-cli/Dockerfile b/server-cli/Dockerfile
new file mode 100644
index 0000000000..eacecc7846
--- /dev/null
+++ b/server-cli/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:stable-slim
+
+ARG PROJECTNAME=server-cli
+
+COPY ./server-cli/docker-run.sh /opt/docker-run.sh
+COPY ./veloren-server-cli /opt/veloren-server-cli
+COPY ./assets/common /opt/assets/common
+COPY ./assets/world /opt/assets/world
diff --git a/server-cli/docker-compose.yml b/server-cli/docker-compose.yml
new file mode 100644
index 0000000000..ba9badf7de
--- /dev/null
+++ b/server-cli/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.7"
+
+services:
+  game-server:
+    image: registry.gitlab.com/veloren/veloren:master-server
+    ports:
+      - "14004:14004"
+      - "14005:14005"
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 2
+        delay: 10s
+	order: stop-first
+        failure_action: rollback
+      restart_policy:
+        condition: on-failure
diff --git a/server-cli/docker-run.sh b/server-cli/docker-run.sh
new file mode 100755
index 0000000000..e965090fdb
--- /dev/null
+++ b/server-cli/docker-run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt
+RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e6e9917ad7..c86adf42d8 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,3 +31,4 @@ prometheus = "0.7"
 prometheus-static-metric = "0.2"
 rouille = "3.0.0"
 portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" }
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs
index 68160a48e0..03c3db9960 100644
--- a/server/src/auth_provider.rs
+++ b/server/src/auth_provider.rs
@@ -1,32 +1,88 @@
+use authc::{AuthClient, AuthToken, Uuid};
+use common::msg::RegisterError;
 use hashbrown::HashMap;
-use log::{info, warn};
+use log::error;
+use std::str::FromStr;
+
+fn derive_uuid(username: &str) -> Uuid {
+    let mut state: [u8; 16] = [
+        52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239, 52, 17, 19, 239,
+    ];
+    for mix_byte_1 in username.as_bytes() {
+        for i in 0..16 {
+            let mix_byte_step: u8 = mix_byte_1
+                .wrapping_pow(239)
+                .wrapping_mul((i as u8).wrapping_pow(43));
+            let mix_byte_2 = state[(i + mix_byte_step as usize) % 16];
+            let rot_step: u8 = mix_byte_1
+                .wrapping_pow(29)
+                .wrapping_mul((i as u8).wrapping_pow(163));
+            state[i] = (state[i] ^ mix_byte_1)
+                .wrapping_mul(mix_byte_2)
+                .rotate_left(rot_step as u32);
+        }
+    }
+    Uuid::from_slice(&state).unwrap()
+}
 
 pub struct AuthProvider {
-    accounts: HashMap<String, String>,
+    accounts: HashMap<Uuid, String>,
+    auth_server: Option<AuthClient>,
 }
 
 impl AuthProvider {
-    pub fn new() -> Self {
+    pub fn new(auth_addr: Option<String>) -> Self {
+        let auth_server = match auth_addr {
+            Some(addr) => Some(AuthClient::new(addr)),
+            None => None,
+        };
+
         AuthProvider {
             accounts: HashMap::new(),
+            auth_server,
         }
     }
 
-    pub fn query(&mut self, username: String, password: String) -> bool {
-        let pwd = password.clone();
-        if self.accounts.entry(username.clone()).or_insert_with(|| {
-            info!("Registered new user '{}'", &username);
-            pwd
-        }) == &password
-        {
-            info!("User '{}' successfully authenticated", username);
-            true
-        } else {
-            warn!(
-                "User '{}' attempted to log in with invalid password '{}'!",
-                username, password
-            );
-            false
+    pub fn logout(&mut self, uuid: Uuid) {
+        if self.accounts.remove(&uuid).is_none() {
+            error!("Attempted to logout user that is not logged in.");
+        };
+    }
+
+    pub fn query(&mut self, username_or_token: String) -> Result<(String, Uuid), RegisterError> {
+        // Based on whether auth server is provided or not we expect an username or
+        // token
+        match &self.auth_server {
+            // Token from auth server expected
+            Some(srv) => {
+                log::info!("Validating '{}' token.", &username_or_token);
+                // Parse token
+                let token = AuthToken::from_str(&username_or_token)
+                    .map_err(|e| RegisterError::AuthError(e.to_string()))?;
+                // Validate token
+                let uuid = srv.validate(token)?;
+                // Check if already logged in
+                if self.accounts.contains_key(&uuid) {
+                    return Err(RegisterError::AlreadyLoggedIn);
+                }
+                // Log in
+                let username = srv.uuid_to_username(uuid)?;
+                self.accounts.insert(uuid, username.clone());
+                Ok((username, uuid))
+            },
+            // Username is expected
+            None => {
+                // Assume username was provided
+                let username = username_or_token;
+                let uuid = derive_uuid(&username);
+                if !self.accounts.contains_key(&uuid) {
+                    log::info!("New User '{}'", username);
+                    self.accounts.insert(uuid, username.clone());
+                    Ok((username, uuid))
+                } else {
+                    Err(RegisterError::AlreadyLoggedIn)
+                }
+            },
         }
     }
 }
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index eaa3d5e39c..096f75df5a 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -234,11 +234,18 @@ lazy_static! {
          ),
          ChatCommand::new(
              "give_exp",
-             "{} {}",
-             "/give_exp <playername> <amount> : Give experience to specified player",
+             "{d} {}",
+             "/give_exp <amount> <playername?> : Give experience to yourself or specify a target player",
              true,
              handle_exp,
          ),
+         ChatCommand::new(
+             "set_level",
+             "{d} {}",
+             "/set_level <level> <playername?> : Set own Level or specify a target player",
+             true,
+             handle_level
+         ),
         ChatCommand::new(
              "removelights",
              "{}",
@@ -255,6 +262,7 @@ lazy_static! {
         ),
     ];
 }
+
 fn handle_give(server: &mut Server, entity: EcsEntity, args: String, _action: &ChatCommand) {
     if let Ok(item) = assets::load_cloned(&args) {
         server
@@ -267,7 +275,10 @@ fn handle_give(server: &mut Server, entity: EcsEntity, args: String, _action: &C
             .state
             .ecs()
             .write_storage::<comp::InventoryUpdate>()
-            .insert(entity, comp::InventoryUpdate);
+            .insert(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Given),
+            );
     } else {
         server.notify_client(entity, ServerMsg::private(String::from("Invalid item!")));
     }
@@ -632,7 +643,7 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
         .read_storage::<comp::Ori>()
         .get(entity)
         .copied();
-    /*let builder = server
+    /*let builder = server.state
     .create_object(pos, ori, obj_type)
     .with(ori);*/
     if let (Some(pos), Some(ori)) = (pos, ori) {
@@ -694,6 +705,7 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
             },
         };
         server
+            .state
             .create_object(pos, obj_type)
             .with(comp::Ori(
                 // converts player orientation into a 90° rotation for the object by using the axis
@@ -1015,27 +1027,74 @@ spawn_rate {:?} "#,
     }
 }
 
-fn handle_exp(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
-    let (a_alias, a_exp) = scan_fmt_some!(&args, action.arg_fmt, String, i64);
-    if let (Some(alias), Some(exp)) = (a_alias, a_exp) {
-        let ecs = server.state.ecs_mut();
-        let opt_player = (&ecs.entities(), &ecs.read_storage::<comp::Player>())
+fn find_target(
+    ecs: &specs::World,
+    opt_alias: Option<String>,
+    fallback: EcsEntity,
+) -> Result<EcsEntity, ServerMsg> {
+    if let Some(alias) = opt_alias {
+        (&ecs.entities(), &ecs.read_storage::<comp::Player>())
             .join()
             .find(|(_, player)| player.alias == alias)
-            .map(|(entity, _)| entity);
+            .map(|(entity, _)| entity)
+            .ok_or(ServerMsg::private(format!("Player '{}' not found!", alias)))
+    } else {
+        Ok(fallback)
+    }
+}
+
+fn handle_exp(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
+    let (a_exp, a_alias) = scan_fmt_some!(&args, action.arg_fmt, i64, String);
+
+    if let Some(exp) = a_exp {
+        let ecs = server.state.ecs_mut();
+        let target = find_target(&ecs, a_alias, entity);
 
         let mut error_msg = None;
 
-        match opt_player {
-            Some(_alias) => {
-                if let Some(stats) = ecs.write_storage::<comp::Stats>().get_mut(entity) {
+        match target {
+            Ok(player) => {
+                if let Some(stats) = ecs.write_storage::<comp::Stats>().get_mut(player) {
                     stats.exp.change_by(exp);
                 } else {
                     error_msg = Some(ServerMsg::private(String::from("Player has no stats!")));
                 }
             },
-            _ => {
-                error_msg = Some(ServerMsg::private(format!("Player '{}' not found!", alias)));
+            Err(e) => {
+                error_msg = Some(e);
+            },
+        }
+
+        if let Some(msg) = error_msg {
+            server.notify_client(entity, msg);
+        }
+    }
+}
+
+fn handle_level(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
+    let (a_lvl, a_alias) = scan_fmt_some!(&args, action.arg_fmt, u32, String);
+
+    if let Some(lvl) = a_lvl {
+        let ecs = server.state.ecs_mut();
+        let target = find_target(&ecs, a_alias, entity);
+
+        let mut error_msg = None;
+
+        match target {
+            Ok(player) => {
+                if let Some(stats) = ecs.write_storage::<comp::Stats>().get_mut(player) {
+                    stats.level.set_level(lvl);
+
+                    stats.update_max_hp();
+                    stats
+                        .health
+                        .set_to(stats.health.maximum(), comp::HealthSource::LevelUp);
+                } else {
+                    error_msg = Some(ServerMsg::private(String::from("Player has no stats!")));
+                }
+            },
+            Err(e) => {
+                error_msg = Some(e);
             },
         }
 
@@ -1059,7 +1118,10 @@ fn handle_debug(server: &mut Server, entity: EcsEntity, _args: String, _action:
             .state
             .ecs()
             .write_storage::<comp::InventoryUpdate>()
-            .insert(entity, comp::InventoryUpdate);
+            .insert(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Debug),
+            );
     } else {
         server.notify_client(
             entity,
diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
new file mode 100644
index 0000000000..642795c0cd
--- /dev/null
+++ b/server/src/events/entity_creation.rs
@@ -0,0 +1,84 @@
+use crate::{sys, Server, StateExt};
+use common::comp::{
+    self, Agent, Alignment, Body, Gravity, LightEmitter, Pos, Projectile, Scale, Stats, Vel,
+    WaypointArea,
+};
+use specs::{Builder, Entity as EcsEntity, WorldExt};
+use vek::{Rgb, Vec3};
+
+pub fn handle_create_character(
+    server: &mut Server,
+    entity: EcsEntity,
+    name: String,
+    body: Body,
+    main: Option<String>,
+) {
+    let state = &mut server.state;
+    let server_settings = &server.server_settings;
+
+    state.create_player_character(entity, name, body, main, server_settings);
+    sys::subscription::initialize_region_subscription(state.ecs(), entity);
+}
+
+pub fn handle_create_npc(
+    server: &mut Server,
+    pos: Pos,
+    stats: Stats,
+    body: Body,
+    agent: Agent,
+    alignment: Alignment,
+    scale: Scale,
+) {
+    server
+        .state
+        .create_npc(pos, stats, body)
+        .with(agent)
+        .with(scale)
+        .with(alignment)
+        .build();
+}
+
+pub fn handle_shoot(
+    server: &mut Server,
+    entity: EcsEntity,
+    dir: Vec3<f32>,
+    body: Body,
+    light: Option<LightEmitter>,
+    projectile: Projectile,
+    gravity: Option<Gravity>,
+) {
+    let state = server.state_mut();
+
+    let mut pos = state
+        .ecs()
+        .read_storage::<Pos>()
+        .get(entity)
+        .expect("Failed to fetch entity")
+        .0;
+
+    // TODO: Player height
+    pos.z += 1.2;
+
+    let mut builder = state.create_projectile(Pos(pos), Vel(dir * 100.0), body, projectile);
+    if let Some(light) = light {
+        builder = builder.with(light)
+    }
+    if let Some(gravity) = gravity {
+        builder = builder.with(gravity)
+    }
+
+    builder.build();
+}
+
+pub fn handle_create_waypoint(server: &mut Server, pos: Vec3<f32>) {
+    server
+        .state
+        .create_object(Pos(pos), comp::object::Body::CampfireLit)
+        .with(LightEmitter {
+            offset: Vec3::unit_z() * 0.5,
+            col: Rgb::new(1.0, 0.65, 0.2),
+            strength: 2.0,
+        })
+        .with(WaypointArea::default())
+        .build();
+}
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
new file mode 100644
index 0000000000..022c17ce74
--- /dev/null
+++ b/server/src/events/entity_manipulation.rs
@@ -0,0 +1,175 @@
+use crate::{client::Client, Server, SpawnPoint, StateExt};
+use common::{
+    comp::{self, HealthChange, HealthSource, Player, Stats},
+    msg::ServerMsg,
+    state::BlockChange,
+    sync::{Uid, WorldSyncExt},
+    terrain::{Block, TerrainGrid},
+    vol::{ReadVol, Vox},
+};
+use log::error;
+use specs::{Entity as EcsEntity, WorldExt};
+use vek::Vec3;
+
+pub fn handle_damage(server: &Server, uid: Uid, change: HealthChange) {
+    let state = &server.state;
+    let ecs = state.ecs();
+    if let Some(entity) = ecs.entity_from_uid(uid.into()) {
+        if let Some(stats) = ecs.write_storage::<Stats>().get_mut(entity) {
+            stats.health.change_by(change);
+        }
+    }
+}
+
+pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSource) {
+    let state = server.state_mut();
+
+    // Chat message
+    if let Some(player) = state.ecs().read_storage::<Player>().get(entity) {
+        let msg = if let HealthSource::Attack { by } = cause {
+            state.ecs().entity_from_uid(by.into()).and_then(|attacker| {
+                state
+                    .ecs()
+                    .read_storage::<Player>()
+                    .get(attacker)
+                    .map(|attacker_alias| {
+                        format!("{} was killed by {}", &player.alias, &attacker_alias.alias)
+                    })
+            })
+        } else {
+            None
+        }
+        .unwrap_or(format!("{} died", &player.alias));
+
+        state.notify_registered_clients(ServerMsg::kill(msg));
+    }
+
+    {
+        // Give EXP to the killer if entity had stats
+        let mut stats = state.ecs().write_storage::<Stats>();
+        if let Some(entity_stats) = stats.get(entity).cloned() {
+            if let HealthSource::Attack { by } = cause {
+                state.ecs().entity_from_uid(by.into()).map(|attacker| {
+                    if let Some(attacker_stats) = stats.get_mut(attacker) {
+                        // TODO: Discuss whether we should give EXP by Player
+                        // Killing or not.
+                        attacker_stats
+                            .exp
+                            .change_by((entity_stats.level.level() * 10) as i64);
+                    }
+                });
+            }
+        }
+    }
+
+    if state
+        .ecs()
+        .write_storage::<Client>()
+        .get_mut(entity)
+        .is_some()
+    {
+        state
+            .ecs()
+            .write_storage()
+            .insert(entity, comp::Vel(Vec3::zero()))
+            .err()
+            .map(|err| error!("Failed to set zero vel on dead client: {:?}", err));
+        state
+            .ecs()
+            .write_storage()
+            .insert(entity, comp::ForceUpdate)
+            .err()
+            .map(|err| error!("Failed to insert ForceUpdate on dead client: {:?}", err));
+        state
+            .ecs()
+            .write_storage::<comp::Energy>()
+            .get_mut(entity)
+            .map(|energy| energy.set_to(energy.maximum(), comp::EnergySource::Revive));
+        let _ = state
+            .ecs()
+            .write_storage::<comp::CharacterState>()
+            .insert(entity, comp::CharacterState::default());
+    } else {
+        // If not a player delete the entity
+        if let Err(err) = state.delete_entity_recorded(entity) {
+            error!("Failed to delete destroyed entity: {:?}", err);
+        }
+    }
+}
+
+pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>) {
+    let state = &server.state;
+    if vel.z <= -37.0 {
+        if let Some(stats) = state.ecs().write_storage::<comp::Stats>().get_mut(entity) {
+            let falldmg = (vel.z / 2.5) as i32;
+            if falldmg < 0 {
+                stats.health.change_by(comp::HealthChange {
+                    amount: falldmg,
+                    cause: comp::HealthSource::World,
+                });
+            }
+        }
+    }
+}
+
+pub fn handle_respawn(server: &Server, entity: EcsEntity) {
+    let state = &server.state;
+
+    // Only clients can respawn
+    if state
+        .ecs()
+        .write_storage::<Client>()
+        .get_mut(entity)
+        .is_some()
+    {
+        let respawn_point = state
+            .read_component_cloned::<comp::Waypoint>(entity)
+            .map(|wp| wp.get_pos())
+            .unwrap_or(state.ecs().read_resource::<SpawnPoint>().0);
+
+        state
+            .ecs()
+            .write_storage::<comp::Stats>()
+            .get_mut(entity)
+            .map(|stats| stats.revive());
+        state
+            .ecs()
+            .write_storage::<comp::Pos>()
+            .get_mut(entity)
+            .map(|pos| pos.0 = respawn_point);
+        state
+            .ecs()
+            .write_storage()
+            .insert(entity, comp::ForceUpdate)
+            .err()
+            .map(|err| {
+                error!(
+                    "Error inserting ForceUpdate component when respawning client: {:?}",
+                    err
+                )
+            });
+    }
+}
+
+pub fn handle_explosion(server: &Server, pos: Vec3<f32>, radius: f32) {
+    const RAYS: usize = 500;
+
+    for _ in 0..RAYS {
+        let dir = Vec3::new(
+            rand::random::<f32>() - 0.5,
+            rand::random::<f32>() - 0.5,
+            rand::random::<f32>() - 0.5,
+        )
+        .normalized();
+
+        let ecs = server.state.ecs();
+        let mut block_change = ecs.write_resource::<BlockChange>();
+
+        let _ = ecs
+            .read_resource::<TerrainGrid>()
+            .ray(pos, pos + dir * radius)
+            .until(|_| rand::random::<f32>() < 0.05)
+            .for_each(|pos| block_change.set(pos, Block::empty()))
+            .cast();
+    }
+}
diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs
new file mode 100644
index 0000000000..7d7e3fd124
--- /dev/null
+++ b/server/src/events/interaction.rs
@@ -0,0 +1,174 @@
+use crate::{
+    client::{Client, RegionSubscription},
+    Server,
+};
+use common::{
+    assets, comp,
+    msg::ServerMsg,
+    sync::{Uid, WorldSyncExt},
+};
+use log::error;
+use specs::{world::WorldExt, Entity as EcsEntity};
+
+pub fn handle_mount(server: &mut Server, mounter: EcsEntity, mountee: EcsEntity) {
+    let state = server.state_mut();
+
+    if state
+        .ecs()
+        .read_storage::<comp::Mounting>()
+        .get(mounter)
+        .is_none()
+    {
+        let not_mounting_yet = if let Some(comp::MountState::Unmounted) = state
+            .ecs()
+            .read_storage::<comp::MountState>()
+            .get(mountee)
+            .cloned()
+        {
+            true
+        } else {
+            false
+        };
+
+        if not_mounting_yet {
+            if let (Some(mounter_uid), Some(mountee_uid)) = (
+                state.ecs().uid_from_entity(mounter),
+                state.ecs().uid_from_entity(mountee),
+            ) {
+                state.write_component(mountee, comp::MountState::MountedBy(mounter_uid.into()));
+                state.write_component(mounter, comp::Mounting(mountee_uid.into()));
+            }
+        }
+    }
+}
+
+pub fn handle_unmount(server: &mut Server, mounter: EcsEntity) {
+    let state = server.state_mut();
+    let mountee_entity = state
+        .ecs()
+        .write_storage::<comp::Mounting>()
+        .get(mounter)
+        .and_then(|mountee| state.ecs().entity_from_uid(mountee.0.into()));
+    if let Some(mountee_entity) = mountee_entity {
+        state
+            .ecs()
+            .write_storage::<comp::MountState>()
+            .get_mut(mountee_entity)
+            .map(|ms| *ms = comp::MountState::Unmounted);
+    }
+    state.delete_component::<comp::Mounting>(mounter);
+}
+
+pub fn handle_possess(server: &Server, possessor_uid: Uid, possesse_uid: Uid) {
+    let state = &server.state;
+    let ecs = state.ecs();
+    if let (Some(possessor), Some(possesse)) = (
+        ecs.entity_from_uid(possessor_uid.into()),
+        ecs.entity_from_uid(possesse_uid.into()),
+    ) {
+        // You can't possess other players
+        let mut clients = ecs.write_storage::<Client>();
+        if clients.get_mut(possesse).is_none() {
+            if let Some(mut client) = clients.remove(possessor) {
+                client.notify(ServerMsg::SetPlayerEntity(possesse_uid.into()));
+                clients.insert(possesse, client).err().map(|e| {
+                    error!(
+                        "Error inserting client component during possession: {:?}",
+                        e
+                    )
+                });
+                // Create inventory if it doesn't exist
+                {
+                    let mut inventories = ecs.write_storage::<comp::Inventory>();
+                    if let Some(inventory) = inventories.get_mut(possesse) {
+                        inventory.push(assets::load_expect_cloned("common.items.debug.possess"));
+                    } else {
+                        inventories
+                            .insert(possesse, comp::Inventory {
+                                slots: vec![
+                                    Some(assets::load_expect_cloned("common.items.debug.possess")),
+                                    None,
+                                    None,
+                                    None,
+                                    None,
+                                    None,
+                                    None,
+                                    None,
+                                ],
+                            })
+                            .err()
+                            .map(|e| {
+                                error!(
+                                    "Error inserting inventory component during possession: {:?}",
+                                    e
+                                )
+                            });
+                    }
+                }
+                ecs.write_storage::<comp::InventoryUpdate>()
+                    .insert(
+                        possesse,
+                        comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Possession),
+                    )
+                    .err()
+                    .map(|e| {
+                        error!(
+                            "Error inserting inventory update component during possession: {:?}",
+                            e
+                        )
+                    });
+                // Move player component
+                {
+                    let mut players = ecs.write_storage::<comp::Player>();
+                    if let Some(player) = players.remove(possessor) {
+                        players.insert(possesse, player).err().map(|e| {
+                            error!(
+                                "Error inserting player component during possession: {:?}",
+                                e
+                            )
+                        });
+                    }
+                }
+                // Transfer region subscription
+                {
+                    let mut subscriptions = ecs.write_storage::<RegionSubscription>();
+                    if let Some(s) = subscriptions.remove(possessor) {
+                        subscriptions.insert(possesse, s).err().map(|e| {
+                            error!(
+                                "Error inserting subscription component during possession: {:?}",
+                                e
+                            )
+                        });
+                    }
+                }
+                // Remove will of the entity
+                ecs.write_storage::<comp::Agent>().remove(possesse);
+                // Reset controller of former shell
+                ecs.write_storage::<comp::Controller>()
+                    .get_mut(possessor)
+                    .map(|c| c.reset());
+                // Transfer admin powers
+                {
+                    let mut admins = ecs.write_storage::<comp::Admin>();
+                    if let Some(admin) = admins.remove(possessor) {
+                        admins.insert(possesse, admin).err().map(|e| {
+                            error!("Error inserting admin component during possession: {:?}", e)
+                        });
+                    }
+                }
+                // Transfer waypoint
+                {
+                    let mut waypoints = ecs.write_storage::<comp::Waypoint>();
+                    if let Some(waypoint) = waypoints.remove(possessor) {
+                        waypoints.insert(possesse, waypoint).err().map(|e| {
+                            error!(
+                                "Error inserting waypoint component during possession {:?}",
+                                e
+                            )
+                        });
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
new file mode 100644
index 0000000000..1973410290
--- /dev/null
+++ b/server/src/events/inventory_manip.rs
@@ -0,0 +1,280 @@
+use crate::{Server, StateExt};
+use common::{
+    comp::{self, Pos, MAX_PICKUP_RANGE_SQR},
+    sync::WorldSyncExt,
+    terrain::block::Block,
+    vol::{ReadVol, Vox},
+};
+use log::error;
+use rand::Rng;
+use specs::{join::Join, world::WorldExt, Builder, Entity as EcsEntity};
+use vek::Vec3;
+
+pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::InventoryManip) {
+    let state = server.state_mut();
+    let mut dropped_items = Vec::new();
+
+    match manip {
+        comp::InventoryManip::Pickup(uid) => {
+            let item_entity = if let (Some((item, item_entity)), Some(inv)) = (
+                state
+                    .ecs()
+                    .entity_from_uid(uid.into())
+                    .and_then(|item_entity| {
+                        state
+                            .ecs()
+                            .write_storage::<comp::Item>()
+                            .get_mut(item_entity)
+                            .map(|item| (item.clone(), item_entity))
+                    }),
+                state
+                    .ecs()
+                    .write_storage::<comp::Inventory>()
+                    .get_mut(entity),
+            ) {
+                if within_pickup_range(
+                    state.ecs().read_storage::<comp::Pos>().get(entity),
+                    state.ecs().read_storage::<comp::Pos>().get(item_entity),
+                ) && inv.push(item).is_none()
+                {
+                    Some(item_entity)
+                } else {
+                    None
+                }
+            } else {
+                None
+            };
+
+            if let Some(item_entity) = item_entity {
+                if let Err(err) = state.delete_entity_recorded(item_entity) {
+                    error!("Failed to delete picked up item entity: {:?}", err);
+                }
+            }
+
+            state.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Collected),
+            );
+        },
+
+        comp::InventoryManip::Collect(pos) => {
+            let block = state.terrain().get(pos).ok().copied();
+
+            if let Some(block) = block {
+                let has_inv_space = state
+                    .ecs()
+                    .read_storage::<comp::Inventory>()
+                    .get(entity)
+                    .map(|inv| !inv.is_full())
+                    .unwrap_or(false);
+
+                if !has_inv_space {
+                    state.write_component(
+                        entity,
+                        comp::InventoryUpdate::new(comp::InventoryUpdateEvent::CollectFailed),
+                    );
+                } else {
+                    if block.is_collectible() && state.try_set_block(pos, Block::empty()).is_some()
+                    {
+                        comp::Item::try_reclaim_from_block(block)
+                            .map(|item| state.give_item(entity, item));
+                    }
+                }
+            }
+        },
+
+        comp::InventoryManip::Use(slot) => {
+            let item_opt = state
+                .ecs()
+                .write_storage::<comp::Inventory>()
+                .get_mut(entity)
+                .and_then(|inv| inv.remove(slot));
+
+            let mut event = comp::InventoryUpdateEvent::Used;
+
+            if let Some(item) = item_opt {
+                match item.kind {
+                    comp::ItemKind::Tool { .. } => {
+                        if let Some(stats) =
+                            state.ecs().write_storage::<comp::Stats>().get_mut(entity)
+                        {
+                            // Insert old item into inventory
+                            if let Some(old_item) = stats.equipment.main.take() {
+                                state
+                                    .ecs()
+                                    .write_storage::<comp::Inventory>()
+                                    .get_mut(entity)
+                                    .map(|inv| inv.insert(slot, old_item));
+                            }
+
+                            stats.equipment.main = Some(item);
+                        }
+                    },
+                    comp::ItemKind::Consumable { kind, effect } => {
+                        event = comp::InventoryUpdateEvent::Consumed(kind);
+                        state.apply_effect(entity, effect);
+                    },
+                    comp::ItemKind::Utility { kind } => match kind {
+                        comp::item::Utility::Collar => {
+                            let reinsert = if let Some(pos) =
+                                state.read_storage::<comp::Pos>().get(entity)
+                            {
+                                if (
+                                    &state.read_storage::<comp::Alignment>(),
+                                    &state.read_storage::<comp::Agent>(),
+                                )
+                                    .join()
+                                    .filter(|(alignment, _)| {
+                                        alignment == &&comp::Alignment::Owned(entity)
+                                    })
+                                    .count()
+                                    >= 3
+                                {
+                                    true
+                                } else if let Some(tameable_entity) = {
+                                    let nearest_tameable = (
+                                        &state.ecs().entities(),
+                                        &state.ecs().read_storage::<comp::Pos>(),
+                                        &state.ecs().read_storage::<comp::Alignment>(),
+                                    )
+                                        .join()
+                                        .filter(|(_, wild_pos, _)| {
+                                            wild_pos.0.distance_squared(pos.0) < 5.0f32.powf(2.0)
+                                        })
+                                        .filter(|(_, _, alignment)| {
+                                            alignment == &&comp::Alignment::Wild
+                                        })
+                                        .min_by_key(|(_, wild_pos, _)| {
+                                            (wild_pos.0.distance_squared(pos.0) * 100.0) as i32
+                                        })
+                                        .map(|(entity, _, _)| entity);
+                                    nearest_tameable
+                                } {
+                                    let _ = state
+                                        .ecs()
+                                        .write_storage()
+                                        .insert(tameable_entity, comp::Alignment::Owned(entity));
+                                    let _ = state
+                                        .ecs()
+                                        .write_storage()
+                                        .insert(tameable_entity, comp::Agent::default());
+                                    false
+                                } else {
+                                    true
+                                }
+                            } else {
+                                true
+                            };
+
+                            if reinsert {
+                                let _ = state
+                                    .ecs()
+                                    .write_storage::<comp::Inventory>()
+                                    .get_mut(entity)
+                                    .map(|inv| inv.insert(slot, item));
+                            }
+                        },
+                    },
+                    _ => {
+                        let _ = state
+                            .ecs()
+                            .write_storage::<comp::Inventory>()
+                            .get_mut(entity)
+                            .map(|inv| inv.insert(slot, item));
+                    },
+                }
+            }
+
+            state.write_component(entity, comp::InventoryUpdate::new(event));
+        },
+
+        comp::InventoryManip::Swap(a, b) => {
+            state
+                .ecs()
+                .write_storage::<comp::Inventory>()
+                .get_mut(entity)
+                .map(|inv| inv.swap_slots(a, b));
+            state.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Swapped),
+            );
+        },
+
+        comp::InventoryManip::Drop(slot) => {
+            let item = state
+                .ecs()
+                .write_storage::<comp::Inventory>()
+                .get_mut(entity)
+                .and_then(|inv| inv.remove(slot));
+
+            if let (Some(item), Some(pos)) =
+                (item, state.ecs().read_storage::<comp::Pos>().get(entity))
+            {
+                dropped_items.push((
+                    *pos,
+                    state
+                        .ecs()
+                        .read_storage::<comp::Ori>()
+                        .get(entity)
+                        .copied()
+                        .unwrap_or(comp::Ori(Vec3::unit_y())),
+                    item,
+                ));
+            }
+            state.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Dropped),
+            );
+        },
+    }
+
+    // Drop items
+    for (pos, ori, item) in dropped_items {
+        let vel = ori.0.normalized() * 5.0
+            + Vec3::unit_z() * 10.0
+            + Vec3::<f32>::zero().map(|_| rand::thread_rng().gen::<f32>() - 0.5) * 4.0;
+
+        state
+            .create_object(Default::default(), comp::object::Body::Pouch)
+            .with(comp::Pos(pos.0 + Vec3::unit_z() * 0.25))
+            .with(item)
+            .with(comp::Vel(vel))
+            .build();
+    }
+}
+
+fn within_pickup_range(player_position: Option<&Pos>, item_position: Option<&Pos>) -> bool {
+    match (player_position, item_position) {
+        (Some(ppos), Some(ipos)) => ppos.0.distance_squared(ipos.0) < MAX_PICKUP_RANGE_SQR,
+        _ => false,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use common::comp::Pos;
+    use vek::Vec3;
+
+    #[test]
+    fn pickup_distance_within_range() {
+        let player_position = Pos(Vec3::zero());
+        let item_position = Pos(Vec3::one());
+
+        assert_eq!(
+            within_pickup_range(Some(&player_position), Some(&item_position)),
+            true
+        );
+    }
+
+    #[test]
+    fn pickup_distance_not_within_range() {
+        let player_position = Pos(Vec3::zero());
+        let item_position = Pos(Vec3::one() * 500.0);
+
+        assert_eq!(
+            within_pickup_range(Some(&player_position), Some(&item_position)),
+            false
+        );
+    }
+}
diff --git a/server/src/events/mod.rs b/server/src/events/mod.rs
new file mode 100644
index 0000000000..dd9f3b332c
--- /dev/null
+++ b/server/src/events/mod.rs
@@ -0,0 +1,109 @@
+use crate::Server;
+use common::event::{EventBus, ServerEvent};
+use entity_creation::{
+    handle_create_character, handle_create_npc, handle_create_waypoint, handle_shoot,
+};
+use entity_manipulation::{
+    handle_damage, handle_destroy, handle_explosion, handle_land_on_ground, handle_respawn,
+};
+use interaction::{handle_mount, handle_possess, handle_unmount};
+use inventory_manip::handle_inventory;
+use player::{handle_client_disconnect, handle_exit_ingame};
+use specs::{Entity as EcsEntity, WorldExt};
+
+mod entity_creation;
+mod entity_manipulation;
+mod interaction;
+mod inventory_manip;
+mod player;
+
+pub enum Event {
+    ClientConnected {
+        entity: EcsEntity,
+    },
+    ClientDisconnected {
+        entity: EcsEntity,
+    },
+    Chat {
+        entity: Option<EcsEntity>,
+        msg: String,
+    },
+}
+
+impl Server {
+    pub fn handle_events(&mut self) -> Vec<Event> {
+        let mut frontend_events = Vec::new();
+
+        let mut requested_chunks = Vec::new();
+        let mut chat_commands = Vec::new();
+
+        let events = self
+            .state
+            .ecs()
+            .read_resource::<EventBus<ServerEvent>>()
+            .recv_all();
+
+        for event in events {
+            match event {
+                ServerEvent::Explosion { pos, radius } => handle_explosion(&self, pos, radius),
+                ServerEvent::Shoot {
+                    entity,
+                    dir,
+                    body,
+                    light,
+                    projectile,
+                    gravity,
+                } => handle_shoot(self, entity, dir, body, light, projectile, gravity),
+                ServerEvent::Damage { uid, change } => handle_damage(&self, uid, change),
+                ServerEvent::Destroy { entity, cause } => handle_destroy(self, entity, cause),
+                ServerEvent::InventoryManip(entity, manip) => handle_inventory(self, entity, manip),
+                ServerEvent::Respawn(entity) => handle_respawn(&self, entity),
+                ServerEvent::LandOnGround { entity, vel } => {
+                    handle_land_on_ground(&self, entity, vel)
+                },
+                ServerEvent::Mount(mounter, mountee) => handle_mount(self, mounter, mountee),
+                ServerEvent::Unmount(mounter) => handle_unmount(self, mounter),
+                ServerEvent::Possess(possessor_uid, possesse_uid) => {
+                    handle_possess(&self, possessor_uid, possesse_uid)
+                },
+                ServerEvent::CreateCharacter {
+                    entity,
+                    name,
+                    body,
+                    main,
+                } => handle_create_character(self, entity, name, body, main),
+                ServerEvent::ExitIngame { entity } => handle_exit_ingame(self, entity),
+                ServerEvent::CreateNpc {
+                    pos,
+                    stats,
+                    body,
+                    agent,
+                    alignment,
+                    scale,
+                } => handle_create_npc(self, pos, stats, body, agent, alignment, scale),
+                ServerEvent::CreateWaypoint(pos) => handle_create_waypoint(self, pos),
+                ServerEvent::ClientDisconnect(entity) => {
+                    frontend_events.push(handle_client_disconnect(self, entity))
+                },
+
+                ServerEvent::ChunkRequest(entity, key) => {
+                    requested_chunks.push((entity, key));
+                },
+                ServerEvent::ChatCmd(entity, cmd) => {
+                    chat_commands.push((entity, cmd));
+                },
+            }
+        }
+
+        // Generate requested chunks.
+        for (entity, key) in requested_chunks {
+            self.generate_chunk(entity, key);
+        }
+
+        for (entity, cmd) in chat_commands {
+            self.process_chat_cmd(entity, cmd);
+        }
+
+        frontend_events
+    }
+}
diff --git a/server/src/events/player.rs b/server/src/events/player.rs
new file mode 100644
index 0000000000..b4836a7505
--- /dev/null
+++ b/server/src/events/player.rs
@@ -0,0 +1,77 @@
+use super::Event;
+use crate::{auth_provider::AuthProvider, client::Client, state_ext::StateExt, Server};
+use common::{
+    comp,
+    comp::Player,
+    msg::{ClientState, PlayerListUpdate, ServerMsg},
+    sync::{Uid, UidAllocator},
+};
+use log::error;
+use specs::{saveload::MarkerAllocator, Builder, Entity as EcsEntity, Join, WorldExt};
+
+pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
+    let state = server.state_mut();
+
+    // Create new entity with just `Client`, `Uid`, and `Player` components
+    // Easier than checking and removing all other known components
+    // Note: If other `ServerEvent`s are referring to this entity they will be
+    // disrupted
+    let maybe_client = state.ecs().write_storage::<Client>().remove(entity);
+    let maybe_uid = state.read_component_cloned::<Uid>(entity);
+    let maybe_player = state.ecs().write_storage::<comp::Player>().remove(entity);
+    if let (Some(mut client), Some(uid), Some(player)) = (maybe_client, maybe_uid, maybe_player) {
+        // Tell client its request was successful
+        client.allow_state(ClientState::Registered);
+        // Tell client to clear out other entities and its own components
+        client.notify(ServerMsg::ExitIngameCleanup);
+
+        let entity_builder = state.ecs_mut().create_entity().with(client).with(player);
+        // Ensure UidAllocator maps this uid to the new entity
+        let uid = entity_builder
+            .world
+            .write_resource::<UidAllocator>()
+            .allocate(entity_builder.entity, Some(uid.into()));
+        entity_builder.with(uid).build();
+    }
+    // Delete old entity
+    if let Err(err) = state.delete_entity_recorded(entity) {
+        error!("Failed to delete entity when removing character: {:?}", err);
+    }
+}
+
+pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event {
+    let state = server.state_mut();
+
+    // Tell other clients to remove from player list
+    if let (Some(uid), Some(_)) = (
+        state.read_storage::<Uid>().get(entity),
+        state.read_storage::<comp::Player>().get(entity),
+    ) {
+        state.notify_registered_clients(ServerMsg::PlayerListUpdate(PlayerListUpdate::Remove(
+            (*uid).into(),
+        )))
+    }
+
+    // Make sure to remove the player from the logged in list. (See AuthProvider)
+    // And send a disconnected message
+    {
+        let players = state.ecs().read_storage::<Player>();
+        let mut accounts = state.ecs().write_resource::<AuthProvider>();
+        let mut clients = state.ecs().write_storage::<Client>();
+
+        if let Some(player) = players.get(entity) {
+            accounts.logout(player.uuid());
+
+            let msg = ServerMsg::broadcast(format!("{} went offline.", &player.alias));
+            for client in (&mut clients).join().filter(|c| c.is_registered()) {
+                client.notify(msg.clone());
+            }
+        }
+    }
+    // Delete client entity
+    if let Err(err) = state.delete_entity_recorded(entity) {
+        error!("Failed to delete disconnected client: {:?}", err);
+    }
+
+    Event::ClientDisconnected { entity }
+}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 161aa4c9d8..5d06f7498f 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -6,40 +6,38 @@ pub mod chunk_generator;
 pub mod client;
 pub mod cmd;
 pub mod error;
+pub mod events;
 pub mod input;
 pub mod metrics;
 pub mod settings;
+pub mod state_ext;
 pub mod sys;
 #[cfg(not(feature = "worldgen"))] mod test_world;
 
 // Reexports
-pub use crate::{error::Error, input::Input, settings::ServerSettings};
+pub use crate::{error::Error, events::Event, input::Input, settings::ServerSettings};
 
 use crate::{
     auth_provider::AuthProvider,
     chunk_generator::ChunkGenerator,
     client::{Client, RegionSubscription},
     cmd::CHAT_COMMANDS,
+    state_ext::StateExt,
     sys::sentinel::{DeletedEntities, TrackedComps},
 };
 use common::{
-    assets, comp,
-    effect::Effect,
+    comp,
     event::{EventBus, ServerEvent},
-    msg::{ClientMsg, ClientState, PlayerListUpdate, ServerError, ServerInfo, ServerMsg},
+    msg::{ClientMsg, ClientState, ServerInfo, ServerMsg},
     net::PostOffice,
-    state::{BlockChange, State, TimeOfDay},
-    sync::{Uid, UidAllocator, WorldSyncExt},
-    terrain::{block::Block, TerrainChunkSize, TerrainGrid},
-    vol::{ReadVol, RectVolSize, Vox},
+    state::{State, TimeOfDay},
+    sync::WorldSyncExt,
+    terrain::TerrainChunkSize,
+    vol::{ReadVol, RectVolSize},
 };
-use log::{debug, error, warn};
+use log::{debug, error};
 use metrics::ServerMetrics;
-use rand::Rng;
-use specs::{
-    join::Join, saveload::MarkerAllocator, world::EntityBuilder as EcsEntityBuilder, Builder,
-    Entity as EcsEntity, RunNow, SystemData, WorldExt,
-};
+use specs::{join::Join, Builder, Entity as EcsEntity, RunNow, SystemData, WorldExt};
 use std::{
     i32,
     sync::Arc,
@@ -57,19 +55,6 @@ use world::{
 
 const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
 
-pub enum Event {
-    ClientConnected {
-        entity: EcsEntity,
-    },
-    ClientDisconnected {
-        entity: EcsEntity,
-    },
-    Chat {
-        entity: Option<EcsEntity>,
-        msg: String,
-    },
-}
-
 #[derive(Copy, Clone)]
 struct SpawnPoint(Vec3<f32>);
 
@@ -99,7 +84,9 @@ impl Server {
         let mut state = State::default();
         state.ecs_mut().insert(EventBus::<ServerEvent>::default());
         // TODO: anything but this
-        state.ecs_mut().insert(AuthProvider::new());
+        state
+            .ecs_mut()
+            .insert(AuthProvider::new(settings.auth_server_address.clone()));
         state.ecs_mut().insert(Tick(0));
         state.ecs_mut().insert(ChunkGenerator::new());
         // System timers for performance monitoring
@@ -109,6 +96,7 @@ impl Server {
         state.ecs_mut().insert(sys::SubscriptionTimer::default());
         state.ecs_mut().insert(sys::TerrainSyncTimer::default());
         state.ecs_mut().insert(sys::TerrainTimer::default());
+        state.ecs_mut().insert(sys::WaypointTimer::default());
         // Server-only components
         state.ecs_mut().register::<RegionSubscription>();
         state.ecs_mut().register::<Client>();
@@ -209,6 +197,7 @@ impl Server {
                 description: settings.server_description.clone(),
                 git_hash: common::util::GIT_HASH.to_string(),
                 git_date: common::util::GIT_DATE.to_string(),
+                auth_provider: settings.auth_server_address.clone(),
             },
             metrics: ServerMetrics::new(settings.metrics_address)
                 .expect("Failed to initialize server metrics submodule."),
@@ -233,812 +222,6 @@ impl Server {
     /// Get a reference to the server's world.
     pub fn world(&self) -> &World { &self.world }
 
-    /// Build a static object entity
-    pub fn create_object(
-        &mut self,
-        pos: comp::Pos,
-        object: comp::object::Body,
-    ) -> EcsEntityBuilder {
-        self.state
-            .ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(comp::Vel(Vec3::zero()))
-            .with(comp::Ori(Vec3::unit_y()))
-            .with(comp::Body::Object(object))
-            .with(comp::Mass(100.0))
-            .with(comp::Gravity(1.0))
-        //.with(comp::LightEmitter::default())
-    }
-
-    /// Build a projectile
-    pub fn create_projectile(
-        state: &mut State,
-        pos: comp::Pos,
-        vel: comp::Vel,
-        body: comp::Body,
-        projectile: comp::Projectile,
-    ) -> EcsEntityBuilder {
-        state
-            .ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(vel)
-            .with(comp::Ori(vel.0.normalized()))
-            .with(comp::Mass(0.0))
-            .with(body)
-            .with(projectile)
-            .with(comp::Sticky)
-    }
-
-    pub fn create_player_character(
-        state: &mut State,
-        entity: EcsEntity,
-        name: String,
-        body: comp::Body,
-        main: Option<String>,
-        server_settings: &ServerSettings,
-    ) {
-        // Give no item when an invalid specifier is given
-        let main = main.and_then(|specifier| assets::load_cloned(&specifier).ok());
-
-        let spawn_point = state.ecs().read_resource::<SpawnPoint>().0;
-
-        state.write_component(entity, body);
-        state.write_component(entity, comp::Stats::new(name, body, main));
-        state.write_component(entity, comp::Energy::new(1000));
-        state.write_component(entity, comp::Controller::default());
-        state.write_component(entity, comp::Pos(spawn_point));
-        state.write_component(entity, comp::Vel(Vec3::zero()));
-        state.write_component(entity, comp::Ori(Vec3::unit_y()));
-        state.write_component(entity, comp::Gravity(1.0));
-        state.write_component(entity, comp::CharacterState::default());
-        state.write_component(entity, comp::Alignment::Owned(entity));
-        state.write_component(entity, comp::Inventory::default());
-        state.write_component(entity, comp::InventoryUpdate);
-        // Make sure physics are accepted.
-        state.write_component(entity, comp::ForceUpdate);
-
-        // Give the Admin component to the player if their name exists in admin list
-        if server_settings.admins.contains(
-            &state
-                .ecs()
-                .read_storage::<comp::Player>()
-                .get(entity)
-                .expect("Failed to fetch entity.")
-                .alias,
-        ) {
-            state.write_component(entity, comp::Admin);
-        }
-        // Tell the client its request was successful.
-        if let Some(client) = state.ecs().write_storage::<Client>().get_mut(entity) {
-            client.allow_state(ClientState::Character);
-        }
-    }
-
-    /// Handle events coming through via the event bus
-    fn handle_events(&mut self) -> Vec<Event> {
-        let mut frontend_events = Vec::new();
-
-        let mut requested_chunks = Vec::new();
-        let mut dropped_items = Vec::new();
-        let mut chat_commands = Vec::new();
-
-        let events = self
-            .state
-            .ecs()
-            .read_resource::<EventBus<ServerEvent>>()
-            .recv_all();
-        for event in events {
-            let state = &mut self.state;
-
-            let server_settings = &self.server_settings;
-
-            match event {
-                ServerEvent::Explosion { pos, radius } => {
-                    const RAYS: usize = 500;
-
-                    for _ in 0..RAYS {
-                        let dir = Vec3::new(
-                            rand::random::<f32>() - 0.5,
-                            rand::random::<f32>() - 0.5,
-                            rand::random::<f32>() - 0.5,
-                        )
-                        .normalized();
-
-                        let ecs = state.ecs();
-                        let mut block_change = ecs.write_resource::<BlockChange>();
-
-                        let _ = ecs
-                            .read_resource::<TerrainGrid>()
-                            .ray(pos, pos + dir * radius)
-                            .until(|_| rand::random::<f32>() < 0.05)
-                            .for_each(|pos| block_change.set(pos, Block::empty()))
-                            .cast();
-                    }
-                },
-
-                ServerEvent::Shoot {
-                    entity,
-                    dir,
-                    body,
-                    light,
-                    projectile,
-                    gravity,
-                } => {
-                    let mut pos = state
-                        .ecs()
-                        .read_storage::<comp::Pos>()
-                        .get(entity)
-                        .expect("Failed to fetch entity")
-                        .0;
-
-                    // TODO: Player height
-                    pos.z += 1.2;
-
-                    let mut builder = Self::create_projectile(
-                        state,
-                        comp::Pos(pos),
-                        comp::Vel(dir * 100.0),
-                        body,
-                        projectile,
-                    );
-                    if let Some(light) = light {
-                        builder = builder.with(light)
-                    }
-                    if let Some(gravity) = gravity {
-                        builder = builder.with(gravity)
-                    }
-
-                    builder.build();
-                },
-
-                ServerEvent::Damage { uid, change } => {
-                    let ecs = state.ecs();
-                    if let Some(entity) = ecs.entity_from_uid(uid.into()) {
-                        if let Some(stats) = ecs.write_storage::<comp::Stats>().get_mut(entity) {
-                            stats.health.change_by(change);
-                        }
-                    }
-                },
-
-                ServerEvent::Destroy { entity, cause } => {
-                    // Chat message
-                    if let Some(player) = state.ecs().read_storage::<comp::Player>().get(entity) {
-                        let msg = if let comp::HealthSource::Attack { by } = cause {
-                            state.ecs().entity_from_uid(by.into()).and_then(|attacker| {
-                                state
-                                    .ecs()
-                                    .read_storage::<comp::Player>()
-                                    .get(attacker)
-                                    .map(|attacker_alias| {
-                                        format!(
-                                            "{} was killed by {}",
-                                            &player.alias, &attacker_alias.alias
-                                        )
-                                    })
-                            })
-                        } else {
-                            None
-                        }
-                        .unwrap_or(format!("{} died", &player.alias));
-
-                        state.notify_registered_clients(ServerMsg::kill(msg));
-                    }
-
-                    {
-                        // Give EXP to the killer if entity had stats
-                        let mut stats = state.ecs().write_storage::<comp::Stats>();
-                        if let Some(entity_stats) = stats.get(entity).cloned() {
-                            if let comp::HealthSource::Attack { by } = cause {
-                                state.ecs().entity_from_uid(by.into()).map(|attacker| {
-                                    if let Some(attacker_stats) = stats.get_mut(attacker) {
-                                        // TODO: Discuss whether we should give EXP by Player
-                                        // Killing or not.
-                                        attacker_stats
-                                            .exp
-                                            .change_by((entity_stats.level.level() * 10) as i64);
-                                    }
-                                });
-                            }
-                        }
-                    }
-
-                    if state
-                        .ecs()
-                        .write_storage::<Client>()
-                        .get_mut(entity)
-                        .is_some()
-                    {
-                        state
-                            .ecs()
-                            .write_storage()
-                            .insert(entity, comp::Vel(Vec3::zero()))
-                            .err()
-                            .map(|err| error!("Failed to set zero vel on dead client: {:?}", err));
-                        state
-                            .ecs()
-                            .write_storage()
-                            .insert(entity, comp::ForceUpdate)
-                            .err()
-                            .map(|err| {
-                                error!("Failed to insert ForceUpdate on dead client: {:?}", err)
-                            });
-                        state
-                            .ecs()
-                            .write_storage::<comp::Energy>()
-                            .get_mut(entity)
-                            .map(|energy| {
-                                energy.set_to(energy.maximum(), comp::EnergySource::Revive)
-                            });
-                        let _ = state
-                            .ecs()
-                            .write_storage::<comp::CharacterState>()
-                            .insert(entity, comp::CharacterState::default());
-                    } else {
-                        // If not a player delete the entity
-                        if let Err(err) = state.delete_entity_recorded(entity) {
-                            error!("Failed to delete destroyed entity: {:?}", err);
-                        }
-                    }
-                },
-
-                ServerEvent::InventoryManip(entity, manip) => {
-                    match manip {
-                        comp::InventoryManip::Pickup(uid) => {
-                            // TODO: enforce max pickup range
-                            let item_entity = if let (Some((item, item_entity)), Some(inv)) = (
-                                state
-                                    .ecs()
-                                    .entity_from_uid(uid.into())
-                                    .and_then(|item_entity| {
-                                        state
-                                            .ecs()
-                                            .write_storage::<comp::Item>()
-                                            .get_mut(item_entity)
-                                            .map(|item| (item.clone(), item_entity))
-                                    }),
-                                state
-                                    .ecs()
-                                    .write_storage::<comp::Inventory>()
-                                    .get_mut(entity),
-                            ) {
-                                if inv.push(item).is_none() {
-                                    Some(item_entity)
-                                } else {
-                                    None
-                                }
-                            } else {
-                                None
-                            };
-
-                            if let Some(item_entity) = item_entity {
-                                if let Err(err) = state.delete_entity_recorded(item_entity) {
-                                    error!("Failed to delete picked up item entity: {:?}", err);
-                                }
-                            }
-
-                            state.write_component(entity, comp::InventoryUpdate);
-                        },
-
-                        comp::InventoryManip::Collect(pos) => {
-                            let block = state.terrain().get(pos).ok().copied();
-                            if let Some(block) = block {
-                                if block.is_collectible()
-                                    && state
-                                        .ecs()
-                                        .read_storage::<comp::Inventory>()
-                                        .get(entity)
-                                        .map(|inv| !inv.is_full())
-                                        .unwrap_or(false)
-                                    && state.try_set_block(pos, Block::empty()).is_some()
-                                {
-                                    comp::Item::try_reclaim_from_block(block)
-                                        .map(|item| state.give_item(entity, item));
-                                }
-                            }
-                        },
-
-                        comp::InventoryManip::Use(slot) => {
-                            let item_opt = state
-                                .ecs()
-                                .write_storage::<comp::Inventory>()
-                                .get_mut(entity)
-                                .and_then(|inv| inv.remove(slot));
-
-                            if let Some(item) = item_opt {
-                                match item.kind {
-                                    comp::ItemKind::Tool { .. } => {
-                                        if let Some(stats) = state
-                                            .ecs()
-                                            .write_storage::<comp::Stats>()
-                                            .get_mut(entity)
-                                        {
-                                            // Insert old item into inventory
-                                            if let Some(old_item) = stats.equipment.main.take() {
-                                                state
-                                                    .ecs()
-                                                    .write_storage::<comp::Inventory>()
-                                                    .get_mut(entity)
-                                                    .map(|inv| inv.insert(slot, old_item));
-                                            }
-
-                                            stats.equipment.main = Some(item);
-                                        }
-                                    },
-                                    comp::ItemKind::Consumable { effect, .. } => {
-                                        state.apply_effect(entity, effect);
-                                    },
-                                    comp::ItemKind::Utility { kind } => match kind {
-                                        comp::item::Utility::Collar => {
-                                            let reinsert = if let Some(pos) =
-                                                state.read_storage::<comp::Pos>().get(entity)
-                                            {
-                                                if (
-                                                    &state.read_storage::<comp::Alignment>(),
-                                                    &state.read_storage::<comp::Agent>(),
-                                                )
-                                                    .join()
-                                                    .filter(|(alignment, _)| {
-                                                        alignment
-                                                            == &&comp::Alignment::Owned(entity)
-                                                    })
-                                                    .count()
-                                                    >= 3
-                                                {
-                                                    true
-                                                } else if let Some(tameable_entity) = {
-                                                    let nearest_tameable = (
-                                                        &state.ecs().entities(),
-                                                        &state.ecs().read_storage::<comp::Pos>(),
-                                                        &state
-                                                            .ecs()
-                                                            .read_storage::<comp::Alignment>(),
-                                                    )
-                                                        .join()
-                                                        .filter(|(_, wild_pos, _)| {
-                                                            wild_pos.0.distance_squared(pos.0)
-                                                                < 5.0f32.powf(2.0)
-                                                        })
-                                                        .filter(|(_, _, alignment)| {
-                                                            alignment == &&comp::Alignment::Wild
-                                                        })
-                                                        .min_by_key(|(_, wild_pos, _)| {
-                                                            (wild_pos.0.distance_squared(pos.0)
-                                                                * 100.0)
-                                                                as i32
-                                                        })
-                                                        .map(|(entity, _, _)| entity);
-                                                    nearest_tameable
-                                                } {
-                                                    let _ = state.ecs().write_storage().insert(
-                                                        tameable_entity,
-                                                        comp::Alignment::Owned(entity),
-                                                    );
-                                                    let _ = state.ecs().write_storage().insert(
-                                                        tameable_entity,
-                                                        comp::Agent::default(),
-                                                    );
-                                                    false
-                                                } else {
-                                                    true
-                                                }
-                                            } else {
-                                                true
-                                            };
-
-                                            if reinsert {
-                                                let _ = state
-                                                    .ecs()
-                                                    .write_storage::<comp::Inventory>()
-                                                    .get_mut(entity)
-                                                    .map(|inv| inv.insert(slot, item));
-                                            }
-                                        },
-                                    },
-                                    _ => {
-                                        let _ = state
-                                            .ecs()
-                                            .write_storage::<comp::Inventory>()
-                                            .get_mut(entity)
-                                            .map(|inv| inv.insert(slot, item));
-                                    },
-                                }
-                            }
-
-                            state.write_component(entity, comp::InventoryUpdate);
-                        },
-
-                        comp::InventoryManip::Swap(a, b) => {
-                            state
-                                .ecs()
-                                .write_storage::<comp::Inventory>()
-                                .get_mut(entity)
-                                .map(|inv| inv.swap_slots(a, b));
-                            state.write_component(entity, comp::InventoryUpdate);
-                        },
-
-                        comp::InventoryManip::Drop(slot) => {
-                            let item = state
-                                .ecs()
-                                .write_storage::<comp::Inventory>()
-                                .get_mut(entity)
-                                .and_then(|inv| inv.remove(slot));
-
-                            if let (Some(item), Some(pos)) =
-                                (item, state.ecs().read_storage::<comp::Pos>().get(entity))
-                            {
-                                dropped_items.push((
-                                    *pos,
-                                    state
-                                        .ecs()
-                                        .read_storage::<comp::Ori>()
-                                        .get(entity)
-                                        .copied()
-                                        .unwrap_or(comp::Ori(Vec3::unit_y())),
-                                    item,
-                                ));
-                            }
-                            state.write_component(entity, comp::InventoryUpdate);
-                        },
-                    }
-                },
-
-                ServerEvent::Respawn(entity) => {
-                    // Only clients can respawn
-                    if state
-                        .ecs()
-                        .write_storage::<Client>()
-                        .get_mut(entity)
-                        .is_some()
-                    {
-                        let respawn_point = state
-                            .read_component_cloned::<comp::Waypoint>(entity)
-                            .map(|wp| wp.get_pos())
-                            .unwrap_or(state.ecs().read_resource::<SpawnPoint>().0);
-
-                        state
-                            .ecs()
-                            .write_storage::<comp::Stats>()
-                            .get_mut(entity)
-                            .map(|stats| stats.revive());
-                        state
-                            .ecs()
-                            .write_storage::<comp::Pos>()
-                            .get_mut(entity)
-                            .map(|pos| pos.0 = respawn_point);
-                        state
-                            .ecs()
-                            .write_storage()
-                            .insert(entity, comp::ForceUpdate)
-                            .err()
-                            .map(|err| {
-                                error!(
-                                    "Error inserting ForceUpdate component when respawning \
-                                     client: {:?}",
-                                    err
-                                )
-                            });
-                    }
-                },
-
-                ServerEvent::LandOnGround { entity, vel } => {
-                    if vel.z <= -37.0 {
-                        if let Some(stats) =
-                            state.ecs().write_storage::<comp::Stats>().get_mut(entity)
-                        {
-                            let falldmg = (vel.z / 2.5) as i32;
-                            if falldmg < 0 {
-                                stats.health.change_by(comp::HealthChange {
-                                    amount: falldmg,
-                                    cause: comp::HealthSource::World,
-                                });
-                            }
-                        }
-                    }
-                },
-
-                ServerEvent::Mount(mounter, mountee) => {
-                    if state
-                        .ecs()
-                        .read_storage::<comp::Mounting>()
-                        .get(mounter)
-                        .is_none()
-                    {
-                        let not_mounting_yet = if let Some(comp::MountState::Unmounted) = state
-                            .ecs()
-                            .read_storage::<comp::MountState>()
-                            .get(mountee)
-                            .cloned()
-                        {
-                            true
-                        } else {
-                            false
-                        };
-
-                        if not_mounting_yet {
-                            if let (Some(mounter_uid), Some(mountee_uid)) = (
-                                state.ecs().uid_from_entity(mounter),
-                                state.ecs().uid_from_entity(mountee),
-                            ) {
-                                state.write_component(
-                                    mountee,
-                                    comp::MountState::MountedBy(mounter_uid.into()),
-                                );
-                                state.write_component(mounter, comp::Mounting(mountee_uid.into()));
-                            }
-                        }
-                    }
-                },
-
-                ServerEvent::Unmount(mounter) => {
-                    let mountee_entity = state
-                        .ecs()
-                        .write_storage::<comp::Mounting>()
-                        .get(mounter)
-                        .and_then(|mountee| state.ecs().entity_from_uid(mountee.0.into()));
-                    if let Some(mountee_entity) = mountee_entity {
-                        state
-                            .ecs()
-                            .write_storage::<comp::MountState>()
-                            .get_mut(mountee_entity)
-                            .map(|ms| *ms = comp::MountState::Unmounted);
-                    }
-                    state.delete_component::<comp::Mounting>(mounter);
-                },
-
-                ServerEvent::Possess(possessor_uid, possesse_uid) => {
-                    let ecs = state.ecs();
-                    if let (Some(possessor), Some(possesse)) = (
-                        ecs.entity_from_uid(possessor_uid.into()),
-                        ecs.entity_from_uid(possesse_uid.into()),
-                    ) {
-                        // You can't possess other players
-                        let mut clients = ecs.write_storage::<Client>();
-                        if clients.get_mut(possesse).is_none() {
-                            if let Some(mut client) = clients.remove(possessor) {
-                                client.notify(ServerMsg::SetPlayerEntity(possesse_uid.into()));
-                                clients.insert(possesse, client).err().map(|e| {
-                                    error!(
-                                        "Error inserting client component during possession: {:?}",
-                                        e
-                                    )
-                                });
-                                // Create inventory if it doesn't exist
-                                {
-                                    let mut inventories = ecs.write_storage::<comp::Inventory>();
-                                    if let Some(inventory) = inventories.get_mut(possesse) {
-                                        inventory.push(assets::load_expect_cloned(
-                                            "common.items.debug.possess",
-                                        ));
-                                    } else {
-                                        inventories
-                                            .insert(possesse, comp::Inventory {
-                                                slots: vec![
-                                                    Some(assets::load_expect_cloned(
-                                                        "common.items.debug.possess",
-                                                    )),
-                                                    None,
-                                                    None,
-                                                    None,
-                                                    None,
-                                                    None,
-                                                    None,
-                                                    None,
-                                                ],
-                                            })
-                                            .err()
-                                            .map(|e| {
-                                                error!(
-                                                    "Error inserting inventory component during \
-                                                     possession: {:?}",
-                                                    e
-                                                )
-                                            });
-                                    }
-                                }
-                                ecs.write_storage::<comp::InventoryUpdate>()
-                                    .insert(possesse, comp::InventoryUpdate)
-                                    .err()
-                                    .map(|e| {
-                                        error!(
-                                            "Error inserting inventory update component during \
-                                             possession: {:?}",
-                                            e
-                                        )
-                                    });
-                                // Move player component
-                                {
-                                    let mut players = ecs.write_storage::<comp::Player>();
-                                    if let Some(player) = players.remove(possessor) {
-                                        players.insert(possesse, player).err().map(|e| {
-                                            error!(
-                                                "Error inserting player component during \
-                                                 possession: {:?}",
-                                                e
-                                            )
-                                        });
-                                    }
-                                }
-                                // Transfer region subscription
-                                {
-                                    let mut subscriptions =
-                                        ecs.write_storage::<RegionSubscription>();
-                                    if let Some(s) = subscriptions.remove(possessor) {
-                                        subscriptions.insert(possesse, s).err().map(|e| {
-                                            error!(
-                                                "Error inserting subscription component during \
-                                                 possession: {:?}",
-                                                e
-                                            )
-                                        });
-                                    }
-                                }
-                                // Remove will of the entity
-                                ecs.write_storage::<comp::Agent>().remove(possesse);
-                                // Reset controller of former shell
-                                ecs.write_storage::<comp::Controller>()
-                                    .get_mut(possessor)
-                                    .map(|c| c.reset());
-                                // Transfer admin powers
-                                {
-                                    let mut admins = ecs.write_storage::<comp::Admin>();
-                                    if let Some(admin) = admins.remove(possessor) {
-                                        admins.insert(possesse, admin).err().map(|e| {
-                                            error!(
-                                                "Error inserting admin component during \
-                                                 possession: {:?}",
-                                                e
-                                            )
-                                        });
-                                    }
-                                }
-                                // Transfer waypoint
-                                {
-                                    let mut waypoints = ecs.write_storage::<comp::Waypoint>();
-                                    if let Some(waypoint) = waypoints.remove(possessor) {
-                                        waypoints.insert(possesse, waypoint).err().map(|e| {
-                                            error!(
-                                                "Error inserting waypoint component during \
-                                                 possession {:?}",
-                                                e
-                                            )
-                                        });
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-
-                ServerEvent::CreateCharacter {
-                    entity,
-                    name,
-                    body,
-                    main,
-                } => {
-                    Self::create_player_character(
-                        state,
-                        entity,
-                        name,
-                        body,
-                        main,
-                        &server_settings,
-                    );
-                    sys::subscription::initialize_region_subscription(state.ecs(), entity);
-                },
-
-                ServerEvent::ExitIngame { entity } => {
-                    // Create new entity with just `Client`, `Uid`, and `Player` components
-                    // Easier than checking and removing all other known components
-                    // Note: If other `ServerEvent`s are referring to this entity they will be
-                    // disrupted
-                    let maybe_client = state.ecs().write_storage::<Client>().remove(entity);
-                    let maybe_uid = state.read_component_cloned::<Uid>(entity);
-                    let maybe_player = state.ecs().write_storage::<comp::Player>().remove(entity);
-                    if let (Some(mut client), Some(uid), Some(player)) =
-                        (maybe_client, maybe_uid, maybe_player)
-                    {
-                        // Tell client its request was successful
-                        client.allow_state(ClientState::Registered);
-                        // Tell client to clear out other entities and its own components
-                        client.notify(ServerMsg::ExitIngameCleanup);
-
-                        let entity_builder =
-                            state.ecs_mut().create_entity().with(client).with(player);
-                        // Ensure UidAllocator maps this uid to the new entity
-                        let uid = entity_builder
-                            .world
-                            .write_resource::<UidAllocator>()
-                            .allocate(entity_builder.entity, Some(uid.into()));
-                        entity_builder.with(uid).build();
-                    }
-                    // Delete old entity
-                    if let Err(err) = state.delete_entity_recorded(entity) {
-                        error!("Failed to delete entity when removing character: {:?}", err);
-                    }
-                },
-
-                ServerEvent::CreateNpc {
-                    pos,
-                    stats,
-                    body,
-                    agent,
-                    alignment,
-                    scale,
-                } => {
-                    state
-                        .create_npc(pos, stats, body)
-                        .with(agent)
-                        .with(scale)
-                        .with(alignment)
-                        .build();
-                },
-
-                ServerEvent::CreateWaypoint(pos) => {
-                    self.create_object(comp::Pos(pos), comp::object::Body::CampfireLit)
-                        .with(comp::LightEmitter {
-                            offset: Vec3::unit_z() * 0.5,
-                            col: Rgb::new(1.0, 0.65, 0.2),
-                            strength: 2.0,
-                        })
-                        .with(comp::WaypointArea::default())
-                        .build();
-                },
-
-                ServerEvent::ClientDisconnect(entity) => {
-                    // Tell other clients to remove from player list
-                    if let (Some(uid), Some(_)) = (
-                        state.read_storage::<Uid>().get(entity),
-                        state.read_storage::<comp::Player>().get(entity),
-                    ) {
-                        state.notify_registered_clients(ServerMsg::PlayerListUpdate(
-                            PlayerListUpdate::Remove((*uid).into()),
-                        ))
-                    }
-
-                    // Delete client entity
-                    if let Err(err) = state.delete_entity_recorded(entity) {
-                        error!("Failed to delete disconnected client: {:?}", err);
-                    }
-
-                    frontend_events.push(Event::ClientDisconnected { entity });
-                },
-
-                ServerEvent::ChunkRequest(entity, key) => {
-                    requested_chunks.push((entity, key));
-                },
-
-                ServerEvent::ChatCmd(entity, cmd) => {
-                    chat_commands.push((entity, cmd));
-                },
-            }
-        }
-
-        // Generate requested chunks.
-        for (entity, key) in requested_chunks {
-            self.generate_chunk(entity, key);
-        }
-
-        // Drop items
-        for (pos, ori, item) in dropped_items {
-            let vel = ori.0.normalized() * 5.0
-                + Vec3::unit_z() * 10.0
-                + Vec3::<f32>::zero().map(|_| rand::thread_rng().gen::<f32>() - 0.5) * 4.0;
-            self.create_object(Default::default(), comp::object::Body::Pouch)
-                .with(comp::Pos(pos.0 + Vec3::unit_z() * 0.25))
-                .with(item)
-                .with(comp::Vel(vel))
-                .build();
-        }
-
-        for (entity, cmd) in chat_commands {
-            self.process_chat_cmd(entity, cmd);
-        }
-
-        frontend_events
-    }
-
     /// Execute a single server tick, handle input and update the game state by
     /// the given duration.
     pub fn tick(&mut self, _input: Input, dt: Duration) -> Result<Vec<Event>, Error> {
@@ -1064,7 +247,6 @@ impl Server {
         // 8) Finish the tick, passing control of the main thread back
         //    to the frontend
 
-        let before_tick_1 = Instant::now();
         // 1) Build up a list of events for this frame, to be passed to the frontend.
         let mut frontend_events = Vec::new();
 
@@ -1075,30 +257,49 @@ impl Server {
 
         // 2)
 
+        let before_new_connections = Instant::now();
+
         // 3) Handle inputs from clients
         frontend_events.append(&mut self.handle_new_connections()?);
 
+        let before_message_system = Instant::now();
+
         // Run message recieving sys before the systems in common for decreased latency
         // (e.g. run before controller system)
         sys::message::Sys.run_now(&self.state.ecs());
 
-        let before_tick_4 = Instant::now();
+        let before_state_tick = Instant::now();
 
         // 4) Tick the server's LocalState.
-        self.state.tick(dt, sys::add_server_systems);
+        // 5) Fetch any generated `TerrainChunk`s and insert them into the terrain.
+        // in sys/terrain.rs
+        self.state.tick(dt, sys::add_server_systems, false);
 
         let before_handle_events = Instant::now();
+
         // Handle game events
         frontend_events.append(&mut self.handle_events());
 
+        let before_update_terrain_and_regions = Instant::now();
+
+        // Apply terrain changes and update the region map after processing server
+        // events so that changes made by server events will be immediately
+        // visble to client synchronization systems, minimizing the latency of
+        // `ServerEvent` mediated effects
+        self.state.update_region_map();
+        self.state.apply_terrain_changes();
+
+        let before_sync = Instant::now();
+
+        // 6) Synchronise clients with the new state of the world.
+        sys::run_sync_systems(self.state.ecs_mut());
+
+        let before_world_tick = Instant::now();
+
         // Tick the world
         self.world.tick(dt);
 
-        // 5) Fetch any generated `TerrainChunk`s and insert them into the terrain.
-        // in sys/terrain.rs
-
-        let before_tick_6 = Instant::now();
-        // 6) Synchronise clients with the new state of the world.
+        let before_entity_cleanup = Instant::now();
 
         // Remove NPCs that are outside the view distances of all players
         // This is done by removing NPCs in unloaded chunks
@@ -1120,8 +321,9 @@ impl Server {
             }
         }
 
-        let before_tick_7 = Instant::now();
+        let end_of_server_tick = Instant::now();
         // 7) Update Metrics
+        // Get system timing info
         let entity_sync_nanos = self
             .state
             .ecs()
@@ -1140,31 +342,36 @@ impl Server {
             .read_resource::<sys::TerrainSyncTimer>()
             .nanos as i64;
         let terrain_nanos = self.state.ecs().read_resource::<sys::TerrainTimer>().nanos as i64;
-        let total_sys_nanos = entity_sync_nanos
-            + message_nanos
-            + sentinel_nanos
-            + subscription_nanos
-            + terrain_sync_nanos
-            + terrain_nanos;
+        let waypoint_nanos = self.state.ecs().read_resource::<sys::WaypointTimer>().nanos as i64;
+        let total_sys_ran_in_dispatcher_nanos = terrain_nanos + waypoint_nanos;
+        // Report timing info
         self.metrics
             .tick_time
-            .with_label_values(&["input"])
-            .set((before_tick_4 - before_tick_1).as_nanos() as i64 - message_nanos);
+            .with_label_values(&["new connections"])
+            .set((before_message_system - before_new_connections).as_nanos() as i64);
         self.metrics
             .tick_time
             .with_label_values(&["state tick"])
             .set(
-                (before_handle_events - before_tick_4).as_nanos() as i64
-                    - (total_sys_nanos - message_nanos),
+                (before_handle_events - before_state_tick).as_nanos() as i64
+                    - total_sys_ran_in_dispatcher_nanos,
             );
         self.metrics
             .tick_time
             .with_label_values(&["handle server events"])
-            .set((before_tick_6 - before_handle_events).as_nanos() as i64);
+            .set((before_update_terrain_and_regions - before_handle_events).as_nanos() as i64);
         self.metrics
             .tick_time
-            .with_label_values(&["entity deletion"])
-            .set((before_tick_7 - before_tick_6).as_nanos() as i64);
+            .with_label_values(&["update terrain and region map"])
+            .set((before_sync - before_update_terrain_and_regions).as_nanos() as i64);
+        self.metrics
+            .tick_time
+            .with_label_values(&["world tick"])
+            .set((before_entity_cleanup - before_world_tick).as_nanos() as i64);
+        self.metrics
+            .tick_time
+            .with_label_values(&["entity cleanup"])
+            .set((end_of_server_tick - before_entity_cleanup).as_nanos() as i64);
         self.metrics
             .tick_time
             .with_label_values(&["entity sync"])
@@ -1173,6 +380,10 @@ impl Server {
             .tick_time
             .with_label_values(&["message"])
             .set(message_nanos);
+        self.metrics
+            .tick_time
+            .with_label_values(&["sentinel"])
+            .set(sentinel_nanos);
         self.metrics
             .tick_time
             .with_label_values(&["subscription"])
@@ -1185,6 +396,11 @@ impl Server {
             .tick_time
             .with_label_values(&["terrain"])
             .set(terrain_nanos);
+        self.metrics
+            .tick_time
+            .with_label_values(&["waypoint"])
+            .set(waypoint_nanos);
+        // Report other info
         self.metrics
             .player_online
             .set(self.state.ecs().read_storage::<Client>().join().count() as i64);
@@ -1204,7 +420,7 @@ impl Server {
         self.metrics
             .tick_time
             .with_label_values(&["metrics"])
-            .set(before_tick_7.elapsed().as_nanos() as i64);
+            .set(end_of_server_tick.elapsed().as_nanos() as i64);
 
         // 8) Finish the tick, pass control back to the frontend.
 
@@ -1233,7 +449,7 @@ impl Server {
                 <= self.state.ecs().read_storage::<Client>().join().count()
             {
                 // Note: in this case the client is dropped
-                client.notify(ServerMsg::Error(ServerError::TooManyPlayers));
+                client.notify(ServerMsg::TooManyPlayers);
             } else {
                 let entity = self
                     .state
@@ -1309,120 +525,10 @@ impl Server {
             .get(entity)
             .is_some()
     }
+
+    pub fn number_of_players(&self) -> i64 { self.metrics.player_online.get() }
 }
 
 impl Drop for Server {
     fn drop(&mut self) { self.state.notify_registered_clients(ServerMsg::Shutdown); }
 }
-
-trait StateExt {
-    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool;
-    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect);
-    fn notify_registered_clients(&self, msg: ServerMsg);
-    fn create_npc(
-        &mut self,
-        pos: comp::Pos,
-        stats: comp::Stats,
-        body: comp::Body,
-    ) -> EcsEntityBuilder;
-    fn delete_entity_recorded(
-        &mut self,
-        entity: EcsEntity,
-    ) -> Result<(), specs::error::WrongGeneration>;
-}
-
-impl StateExt for State {
-    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool {
-        let success = self
-            .ecs()
-            .write_storage::<comp::Inventory>()
-            .get_mut(entity)
-            .map(|inv| inv.push(item).is_none())
-            .unwrap_or(false);
-        if success {
-            self.write_component(entity, comp::InventoryUpdate);
-        }
-        success
-    }
-
-    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect) {
-        match effect {
-            Effect::Health(change) => {
-                self.ecs()
-                    .write_storage::<comp::Stats>()
-                    .get_mut(entity)
-                    .map(|stats| stats.health.change_by(change));
-            },
-            Effect::Xp(xp) => {
-                self.ecs()
-                    .write_storage::<comp::Stats>()
-                    .get_mut(entity)
-                    .map(|stats| stats.exp.change_by(xp));
-            },
-        }
-    }
-
-    /// Build a non-player character.
-    fn create_npc(
-        &mut self,
-        pos: comp::Pos,
-        stats: comp::Stats,
-        body: comp::Body,
-    ) -> EcsEntityBuilder {
-        self.ecs_mut()
-            .create_entity_synced()
-            .with(pos)
-            .with(comp::Vel(Vec3::zero()))
-            .with(comp::Ori(Vec3::unit_y()))
-            .with(comp::Controller::default())
-            .with(body)
-            .with(stats)
-            .with(comp::Alignment::Npc)
-            .with(comp::Energy::new(500))
-            .with(comp::Gravity(1.0))
-            .with(comp::CharacterState::default())
-    }
-
-    fn notify_registered_clients(&self, msg: ServerMsg) {
-        for client in (&mut self.ecs().write_storage::<Client>())
-            .join()
-            .filter(|c| c.is_registered())
-        {
-            client.notify(msg.clone())
-        }
-    }
-
-    fn delete_entity_recorded(
-        &mut self,
-        entity: EcsEntity,
-    ) -> Result<(), specs::error::WrongGeneration> {
-        let (maybe_uid, maybe_pos) = (
-            self.ecs().read_storage::<Uid>().get(entity).copied(),
-            self.ecs().read_storage::<comp::Pos>().get(entity).copied(),
-        );
-        let res = self.ecs_mut().delete_entity(entity);
-        if res.is_ok() {
-            if let (Some(uid), Some(pos)) = (maybe_uid, maybe_pos) {
-                if let Some(region_key) = self
-                    .ecs()
-                    .read_resource::<common::region::RegionMap>()
-                    .find_region(entity, pos.0)
-                {
-                    self.ecs()
-                        .write_resource::<DeletedEntities>()
-                        .record_deleted_entity(uid, region_key);
-                } else {
-                    // Don't panic if the entity wasn't found in a region maybe it was just created
-                    // and then deleted before the region manager had a chance to assign it a
-                    // region
-                    warn!(
-                        "Failed to find region containing entity during entity deletion, assuming \
-                         it wasn't sent to any clients and so deletion doesn't need to be \
-                         recorded for sync purposes"
-                    );
-                }
-            }
-        }
-        res
-    }
-}
diff --git a/server/src/settings.rs b/server/src/settings.rs
index 4ab9e0bbd1..12c6fc157f 100644
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -10,12 +10,12 @@ const DEFAULT_WORLD_SEED: u32 = 5284;
 pub struct ServerSettings {
     pub gameserver_address: SocketAddr,
     pub metrics_address: SocketAddr,
+    pub auth_server_address: Option<String>,
     pub max_players: usize,
     pub world_seed: u32,
     //pub pvp_enabled: bool,
     pub server_name: String,
     pub server_description: String,
-    //pub login_server: whatever
     pub start_time: f64,
     pub admins: Vec<String>,
     /// When set to None, loads the default map file (if available); otherwise,
@@ -28,6 +28,7 @@ impl Default for ServerSettings {
         Self {
             gameserver_address: SocketAddr::from(([0; 4], 14004)),
             metrics_address: SocketAddr::from(([0; 4], 14005)),
+            auth_server_address: Some("https://auth.veloren.net".into()),
             world_seed: DEFAULT_WORLD_SEED,
             server_name: "Veloren Alpha".to_owned(),
             server_description: "This is the best Veloren server.".to_owned(),
@@ -107,6 +108,7 @@ impl ServerSettings {
                 [127, 0, 0, 1],
                 pick_unused_port().expect("Failed to find unused port!"),
             )),
+            auth_server_address: None,
             // If loading the default map file, make sure the seed is also default.
             world_seed: if load.map_file.is_some() {
                 load.world_seed
diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs
new file mode 100644
index 0000000000..421dfc9fe7
--- /dev/null
+++ b/server/src/state_ext.rs
@@ -0,0 +1,222 @@
+use crate::{client::Client, settings::ServerSettings, sys::sentinel::DeletedEntities, SpawnPoint};
+use common::{
+    assets, comp,
+    effect::Effect,
+    msg::{ClientState, ServerMsg},
+    state::State,
+    sync::{Uid, WorldSyncExt},
+};
+use log::warn;
+use specs::{Builder, Entity as EcsEntity, EntityBuilder as EcsEntityBuilder, Join, WorldExt};
+use vek::*;
+
+pub trait StateExt {
+    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool;
+    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect);
+    fn create_npc(
+        &mut self,
+        pos: comp::Pos,
+        stats: comp::Stats,
+        body: comp::Body,
+    ) -> EcsEntityBuilder;
+    fn create_object(&mut self, pos: comp::Pos, object: comp::object::Body) -> EcsEntityBuilder;
+    fn create_projectile(
+        &mut self,
+        pos: comp::Pos,
+        vel: comp::Vel,
+        body: comp::Body,
+        projectile: comp::Projectile,
+    ) -> EcsEntityBuilder;
+    fn create_player_character(
+        &mut self,
+        entity: EcsEntity,
+        name: String,
+        body: comp::Body,
+        main: Option<String>,
+        server_settings: &ServerSettings,
+    );
+    fn notify_registered_clients(&self, msg: ServerMsg);
+    fn delete_entity_recorded(
+        &mut self,
+        entity: EcsEntity,
+    ) -> Result<(), specs::error::WrongGeneration>;
+}
+
+impl StateExt for State {
+    fn give_item(&mut self, entity: EcsEntity, item: comp::Item) -> bool {
+        let success = self
+            .ecs()
+            .write_storage::<comp::Inventory>()
+            .get_mut(entity)
+            .map(|inv| inv.push(item).is_none())
+            .unwrap_or(false);
+        if success {
+            self.write_component(
+                entity,
+                comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Collected),
+            );
+        }
+        success
+    }
+
+    fn apply_effect(&mut self, entity: EcsEntity, effect: Effect) {
+        match effect {
+            Effect::Health(change) => {
+                self.ecs()
+                    .write_storage::<comp::Stats>()
+                    .get_mut(entity)
+                    .map(|stats| stats.health.change_by(change));
+            },
+            Effect::Xp(xp) => {
+                self.ecs()
+                    .write_storage::<comp::Stats>()
+                    .get_mut(entity)
+                    .map(|stats| stats.exp.change_by(xp));
+            },
+        }
+    }
+
+    /// Build a non-player character.
+    fn create_npc(
+        &mut self,
+        pos: comp::Pos,
+        stats: comp::Stats,
+        body: comp::Body,
+    ) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(comp::Vel(Vec3::zero()))
+            .with(comp::Ori(Vec3::unit_y()))
+            .with(comp::Controller::default())
+            .with(body)
+            .with(stats)
+            .with(comp::Alignment::Npc)
+            .with(comp::Energy::new(500))
+            .with(comp::Gravity(1.0))
+            .with(comp::CharacterState::default())
+    }
+
+    /// Build a static object entity
+    fn create_object(&mut self, pos: comp::Pos, object: comp::object::Body) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(comp::Vel(Vec3::zero()))
+            .with(comp::Ori(Vec3::unit_y()))
+            .with(comp::Body::Object(object))
+            .with(comp::Mass(100.0))
+            .with(comp::Gravity(1.0))
+        //.with(comp::LightEmitter::default())
+    }
+
+    /// Build a projectile
+    fn create_projectile(
+        &mut self,
+        pos: comp::Pos,
+        vel: comp::Vel,
+        body: comp::Body,
+        projectile: comp::Projectile,
+    ) -> EcsEntityBuilder {
+        self.ecs_mut()
+            .create_entity_synced()
+            .with(pos)
+            .with(vel)
+            .with(comp::Ori(vel.0.normalized()))
+            .with(comp::Mass(0.0))
+            .with(body)
+            .with(projectile)
+            .with(comp::Sticky)
+    }
+
+    fn create_player_character(
+        &mut self,
+        entity: EcsEntity,
+        name: String,
+        body: comp::Body,
+        main: Option<String>,
+        server_settings: &ServerSettings,
+    ) {
+        // Give no item when an invalid specifier is given
+        let main = main.and_then(|specifier| assets::load_cloned(&specifier).ok());
+
+        let spawn_point = self.ecs().read_resource::<SpawnPoint>().0;
+
+        self.write_component(entity, body);
+        self.write_component(entity, comp::Stats::new(name, body, main));
+        self.write_component(entity, comp::Energy::new(1000));
+        self.write_component(entity, comp::Controller::default());
+        self.write_component(entity, comp::Pos(spawn_point));
+        self.write_component(entity, comp::Vel(Vec3::zero()));
+        self.write_component(entity, comp::Ori(Vec3::unit_y()));
+        self.write_component(entity, comp::Gravity(1.0));
+        self.write_component(entity, comp::CharacterState::default());
+        self.write_component(entity, comp::Alignment::Owned(entity));
+        self.write_component(entity, comp::Inventory::default());
+        self.write_component(
+            entity,
+            comp::InventoryUpdate::new(comp::InventoryUpdateEvent::default()),
+        );
+        // Make sure physics are accepted.
+        self.write_component(entity, comp::ForceUpdate);
+
+        // Give the Admin component to the player if their name exists in admin list
+        if server_settings.admins.contains(
+            &self
+                .ecs()
+                .read_storage::<comp::Player>()
+                .get(entity)
+                .expect("Failed to fetch entity.")
+                .alias,
+        ) {
+            self.write_component(entity, comp::Admin);
+        }
+        // Tell the client its request was successful.
+        if let Some(client) = self.ecs().write_storage::<Client>().get_mut(entity) {
+            client.allow_state(ClientState::Character);
+        }
+    }
+
+    fn notify_registered_clients(&self, msg: ServerMsg) {
+        for client in (&mut self.ecs().write_storage::<Client>())
+            .join()
+            .filter(|c| c.is_registered())
+        {
+            client.notify(msg.clone())
+        }
+    }
+
+    fn delete_entity_recorded(
+        &mut self,
+        entity: EcsEntity,
+    ) -> Result<(), specs::error::WrongGeneration> {
+        let (maybe_uid, maybe_pos) = (
+            self.ecs().read_storage::<Uid>().get(entity).copied(),
+            self.ecs().read_storage::<comp::Pos>().get(entity).copied(),
+        );
+        let res = self.ecs_mut().delete_entity(entity);
+        if res.is_ok() {
+            if let (Some(uid), Some(pos)) = (maybe_uid, maybe_pos) {
+                if let Some(region_key) = self
+                    .ecs()
+                    .read_resource::<common::region::RegionMap>()
+                    .find_region(entity, pos.0)
+                {
+                    self.ecs()
+                        .write_resource::<DeletedEntities>()
+                        .record_deleted_entity(uid, region_key);
+                } else {
+                    // Don't panic if the entity wasn't found in a region maybe it was just created
+                    // and then deleted before the region manager had a chance to assign it a
+                    // region
+                    warn!(
+                        "Failed to find region containing entity during entity deletion, assuming \
+                         it wasn't sent to any clients and so deletion doesn't need to be \
+                         recorded for sync purposes"
+                    );
+                }
+            }
+        }
+        res
+    }
+}
diff --git a/server/src/sys/entity_sync.rs b/server/src/sys/entity_sync.rs
index 1d28b77117..62bc7521a7 100644
--- a/server/src/sys/entity_sync.rs
+++ b/server/src/sys/entity_sync.rs
@@ -328,8 +328,11 @@ impl<'a> System<'a> for Sys {
         // TODO: Sync clients that don't have a position?
 
         // Sync inventories
-        for (client, inventory, _) in (&mut clients, &inventories, &inventory_updates).join() {
-            client.notify(ServerMsg::InventoryUpdate(inventory.clone()));
+        for (client, inventory, update) in (&mut clients, &inventories, &inventory_updates).join() {
+            client.notify(ServerMsg::InventoryUpdate(
+                inventory.clone(),
+                update.event(),
+            ));
         }
 
         // Remove all force flags.
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index f68d32f9e6..156e13b860 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -1,7 +1,7 @@
 use super::SysTimer;
 use crate::{auth_provider::AuthProvider, client::Client, CLIENT_TIMEOUT};
 use common::{
-    comp::{Admin, Body, CanBuild, Controller, ForceUpdate, Ori, Player, Pos, Stats, Vel},
+    comp::{Admin, CanBuild, Controller, ForceUpdate, Ori, Player, Pos, Stats, Vel},
     event::{EventBus, ServerEvent},
     msg::{
         validate_chat_msg, ChatMsgValidationError, ClientMsg, ClientState, PlayerListUpdate,
@@ -27,7 +27,6 @@ impl<'a> System<'a> for Sys {
         ReadExpect<'a, TerrainGrid>,
         Write<'a, SysTimer<Self>>,
         ReadStorage<'a, Uid>,
-        ReadStorage<'a, Body>,
         ReadStorage<'a, CanBuild>,
         ReadStorage<'a, Admin>,
         ReadStorage<'a, ForceUpdate>,
@@ -51,7 +50,6 @@ impl<'a> System<'a> for Sys {
             terrain,
             mut timer,
             uids,
-            bodies,
             can_build,
             admins,
             force_updates,
@@ -81,7 +79,6 @@ impl<'a> System<'a> for Sys {
         let mut new_players = Vec::new();
 
         for (entity, client) in (&entities, &mut clients).join() {
-            let mut disconnect = false;
             let new_msgs = client.postbox.new_messages();
 
             // Update client ping.
@@ -91,7 +88,7 @@ impl<'a> System<'a> for Sys {
                 || client.postbox.error().is_some()
             // Postbox error
             {
-                disconnect = true;
+                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
             } else if time - client.last_ping > CLIENT_TIMEOUT * 0.5 {
                 // Try pinging the client if the timeout is nearing.
                 client.postbox.send_message(ServerMsg::Ping);
@@ -122,12 +119,27 @@ impl<'a> System<'a> for Sys {
                         },
                         ClientState::Pending => {},
                     },
-                    // Valid player
-                    ClientMsg::Register { player, password } if player.is_valid() => {
-                        if !accounts.query(player.alias.clone(), password) {
-                            client.error_state(RequestStateError::Denied);
+                    // Request registered state (login)
+                    ClientMsg::Register {
+                        view_distance,
+                        token_or_username,
+                    } => {
+                        let (username, uuid) = match accounts.query(token_or_username.clone()) {
+                            Err(err) => {
+                                client.error_state(RequestStateError::RegisterDenied(err));
+                                break;
+                            },
+                            Ok((username, uuid)) => (username, uuid),
+                        };
+
+                        let player = Player::new(username, view_distance, uuid);
+
+                        if !player.is_valid() {
+                            // Invalid player
+                            client.error_state(RequestStateError::Impossible);
                             break;
                         }
+
                         match client.client_state {
                             ClientState::Connected => {
                                 // Add Player component to this client
@@ -148,8 +160,6 @@ impl<'a> System<'a> for Sys {
                         }
                         //client.allow_state(ClientState::Registered);
                     },
-                    // Invalid player
-                    ClientMsg::Register { .. } => client.error_state(RequestStateError::Impossible),
                     ClientMsg::SetViewDistance(view_distance) => match client.client_state {
                         ClientState::Character { .. } => {
                             players
@@ -272,25 +282,13 @@ impl<'a> System<'a> for Sys {
                     ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),
                     ClientMsg::Pong => {},
                     ClientMsg::Disconnect => {
-                        disconnect = true;
+                        client.postbox.send_message(ServerMsg::Disconnect);
+                    },
+                    ClientMsg::Terminate => {
+                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                     },
                 }
             }
-
-            if disconnect {
-                if let (Some(player), Some(_)) = (
-                    players.get(entity),
-                    // It only shows a message if you had a body (not in char selection)
-                    bodies.get(entity),
-                ) {
-                    new_chat_msgs.push((
-                        None,
-                        ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
-                    ));
-                }
-                server_emitter.emit(ServerEvent::ClientDisconnect(entity));
-                client.postbox.send_message(ServerMsg::Disconnect);
-            }
         }
 
         // Handle new players.
diff --git a/server/src/sys/mod.rs b/server/src/sys/mod.rs
index bead21501e..d622582e9b 100644
--- a/server/src/sys/mod.rs
+++ b/server/src/sys/mod.rs
@@ -15,30 +15,35 @@ pub type SentinelTimer = SysTimer<sentinel::Sys>;
 pub type SubscriptionTimer = SysTimer<subscription::Sys>;
 pub type TerrainTimer = SysTimer<terrain::Sys>;
 pub type TerrainSyncTimer = SysTimer<terrain_sync::Sys>;
+pub type WaypointTimer = SysTimer<waypoint::Sys>;
 
 // System names
-const ENTITY_SYNC_SYS: &str = "server_entity_sync_sys";
-const SENTINEL_SYS: &str = "sentinel_sys";
-const SUBSCRIPTION_SYS: &str = "server_subscription_sys";
-const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys";
+// Note: commented names may be useful in the future
+//const ENTITY_SYNC_SYS: &str = "server_entity_sync_sys";
+//const SENTINEL_SYS: &str = "sentinel_sys";
+//const SUBSCRIPTION_SYS: &str = "server_subscription_sys";
+//const TERRAIN_SYNC_SYS: &str = "server_terrain_sync_sys";
 const TERRAIN_SYS: &str = "server_terrain_sys";
 const WAYPOINT_SYS: &str = "waypoint_sys";
 
 pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
-    // TODO: makes some of these dependent on systems in common like the phys system
-    dispatch_builder.add(sentinel::Sys, SENTINEL_SYS, &[common::sys::PHYS_SYS]);
-    dispatch_builder.add(subscription::Sys, SUBSCRIPTION_SYS, &[
-        common::sys::PHYS_SYS,
-    ]);
-    dispatch_builder.add(entity_sync::Sys, ENTITY_SYNC_SYS, &[
-        SUBSCRIPTION_SYS,
-        SENTINEL_SYS,
-    ]);
-    dispatch_builder.add(terrain_sync::Sys, TERRAIN_SYS, &[]);
-    dispatch_builder.add(terrain::Sys, TERRAIN_SYNC_SYS, &[TERRAIN_SYS]);
+    dispatch_builder.add(terrain::Sys, TERRAIN_SYS, &[]);
     dispatch_builder.add(waypoint::Sys, WAYPOINT_SYS, &[]);
 }
 
+pub fn run_sync_systems(ecs: &mut specs::World) {
+    use specs::RunNow;
+
+    // Setup for entity sync
+    // If I'm not mistaken, these two could be ran in parallel
+    sentinel::Sys.run_now(ecs);
+    subscription::Sys.run_now(ecs);
+
+    // Sync
+    terrain_sync::Sys.run_now(ecs);
+    entity_sync::Sys.run_now(ecs);
+}
+
 /// Used to keep track of how much time each system takes
 pub struct SysTimer<S> {
     pub nanos: u64,
diff --git a/server/src/sys/terrain_sync.rs b/server/src/sys/terrain_sync.rs
index 426a062788..2300640120 100644
--- a/server/src/sys/terrain_sync.rs
+++ b/server/src/sys/terrain_sync.rs
@@ -8,12 +8,8 @@ use common::{
 };
 use specs::{Join, Read, ReadExpect, ReadStorage, System, Write, WriteStorage};
 
-/// This system will handle loading generated chunks and unloading
-/// uneeded chunks.
-///     1. Inserts newly generated chunks into the TerrainGrid
-///     2. Sends new chunks to neaby clients
-///     3. Handles the chunk's supplement (e.g. npcs)
-///     4. Removes chunks outside the range of players
+/// This systems sends new chunks to clients as well as changes to existing
+/// chunks
 pub struct Sys;
 impl<'a> System<'a> for Sys {
     type SystemData = (
diff --git a/server/src/sys/waypoint.rs b/server/src/sys/waypoint.rs
index a09ec4e92b..6234b95d22 100644
--- a/server/src/sys/waypoint.rs
+++ b/server/src/sys/waypoint.rs
@@ -1,5 +1,6 @@
+use super::SysTimer;
 use common::comp::{Player, Pos, Waypoint, WaypointArea};
-use specs::{Entities, Join, ReadStorage, System, WriteStorage};
+use specs::{Entities, Join, ReadStorage, System, Write, WriteStorage};
 
 /// This system updates player waypoints
 /// TODO: Make this faster by only considering local waypoints
@@ -11,12 +12,15 @@ impl<'a> System<'a> for Sys {
         ReadStorage<'a, Player>,
         ReadStorage<'a, WaypointArea>,
         WriteStorage<'a, Waypoint>,
+        Write<'a, SysTimer<Self>>,
     );
 
     fn run(
         &mut self,
-        (entities, positions, players, waypoint_areas, mut waypoints): Self::SystemData,
+        (entities, positions, players, waypoint_areas, mut waypoints, mut timer): Self::SystemData,
     ) {
+        timer.start();
+
         for (entity, player_pos, _) in (&entities, &positions, &players).join() {
             for (waypoint_pos, waypoint_area) in (&positions, &waypoint_areas).join() {
                 if player_pos.0.distance_squared(waypoint_pos.0) < waypoint_area.radius().powf(2.0)
@@ -25,5 +29,7 @@ impl<'a> System<'a> for Sys {
                 }
             }
         }
+
+        timer.end();
     }
 }
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index db5a64754c..21049a4c4c 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -24,8 +24,8 @@ gfx_device_gl = { version = "0.16.2", optional = true }
 gfx_window_glutin = "0.31.0"
 glutin = "0.21.1"
 winit = { version = "0.19.4", features = ["serde"] }
-conrod_core = { git = "https://gitlab.com/veloren/conrod.git" }
-conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
+conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "hide_text" }
+conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "hide_text" }
 euc = "0.3.0"
 
 # ECS
@@ -35,6 +35,9 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }
 # Mathematics
 vek = { version = "0.9.9", features = ["serde"] }
 
+# Controller
+gilrs = { version = "0.7", features = ["serde"] }
+
 # Singleplayer
 server = { package = "veloren-server", path = "../server", optional = true }
 
@@ -55,15 +58,15 @@ num = "0.2.0"
 backtrace = "0.3.40"
 rand = "0.7.2"
 treeculler = { git = "https://gitlab.com/yusdacra/treeculler.git" }
-# context for pinning to commit: https://gitlab.com/veloren/veloren/issues/280
-rodio = { git = "https://github.com/RustAudio/rodio", rev = "e5474a2"}
+rodio = { version = "0.10", default-features = false, features = ["wav", "vorbis"] }
 cpal = "0.10"
 crossbeam = "=0.7.2"
 hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] }
 chrono = "0.4.9"
-rust-argon2 = "0.5"
 bincode = "1.2"
 deunicode = "1.0"
+uvth = "3.1.1"
+authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 dispatch = "0.1.4"
@@ -73,7 +76,9 @@ winres = "0.1"
 
 [dev-dependencies]
 criterion = "0.3"
+git2 = "0.10"
 world = { package = "veloren-world", path = "../world" }
+gfx_window_glutin = { version = "0.31.0", features = ["headless"] }
 
 [[bench]]
 name = "meshing_benchmark"
diff --git a/voxygen/examples/character_renderer.rs b/voxygen/examples/character_renderer.rs
new file mode 100644
index 0000000000..ae07183f5e
--- /dev/null
+++ b/voxygen/examples/character_renderer.rs
@@ -0,0 +1,58 @@
+use common::{assets, comp};
+use gfx_window_glutin::init_headless;
+use vek::*;
+use veloren_voxygen::{render, scene::simple as scene};
+
+fn main() {
+    // Setup renderer
+    let dim = (200u16, 300u16, 1, gfx::texture::AaMode::Single);
+    let events_loop = glutin::EventsLoop::new();
+    let context = glutin::ContextBuilder::new()
+        .with_gl(glutin::GlRequest::Specific(glutin::Api::OpenGl, (3, 2)))
+        .build_headless(&events_loop, (dim.0 as u32, dim.1 as u32).into())
+        .expect("Failed to build headless context");
+
+    let (_context, device, factory, color_view, depth_view) = init_headless(context, dim);
+
+    let mut renderer = render::Renderer::new(
+        device,
+        factory,
+        color_view,
+        depth_view,
+        render::AaMode::SsaaX4,
+        render::CloudMode::Regular,
+        render::FluidMode::Shiny,
+    )
+    .unwrap();
+
+    // Create character
+    let body = comp::humanoid::Body::random();
+    const STARTER_BOW: &str = "common.items.weapons.starter_bow";
+    let equipment = comp::Equipment {
+        main: assets::load_cloned(STARTER_BOW).ok(),
+        alt: None,
+    };
+
+    // Setup scene (using the character selection screen `Scene`)
+    let mut scene = scene::Scene::new(&mut renderer, None);
+    let scene_data = scene::SceneData {
+        time: 1.0,
+        delta_time: 1.0,
+        tick: 0,
+        body: Some(body.clone()),
+        gamma: 1.0,
+    };
+    scene.camera_mut().set_focus_pos(Vec3::unit_z() * 0.8);
+    scene.camera_mut().set_distance(1.5);
+    scene.camera_mut().update(0.0);
+    scene.maintain(&mut renderer, scene_data);
+
+    // Render
+    renderer.clear();
+    scene.render(&mut renderer, 0, Some(body), &equipment);
+
+    renderer.flush();
+    // Get image
+    let img = renderer.create_screenshot().unwrap();
+    img.save("character.png").unwrap();
+}
diff --git a/voxygen/src/anim/biped_large/mod.rs b/voxygen/src/anim/biped_large/mod.rs
index 85611e944e..282c094876 100644
--- a/voxygen/src/anim/biped_large/mod.rs
+++ b/voxygen/src/anim/biped_large/mod.rs
@@ -47,7 +47,7 @@ impl BipedLargeSkeleton {
 impl Skeleton for BipedLargeSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let upper_torso_mat = self.upper_torso.compute_base_matrix();
         let shoulder_l_mat = self.shoulder_l.compute_base_matrix();
         let shoulder_r_mat = self.shoulder_r.compute_base_matrix();
@@ -78,6 +78,8 @@ impl Skeleton for BipedLargeSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/bird_medium/idle.rs b/voxygen/src/anim/bird_medium/idle.rs
index 82cd25c2bc..86b776720e 100644
--- a/voxygen/src/anim/bird_medium/idle.rs
+++ b/voxygen/src/anim/bird_medium/idle.rs
@@ -33,7 +33,7 @@ impl Animation for IdleAnimation {
                 * 0.25,
         );
 
-        next.head.offset = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1) / 11.0;
+        next.head.offset = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1);
         next.head.ori = Quaternion::rotation_z(duck_head_look.x)
             * Quaternion::rotation_x(-duck_head_look.y.abs() + wave_slow_cos * 0.03);
         next.head.scale = Vec3::one();
@@ -46,7 +46,7 @@ impl Animation for IdleAnimation {
         next.torso.ori = Quaternion::rotation_y(wave_slow * 0.03);
         next.torso.scale = Vec3::one() / 11.0;
 
-        next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1) / 11.0;
+        next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
         next.tail.ori = Quaternion::rotation_x(wave_slow_cos * 0.03);
         next.tail.scale = Vec3::one();
 
@@ -54,7 +54,7 @@ impl Animation for IdleAnimation {
             -skeleton_attr.wing.0,
             skeleton_attr.wing.1,
             skeleton_attr.wing.2,
-        ) / 11.0;
+        );
         next.wing_l.ori = Quaternion::rotation_z(0.0);
         next.wing_l.scale = Vec3::one() * 1.05;
 
@@ -62,7 +62,7 @@ impl Animation for IdleAnimation {
             skeleton_attr.wing.0,
             skeleton_attr.wing.1,
             skeleton_attr.wing.2,
-        ) / 11.0;
+        );
         next.wing_r.ori = Quaternion::rotation_y(0.0);
         next.wing_r.scale = Vec3::one() * 1.05;
 
diff --git a/voxygen/src/anim/bird_medium/mod.rs b/voxygen/src/anim/bird_medium/mod.rs
index f1330d82c8..8e15bdaef2 100644
--- a/voxygen/src/anim/bird_medium/mod.rs
+++ b/voxygen/src/anim/bird_medium/mod.rs
@@ -27,15 +27,15 @@ impl BirdMediumSkeleton {
 impl Skeleton for BirdMediumSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let torso_mat = self.torso.compute_base_matrix();
 
         [
-            FigureBoneData::new(self.head.compute_base_matrix() * torso_mat),
+            FigureBoneData::new(torso_mat * self.head.compute_base_matrix()),
             FigureBoneData::new(torso_mat),
-            FigureBoneData::new(self.tail.compute_base_matrix() * torso_mat),
-            FigureBoneData::new(self.wing_l.compute_base_matrix() * torso_mat),
-            FigureBoneData::new(self.wing_r.compute_base_matrix() * torso_mat),
+            FigureBoneData::new(torso_mat * self.tail.compute_base_matrix()),
+            FigureBoneData::new(torso_mat * self.wing_l.compute_base_matrix()),
+            FigureBoneData::new(torso_mat * self.wing_r.compute_base_matrix()),
             FigureBoneData::new(self.leg_l.compute_base_matrix()),
             FigureBoneData::new(self.leg_r.compute_base_matrix()),
             FigureBoneData::default(),
@@ -47,6 +47,8 @@ impl Skeleton for BirdMediumSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
@@ -101,30 +103,35 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Chicken, _) => (4.0, 3.0),
                 (Goose, _) => (5.0, 5.0),
                 (Peacock, _) => (4.0, 7.0),
+                (Eagle, _) => (3.5, 5.0),
             },
             chest: match (body.species, body.body_type) {
                 (Duck, _) => (0.0, 5.0),
                 (Chicken, _) => (0.0, 5.0),
                 (Goose, _) => (0.0, 8.0),
                 (Peacock, _) => (0.0, 10.0),
+                (Eagle, _) => (0.0, 8.0),
             },
             tail: match (body.species, body.body_type) {
                 (Duck, _) => (-3.0, 1.5),
                 (Chicken, _) => (-3.0, 1.5),
                 (Goose, _) => (-5.0, 3.0),
                 (Peacock, _) => (-5.5, 2.0),
+                (Eagle, _) => (-8.0, -4.0),
             },
             wing: match (body.species, body.body_type) {
                 (Duck, _) => (2.75, 0.0, 6.0),
                 (Chicken, _) => (2.75, 0.0, 6.0),
                 (Goose, _) => (3.75, -1.0, 9.0),
                 (Peacock, _) => (3.0, 0.0, 9.0),
+                (Eagle, _) => (3.0, -8.0, 5.0),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.0, -1.5, 4.0),
                 (Chicken, _) => (2.0, -1.5, 4.0),
                 (Goose, _) => (2.0, -1.5, 7.0),
                 (Peacock, _) => (2.0, -2.5, 8.0),
+                (Eagle, _) => (2.0, -2.0, 8.0),
             },
         }
     }
diff --git a/voxygen/src/anim/bird_medium/run.rs b/voxygen/src/anim/bird_medium/run.rs
index 36cb77cc50..ea73668941 100644
--- a/voxygen/src/anim/bird_medium/run.rs
+++ b/voxygen/src/anim/bird_medium/run.rs
@@ -28,7 +28,7 @@ impl Animation for RunAnimation {
             0.0,
             skeleton_attr.head.0,
             skeleton_attr.head.1 + center * 0.5,
-        ) / 11.0;
+        );
         next.head.ori = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0 + center * 0.03);
         next.head.scale = Vec3::one();
 
@@ -44,7 +44,7 @@ impl Animation for RunAnimation {
             0.0,
             skeleton_attr.tail.0,
             skeleton_attr.tail.1 + centeroffset * 0.6,
-        ) / 11.0;
+        );
         next.tail.ori = Quaternion::rotation_x(center * 0.03);
         next.tail.scale = Vec3::one();
 
@@ -52,16 +52,16 @@ impl Animation for RunAnimation {
             -skeleton_attr.wing.0,
             skeleton_attr.wing.1,
             skeleton_attr.wing.2,
-        ) / 11.0;
-        next.wing_l.ori = Quaternion::rotation_y(footl * 0.3);
+        );
+        next.wing_l.ori = Quaternion::rotation_y(footl * 0.1);
         next.wing_l.scale = Vec3::one() * 1.05;
 
         next.wing_r.offset = Vec3::new(
             skeleton_attr.wing.0,
             skeleton_attr.wing.1,
             skeleton_attr.wing.2,
-        ) / 11.0;
-        next.wing_r.ori = Quaternion::rotation_y(footr * 0.3);
+        );
+        next.wing_r.ori = Quaternion::rotation_y(footr * 0.1);
         next.wing_r.scale = Vec3::one() * 1.05;
 
         next.leg_l.offset = Vec3::new(
diff --git a/voxygen/src/anim/bird_small/mod.rs b/voxygen/src/anim/bird_small/mod.rs
index 610b63122a..763bb2fac8 100644
--- a/voxygen/src/anim/bird_small/mod.rs
+++ b/voxygen/src/anim/bird_small/mod.rs
@@ -31,7 +31,7 @@ impl BirdSmallSkeleton {
 impl Skeleton for BirdSmallSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let torso_mat = self.torso.compute_base_matrix();
 
         [
@@ -51,6 +51,8 @@ impl Skeleton for BirdSmallSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs
index 9ceb9343e8..3cc674e799 100644
--- a/voxygen/src/anim/character/attack.rs
+++ b/voxygen/src/anim/character/attack.rs
@@ -21,60 +21,65 @@ impl Animation for AttackAnimation {
     ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let slow = (anim_time as f32 * 9.0).sin();
-        let accel_med = 1.0 - (anim_time as f32 * 16.0).cos();
-        let accel_slow = 1.0 - (anim_time as f32 * 12.0).cos();
-        let accel_fast = 1.0 - (anim_time as f32 * 24.0).cos();
-        let decel = (anim_time as f32 * 16.0).min(PI / 2.0).sin();
+        let lab = 1.0;
+        let accel_med = 1.0 - (anim_time as f32 * 16.0 * lab as f32).cos();
+        let accel_slow = 1.0 - (anim_time as f32 * 12.0 * lab as f32).cos();
+        let accel_fast = 1.0 - (anim_time as f32 * 24.0 * lab as f32).cos();
+        let decel = (anim_time as f32 * 16.0 * lab as f32).min(PI / 2.0).sin();
+
+        let slow = (((5.0)
+            / (1.1 + 3.9 * ((anim_time as f32 * lab as f32 * 12.4).sin()).powf(2.0 as f32)))
+        .sqrt())
+            * ((anim_time as f32 * lab as f32 * 12.4).sin());
 
         next.head.offset = Vec3::new(
             0.0 + skeleton_attr.neck_right,
-            -2.0 + skeleton_attr.neck_forward,
+            -2.0 + skeleton_attr.neck_forward + decel * 0.8,
             skeleton_attr.neck_height + 21.0,
         );
-        next.head.ori = Quaternion::rotation_z(decel * -0.25)
-            * Quaternion::rotation_x(0.0 + decel * -0.1)
-            * Quaternion::rotation_y(decel * 0.1);
+        next.head.ori = Quaternion::rotation_z(decel * 0.25)
+            * Quaternion::rotation_x(0.0 + decel * 0.1)
+            * Quaternion::rotation_y(decel * -0.1);
         next.head.scale = Vec3::one() * skeleton_attr.head_scale;
 
         next.chest.offset = Vec3::new(0.0, 0.0, 7.0);
-        next.chest.ori = Quaternion::rotation_x(0.0);
+        next.chest.ori = Quaternion::rotation_z(decel * -0.2)
+            * Quaternion::rotation_x(0.0 + decel * -0.2)
+            * Quaternion::rotation_y(decel * 0.2);
         next.chest.scale = Vec3::one();
 
         next.belt.offset = Vec3::new(0.0, 0.0, 5.0);
-        next.belt.ori = Quaternion::rotation_x(0.0);
+        next.belt.ori = Quaternion::rotation_z(decel * -0.1)
+            * Quaternion::rotation_x(0.0 + decel * -0.1)
+            * Quaternion::rotation_y(decel * 0.1);
         next.belt.scale = Vec3::one();
 
         next.shorts.offset = Vec3::new(0.0, 0.0, 2.0);
-        next.shorts.ori = Quaternion::rotation_x(0.0);
+        next.belt.ori = Quaternion::rotation_z(decel * -0.08)
+            * Quaternion::rotation_x(0.0 + decel * -0.08)
+            * Quaternion::rotation_y(decel * 0.08);
         next.shorts.scale = Vec3::one();
 
         match active_tool_kind {
             //TODO: Inventory
             Some(Tool::Sword) => {
-                next.l_hand.offset =
-                    Vec3::new(-8.0 + accel_slow * 10.0, 8.0 + accel_fast * 3.0, 0.0);
-                next.l_hand.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
-                next.l_hand.scale = Vec3::one() * 1.01;
-
-                next.r_hand.offset =
-                    Vec3::new(-8.0 + accel_slow * 10.0, 8.0 + accel_fast * 3.0, -2.0);
-                next.r_hand.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
-                next.r_hand.scale = Vec3::one() * 1.01;
-
-                next.main.offset = Vec3::new(
-                    -8.0 + accel_slow * 10.0 + skeleton_attr.weapon_x,
-                    8.0 + accel_fast * 3.0,
-                    0.0,
-                );
-                next.main.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
+                next.l_hand.offset = Vec3::new(0.0, 1.0, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.27);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, 0.0, -3.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.27);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 6.0, -1.0);
+                next.main.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-8.0 - slow * 1.0, 3.0 - slow * 5.0, 0.0);
+                next.control.ori = Quaternion::rotation_x(-1.2)
+                    * Quaternion::rotation_y(slow * 1.5)
+                    * Quaternion::rotation_z(1.4 + slow * 0.5);
+                next.control.scale = Vec3::one();
             },
             Some(Tool::Axe) => {
                 next.l_hand.offset =
@@ -266,10 +271,17 @@ impl Animation for AttackAnimation {
         next.lantern.scale = Vec3::one() * 0.0;
 
         next.torso.offset = Vec3::new(0.0, -0.2, 0.1) * skeleton_attr.scaler;
-        next.torso.ori = Quaternion::rotation_z(decel * -0.2)
-            * Quaternion::rotation_x(0.0 + decel * -0.2)
-            * Quaternion::rotation_y(decel * 0.2);
+        next.torso.ori =
+            Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/block.rs b/voxygen/src/anim/character/block.rs
index 17c1415641..53cff1dda0 100644
--- a/voxygen/src/anim/character/block.rs
+++ b/voxygen/src/anim/character/block.rs
@@ -63,21 +63,23 @@ impl Animation for BlockAnimation {
         match active_tool_kind {
             //TODO: Inventory
             Some(Tool::Sword) => {
-                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0 + wave_ultra_slow * 1.0);
-                next.l_hand.ori = Quaternion::rotation_x(-0.3);
-                next.l_hand.scale = Vec3::one() * 1.01;
-                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-                next.r_hand.ori = Quaternion::rotation_x(-0.3);
-                next.r_hand.scale = Vec3::one() * 1.01;
-                next.main.offset = Vec3::new(
-                    -6.0 + skeleton_attr.weapon_x,
-                    4.5 + skeleton_attr.weapon_y,
-                    0.0,
-                );
+                next.l_hand.offset = Vec3::new(0.0, -5.0, -5.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.27);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, -6.0, -8.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.27);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 0.0, -6.0);
                 next.main.ori = Quaternion::rotation_x(-0.3)
                     * Quaternion::rotation_y(0.0)
                     * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-8.0, 13.0, 8.0);
+                next.control.ori = Quaternion::rotation_x(0.2)
+                    * Quaternion::rotation_y(0.4)
+                    * Quaternion::rotation_z(-1.57);
+                next.control.scale = Vec3::one();
             },
             Some(Tool::Axe) => {
                 next.l_hand.offset = Vec3::new(
diff --git a/voxygen/src/anim/character/blockidle.rs b/voxygen/src/anim/character/blockidle.rs
index 67af96d2a2..09ac00407d 100644
--- a/voxygen/src/anim/character/blockidle.rs
+++ b/voxygen/src/anim/character/blockidle.rs
@@ -62,21 +62,23 @@ impl Animation for BlockIdleAnimation {
         match active_tool_kind {
             //TODO: Inventory
             Some(Tool::Sword) => {
-                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0 + wave_ultra_slow * 1.0);
-                next.l_hand.ori = Quaternion::rotation_x(-0.3);
-                next.l_hand.scale = Vec3::one() * 1.01;
-                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-                next.r_hand.ori = Quaternion::rotation_x(-0.3);
-                next.r_hand.scale = Vec3::one() * 1.01;
-                next.main.offset = Vec3::new(
-                    -6.0 + skeleton_attr.weapon_x,
-                    4.5 + skeleton_attr.weapon_y,
-                    0.0,
-                );
+                next.l_hand.offset = Vec3::new(0.0, -5.0, -5.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.27);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, -6.0, -8.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.27);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 0.0, -6.0);
                 next.main.ori = Quaternion::rotation_x(-0.3)
                     * Quaternion::rotation_y(0.0)
                     * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-8.0, 13.0, 8.0);
+                next.control.ori = Quaternion::rotation_x(0.2)
+                    * Quaternion::rotation_y(0.4)
+                    * Quaternion::rotation_z(-1.57);
+                next.control.scale = Vec3::one();
             },
             Some(Tool::Axe) => {
                 next.l_hand.offset = Vec3::new(
diff --git a/voxygen/src/anim/character/charge.rs b/voxygen/src/anim/character/charge.rs
index a0cbe277d5..18203270c9 100644
--- a/voxygen/src/anim/character/charge.rs
+++ b/voxygen/src/anim/character/charge.rs
@@ -103,6 +103,11 @@ impl Animation for ChargeAnimation {
         next.torso.ori =
             Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
+
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
         next
     }
 }
diff --git a/voxygen/src/anim/character/cidle.rs b/voxygen/src/anim/character/cidle.rs
index c4093cf2c3..a33d6d0ed9 100644
--- a/voxygen/src/anim/character/cidle.rs
+++ b/voxygen/src/anim/character/cidle.rs
@@ -22,7 +22,7 @@ impl Animation for CidleAnimation {
     ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave_ultra_slow = (anim_time as f32 * 3.0 + PI).sin();
+        let wave_ultra_slow = (anim_time as f32 * 0.5 + PI).sin();
         let wave_ultra_slow_cos = (anim_time as f32 * 3.0 + PI).cos();
         let wave_slow_cos = (anim_time as f32 * 6.0 + PI).cos();
         let wave_slow = (anim_time as f32 * 6.0 + PI).sin();
@@ -63,29 +63,23 @@ impl Animation for CidleAnimation {
         match active_tool_kind {
             //TODO: Inventory
             Some(Tool::Sword) => {
-                next.l_hand.offset = Vec3::new(
-                    -6.0 + wave_ultra_slow_cos * 1.0,
-                    -2.0 + wave_ultra_slow_cos * 0.5,
-                    1.0 + wave_ultra_slow * 1.0,
-                );
-                next.l_hand.ori = Quaternion::rotation_x(1.27);
-                next.l_hand.scale = Vec3::one() * 1.0;
-                next.r_hand.offset = Vec3::new(
-                    -6.0 + wave_ultra_slow_cos * 1.0,
-                    -2.5 + wave_ultra_slow_cos * 0.5,
-                    -1.0 + wave_ultra_slow * 1.0,
-                );
-                next.r_hand.ori = Quaternion::rotation_x(1.27);
-                next.r_hand.scale = Vec3::one() * 1.01;
-                next.main.offset = Vec3::new(
-                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                    5.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                    1.0 + wave_ultra_slow * 1.0,
-                );
-                next.main.ori = Quaternion::rotation_x(-0.3)
+                next.l_hand.offset = Vec3::new(-0.25, -5.0, -5.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.47) * Quaternion::rotation_y(-0.2);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(1.25, -5.5, -8.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.47) * Quaternion::rotation_y(0.3);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 0.0, -6.0);
+                next.main.ori = Quaternion::rotation_x(-0.1)
                     * Quaternion::rotation_y(0.0)
                     * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-7.0, 6.0, 6.0);
+                next.control.ori = Quaternion::rotation_x(0.0)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.control.scale = Vec3::one();
             },
             Some(Tool::Axe) => {
                 next.l_hand.offset = Vec3::new(
diff --git a/voxygen/src/anim/character/climb.rs b/voxygen/src/anim/character/climb.rs
index 769abeecf6..b95ec99a84 100644
--- a/voxygen/src/anim/character/climb.rs
+++ b/voxygen/src/anim/character/climb.rs
@@ -59,11 +59,11 @@ impl Animation for ClimbAnimation {
             * Quaternion::rotation_y(wave_test * 0.10);
         next.shorts.scale = Vec3::one();
 
-        next.l_hand.offset = Vec3::new(-6.0, -0.25 + wave_testc * 1.5, 5.0 - wave_test * 4.0);
+        next.l_hand.offset = Vec3::new(-6.0, -0.25 + wave_testc * 1.5, 6.0 - wave_test * 4.0);
         next.l_hand.ori = Quaternion::rotation_x(2.2 + wave_testc * 0.5);
         next.l_hand.scale = Vec3::one();
 
-        next.r_hand.offset = Vec3::new(6.0, -0.25 - wave_testc * 1.5, 5.0 + wave_test * 4.0);
+        next.r_hand.offset = Vec3::new(6.0, -0.25 - wave_testc * 1.5, 6.0 + wave_test * 4.0);
         next.r_hand.ori = Quaternion::rotation_x(2.2 - wave_testc * 0.5);
         next.r_hand.scale = Vec3::one();
 
@@ -75,15 +75,6 @@ impl Animation for ClimbAnimation {
         next.r_foot.ori = Quaternion::rotation_x(0.2 + wave_testc * 0.5);
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori =
-            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25);
-        next.main.scale = Vec3::one();
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(wave_cos * 0.15);
         next.l_shoulder.scale = Vec3::one() * 1.1;
@@ -96,6 +87,23 @@ impl Animation for ClimbAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            18.0,
+        );
+        next.main.ori =
+            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -104,6 +112,17 @@ impl Animation for ClimbAnimation {
         next.torso.ori = Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/crun.rs b/voxygen/src/anim/character/crun.rs
index 59d1807a69..cf12ef8c56 100644
--- a/voxygen/src/anim/character/crun.rs
+++ b/voxygen/src/anim/character/crun.rs
@@ -43,23 +43,33 @@ impl Animation for WieldAnimation {
 
         match Tool::Bow {
             //TODO: Inventory
-            Tool::Sword => {
-                next.l_hand.offset = Vec3::new(-6.0, 3.75, 0.25);
-                next.l_hand.ori = Quaternion::rotation_x(-0.3);
-                next.l_hand.scale = Vec3::one() * 1.01;
-                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-                next.r_hand.ori = Quaternion::rotation_x(-0.3);
-                next.r_hand.scale = Vec3::one() * 1.01;
-                next.weapon.offset = Vec3::new(
-                    -6.0 + skeleton_attr.weapon_x,
-                    4.0 + skeleton_attr.weapon_y,
+            Some(Tool::Sword) => {
+                next.l_hand.offset = Vec3::new(0.0, -5.0, -5.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.27);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, -6.0, -8.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.27);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(
                     0.0,
+                    0.0,
+                    -6.0,
                 );
-                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                next.main.ori = Quaternion::rotation_x(-0.3)
                     * Quaternion::rotation_y(0.0)
                     * Quaternion::rotation_z(0.0);
-                next.weapon.scale = Vec3::one();
-            }
+                next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(
+                    -8.0,
+                    4.0,
+                    6.0,
+                );
+                next.control.ori = Quaternion::rotation_x(0.0)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.control.scale = Vec3::one();
+            },
             Tool::Axe => {
                 next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
                 next.l_hand.ori = Quaternion::rotation_x(-0.3);
diff --git a/voxygen/src/anim/character/gliding.rs b/voxygen/src/anim/character/gliding.rs
index 955208a3d2..5eacea3e85 100644
--- a/voxygen/src/anim/character/gliding.rs
+++ b/voxygen/src/anim/character/gliding.rs
@@ -105,14 +105,6 @@ impl Animation for GlidingAnimation {
         );
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-        next.main.scale = Vec3::one();
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(0.0);
         next.l_shoulder.scale = Vec3::one() * 1.1;
@@ -126,6 +118,22 @@ impl Animation for GlidingAnimation {
             Quaternion::rotation_x(1.0) * Quaternion::rotation_y(wave_very_slow_cos * 0.04);
         next.glider.scale = Vec3::one();
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            15.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -135,6 +143,17 @@ impl Animation for GlidingAnimation {
             * Quaternion::rotation_y(tilt * 16.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs
index 87a709ab50..57949cb125 100644
--- a/voxygen/src/anim/character/idle.rs
+++ b/voxygen/src/anim/character/idle.rs
@@ -56,7 +56,7 @@ impl Animation for IdleAnimation {
         next.shorts.scale = Vec3::one();
 
         next.l_hand.offset = Vec3::new(
-            -6.0,
+            -7.0,
             -0.25 + wave_ultra_slow_cos * 0.15,
             5.0 + wave_ultra_slow * 0.5,
         );
@@ -65,7 +65,7 @@ impl Animation for IdleAnimation {
         next.l_hand.scale = Vec3::one();
 
         next.r_hand.offset = Vec3::new(
-            6.0,
+            7.0,
             -0.25 + wave_ultra_slow_cos * 0.15,
             5.0 + wave_ultra_slow * 0.5 + wave_ultra_slow_abs * -0.05,
         );
@@ -80,14 +80,6 @@ impl Animation for IdleAnimation {
         next.r_foot.ori = Quaternion::identity();
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-        next.main.scale = Vec3::one() + wave_ultra_slow_abs * -0.05;
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 5.0);
         next.l_shoulder.ori = Quaternion::rotation_x(0.0);
         next.l_shoulder.scale = (Vec3::one() + wave_ultra_slow_abs * -0.05) * 1.15;
@@ -100,6 +92,22 @@ impl Animation for IdleAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            18.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+        next.main.scale = Vec3::one() + wave_ultra_slow_abs * -0.05;
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -108,6 +116,17 @@ impl Animation for IdleAnimation {
         next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs
index 7a93aa4f82..b19f3f5ba4 100644
--- a/voxygen/src/anim/character/jump.rs
+++ b/voxygen/src/anim/character/jump.rs
@@ -68,14 +68,6 @@ impl Animation for JumpAnimation {
         next.r_foot.ori = Quaternion::rotation_x(wave_stop * 1.2 + wave_slow * 0.2);
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-        next.main.scale = Vec3::one();
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(wave_stop_alt * 0.3);
         next.l_shoulder.scale = Vec3::one() * 1.1;
@@ -88,6 +80,22 @@ impl Animation for JumpAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            15.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -96,6 +104,17 @@ impl Animation for JumpAnimation {
         next.torso.ori = Quaternion::rotation_x(-0.2);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index 6ed75e27e2..727d0f0918 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -37,12 +37,16 @@ pub struct CharacterSkeleton {
     r_hand: Bone,
     l_foot: Bone,
     r_foot: Bone,
-    main: Bone,
     l_shoulder: Bone,
     r_shoulder: Bone,
     glider: Bone,
+    main: Bone,
+    second: Bone,
     lantern: Bone,
     torso: Bone,
+    control: Bone,
+    l_control: Bone,
+    r_control: Bone,
 }
 
 impl CharacterSkeleton {
@@ -52,11 +56,16 @@ impl CharacterSkeleton {
 impl Skeleton for CharacterSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let chest_mat = self.chest.compute_base_matrix();
         let torso_mat = self.torso.compute_base_matrix();
         let l_hand_mat = self.l_hand.compute_base_matrix();
+        let r_hand_mat = self.r_hand.compute_base_matrix();
+        let control_mat = self.control.compute_base_matrix();
+        let l_control_mat = self.l_control.compute_base_matrix();
+        let r_control_mat = self.r_control.compute_base_matrix();
         let main_mat = self.main.compute_base_matrix();
+        let second_mat = self.second.compute_base_matrix();
 
         let head_mat = self.head.compute_base_matrix();
         [
@@ -64,18 +73,20 @@ impl Skeleton for CharacterSkeleton {
             FigureBoneData::new(torso_mat * chest_mat),
             FigureBoneData::new(torso_mat * self.belt.compute_base_matrix()),
             FigureBoneData::new(torso_mat * self.shorts.compute_base_matrix()),
-            FigureBoneData::new(torso_mat * chest_mat * l_hand_mat),
-            FigureBoneData::new(torso_mat * chest_mat * self.r_hand.compute_base_matrix()),
+            FigureBoneData::new(torso_mat * chest_mat * control_mat * l_control_mat * l_hand_mat),
+            FigureBoneData::new(torso_mat * chest_mat * control_mat * r_control_mat * r_hand_mat),
             FigureBoneData::new(torso_mat * self.l_foot.compute_base_matrix()),
             FigureBoneData::new(torso_mat * self.r_foot.compute_base_matrix()),
-            FigureBoneData::new(torso_mat * chest_mat * main_mat),
             FigureBoneData::new(torso_mat * chest_mat * self.l_shoulder.compute_base_matrix()),
             FigureBoneData::new(torso_mat * chest_mat * self.r_shoulder.compute_base_matrix()),
             FigureBoneData::new(torso_mat * self.glider.compute_base_matrix()),
+            FigureBoneData::new(torso_mat * chest_mat * control_mat * l_control_mat * main_mat),
+            FigureBoneData::new(torso_mat * chest_mat * control_mat * r_control_mat * second_mat),
             FigureBoneData::new(torso_mat * chest_mat * self.lantern.compute_base_matrix()),
             FigureBoneData::new(torso_mat),
-            FigureBoneData::default(),
-            FigureBoneData::default(),
+            FigureBoneData::new(control_mat),
+            FigureBoneData::new(l_control_mat),
+            FigureBoneData::new(r_control_mat),
         ]
     }
 
@@ -88,12 +99,16 @@ impl Skeleton for CharacterSkeleton {
         self.r_hand.interpolate(&target.r_hand, dt);
         self.l_foot.interpolate(&target.l_foot, dt);
         self.r_foot.interpolate(&target.r_foot, dt);
-        self.main.interpolate(&target.main, dt);
         self.l_shoulder.interpolate(&target.l_shoulder, dt);
         self.r_shoulder.interpolate(&target.r_shoulder, dt);
         self.glider.interpolate(&target.glider, dt);
+        self.main.interpolate(&target.main, dt);
+        self.second.interpolate(&target.second, dt);
         self.lantern.interpolate(&target.lantern, dt);
         self.torso.interpolate(&target.torso, dt);
+        self.control.interpolate(&target.control, dt);
+        self.l_control.interpolate(&target.l_control, dt);
+        self.r_control.interpolate(&target.r_control, dt);
     }
 }
 
diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs
index b9fd7fbfa1..5dc42b8eed 100644
--- a/voxygen/src/anim/character/roll.rs
+++ b/voxygen/src/anim/character/roll.rs
@@ -85,16 +85,6 @@ impl Animation for RollAnimation {
         next.r_foot.ori = Quaternion::rotation_x(wave * -0.4);
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5)
-            * Quaternion::rotation_z(1.57)
-            * Quaternion::rotation_x(0.0);
-        next.main.scale = Vec3::one();
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(0.0);
         next.l_shoulder.scale = Vec3::one() * 1.1;
@@ -107,6 +97,24 @@ impl Animation for RollAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            15.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5)
+            * Quaternion::rotation_z(1.57)
+            * Quaternion::rotation_x(0.0);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -115,6 +123,18 @@ impl Animation for RollAnimation {
             Vec3::new(0.0, 0.0, 0.1 + wave_dub * 16.0) / 11.0 * skeleton_attr.scaler;
         next.torso.ori = Quaternion::rotation_x(wave_slow * 6.5) * Quaternion::rotation_y(tilt);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
+
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index f202ef5545..a4c92e3bce 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -21,29 +21,38 @@ impl Animation for RunAnimation {
         let speed = Vec2::<f32>::from(velocity).magnitude();
         *rate = speed;
 
-        let constant = 1.0;
-        let wave = (((5.0)
-            / (1.1 + 3.9 * ((anim_time as f32 * constant as f32 * 1.2).sin()).powf(2.0 as f32)))
+        let lab = 1.0;
+        let long = (((5.0)
+            / (1.5 + 3.5 * ((anim_time as f32 * lab as f32 * 0.66).sin()).powf(2.0 as f32)))
         .sqrt())
-            * ((anim_time as f32 * constant as f32 * 1.2).sin());
-        let wave_cos = (((5.0)
-            / (1.1 + 3.9 * ((anim_time as f32 * constant as f32 * 2.4).sin()).powf(2.0 as f32)))
-        .sqrt())
-            * ((anim_time as f32 * constant as f32 * 1.5).sin());
-        let wave_cos_dub = (((5.0)
-            / (1.1 + 3.9 * ((anim_time as f32 * constant as f32 * 4.8).sin()).powf(2.0 as f32)))
-        .sqrt())
-            * ((anim_time as f32 * constant as f32 * 1.5).sin());
+            * ((anim_time as f32 * lab as f32 * 0.66).sin());
+
+        let short = (((5.0)
+            / (1.5 + 3.5 * ((anim_time as f32 * lab as f32 * 1.32).sin()).powf(2.0 as f32)))
+        .sqrt())
+            * ((anim_time as f32 * lab as f32 * 1.32).sin());
+
+        let shortalt = (((5.0)
+            / (1.5
+                + 3.5
+                    * ((anim_time as f32 * lab as f32 * 1.32 + PI / 2.0).sin()).powf(2.0 as f32)))
+        .sqrt())
+            * ((anim_time as f32 * lab as f32 * 1.32 + PI / 2.0).sin());
+
+        let foot = (((5.0)
+            / (1.1 + 3.9 * ((anim_time as f32 * lab as f32 * 1.32).sin()).powf(2.0 as f32)))
+        .sqrt())
+            * ((anim_time as f32 * lab as f32 * 1.32).sin());
+
+        let wave_stop = (anim_time as f32 * 2.6).min(PI / 2.0 / 2.0).sin();
 
-        let wave_diff = (anim_time as f32 * 0.6).sin();
-        let wave_stop = (anim_time as f32 * 2.6).min(PI / 2.0).sin();
         let head_look = Vec2::new(
-            ((global_time + anim_time) as f32 / 4.0)
+            ((global_time + anim_time) as f32 / 18.0)
                 .floor()
                 .mul(7331.0)
                 .sin()
                 * 0.2,
-            ((global_time + anim_time) as f32 / 4.0)
+            ((global_time + anim_time) as f32 / 18.0)
                 .floor()
                 .mul(1337.0)
                 .sin()
@@ -67,81 +76,100 @@ impl Animation for RunAnimation {
         next.head.offset = Vec3::new(
             0.0,
             -3.0 + skeleton_attr.neck_forward,
-            skeleton_attr.neck_height + 20.0 + wave_cos * 1.3,
+            skeleton_attr.neck_height + 20.0 + short * 1.3,
         );
-        next.head.ori = Quaternion::rotation_z(head_look.x + wave * 0.1)
+        next.head.ori = Quaternion::rotation_z(head_look.x + long * 0.1)
             * Quaternion::rotation_x(head_look.y + 0.35);
         next.head.scale = Vec3::one() * skeleton_attr.head_scale;
 
-        next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + wave_cos * 1.1);
-        next.chest.ori = Quaternion::rotation_z(wave * 0.2);
+        next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + short * 1.1);
+        next.chest.ori = Quaternion::rotation_z(short * 0.2);
         next.chest.scale = Vec3::one();
 
-        next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + wave_cos * 1.1);
-        next.belt.ori = Quaternion::rotation_z(wave * 0.35);
+        next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + short * 1.1);
+        next.belt.ori = Quaternion::rotation_z(short * 0.35);
         next.belt.scale = Vec3::one();
 
-        next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + wave_cos * 1.1);
-        next.shorts.ori = Quaternion::rotation_z(wave * 0.6);
+        next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + short * 1.1);
+        next.shorts.ori = Quaternion::rotation_z(short * 0.6);
         next.shorts.scale = Vec3::one();
 
         next.l_hand.offset = Vec3::new(
             -6.0 + wave_stop * -1.0,
-            -0.25 + wave_cos * 2.0,
-            5.0 - wave * 1.5,
+            -0.25 + short * 2.0,
+            5.0 + short * -1.5,
         );
         next.l_hand.ori =
-            Quaternion::rotation_x(0.8 + wave_cos * 1.2) * Quaternion::rotation_y(wave_stop * 0.1);
+            Quaternion::rotation_x(0.8 + short * 1.2) * Quaternion::rotation_y(wave_stop * 0.1);
         next.l_hand.scale = Vec3::one();
 
         next.r_hand.offset = Vec3::new(
             6.0 + wave_stop * 1.0,
-            -0.25 - wave_cos * 2.0,
-            5.0 + wave * 1.5,
+            -0.25 + short * -2.0,
+            5.0 + short * 1.5,
         );
-        next.r_hand.ori = Quaternion::rotation_x(0.8 + wave_cos * -1.2)
-            * Quaternion::rotation_y(wave_stop * -0.1);
+        next.r_hand.ori =
+            Quaternion::rotation_x(0.8 + short * -1.2) * Quaternion::rotation_y(wave_stop * -0.1);
         next.r_hand.scale = Vec3::one();
 
-        next.l_foot.offset = Vec3::new(-3.4, 0.0 + wave_cos * 1.0, 6.0 - wave_cos_dub * 0.7);
-        next.l_foot.ori = Quaternion::rotation_x(-0.0 - wave_cos * 1.2);
+        next.l_foot.offset = Vec3::new(-3.4, foot * 1.0, 6.0);
+        next.l_foot.ori = Quaternion::rotation_x(foot * -1.2);
         next.l_foot.scale = Vec3::one();
 
-        next.r_foot.offset = Vec3::new(3.4, 0.0 - wave_cos * 1.0, 6.0 - wave_cos_dub * 0.7);
-        next.r_foot.ori = Quaternion::rotation_x(-0.0 + wave_cos * 1.2);
+        next.r_foot.offset = Vec3::new(3.4, foot * -1.0, 6.0);
+        next.r_foot.ori = Quaternion::rotation_x(foot * 1.2);
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori =
-            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25);
-        next.main.scale = Vec3::one();
-
-        next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
-        next.l_shoulder.ori = Quaternion::rotation_x(wave_cos * 0.15);
+        next.l_shoulder.offset = Vec3::new(-5.0, -1.0, 4.7);
+        next.l_shoulder.ori = Quaternion::rotation_x(short * 0.15);
         next.l_shoulder.scale = Vec3::one() * 1.1;
 
-        next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7);
-        next.r_shoulder.ori = Quaternion::rotation_x(wave * 0.15);
+        next.r_shoulder.offset = Vec3::new(5.0, -1.0, 4.7);
+        next.r_shoulder.ori = Quaternion::rotation_x(short * -0.15);
         next.r_shoulder.scale = Vec3::one() * 1.1;
 
         next.glider.offset = Vec3::new(0.0, 5.0, 0.0);
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            15.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + short * 0.25);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 5.0, 0.0);
         next.lantern.ori = Quaternion::rotation_y(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
 
-        next.torso.offset = Vec3::new(0.0, -0.3 + wave * -0.08, 0.4) * skeleton_attr.scaler;
+        next.torso.offset = Vec3::new(0.0, -0.3 + shortalt * -0.065, 0.4) * skeleton_attr.scaler;
         next.torso.ori =
-            Quaternion::rotation_x(wave_stop * speed * -0.06 + wave_diff * speed * -0.005)
+            Quaternion::rotation_x(wave_stop * speed * -0.05 + wave_stop * speed * -0.005)
                 * Quaternion::rotation_y(tilt);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
+
         next
     }
 }
diff --git a/voxygen/src/anim/character/sit.rs b/voxygen/src/anim/character/sit.rs
index 2a1d4858bd..a4a8f4a210 100644
--- a/voxygen/src/anim/character/sit.rs
+++ b/voxygen/src/anim/character/sit.rs
@@ -95,14 +95,6 @@ impl Animation for SitAnimation {
         );
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-        next.main.scale = Vec3::one() + wave_slow_abs * -0.05;
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(0.0);
         next.l_shoulder.scale = (Vec3::one() + wave_slow_abs * -0.05) * 1.15;
@@ -115,6 +107,22 @@ impl Animation for SitAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            15.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+        next.main.scale = Vec3::one() + wave_slow_abs * -0.05;
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -122,6 +130,18 @@ impl Animation for SitAnimation {
         next.torso.offset = Vec3::new(0.0, -0.2, wave_stop * -0.16) * skeleton_attr.scaler;
         next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
+
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/stand.rs b/voxygen/src/anim/character/stand.rs
index 25459e7d3c..116cf5db09 100644
--- a/voxygen/src/anim/character/stand.rs
+++ b/voxygen/src/anim/character/stand.rs
@@ -1,6 +1,6 @@
 use super::{super::Animation, CharacterSkeleton, SkeletonAttr};
 use common::comp::item::Tool;
-use std::{f32::consts::PI, ops::Mul};
+use std::ops::Mul;
 use vek::*;
 
 pub struct StandAnimation;
@@ -18,9 +18,8 @@ impl Animation for StandAnimation {
     ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin();
-        let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos();
-        let wave_ultra_slow_abs = ((anim_time as f32 * 0.5 + PI).sin()) + 1.0;
+        let slow = (anim_time as f32 * 1.0).sin();
+        let breathe = ((anim_time as f32 * 0.5).sin()).abs();
 
         let head_look = Vec2::new(
             ((global_time + anim_time) as f32 / 12.0)
@@ -37,40 +36,32 @@ impl Animation for StandAnimation {
         next.head.offset = Vec3::new(
             0.0 + skeleton_attr.neck_right,
             -3.0 + skeleton_attr.neck_forward,
-            skeleton_attr.neck_height + 21.0 + wave_ultra_slow * 0.3,
+            skeleton_attr.neck_height + 21.0 + slow * 0.3,
         );
         next.head.ori =
             Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x(head_look.y.abs());
         next.head.scale = Vec3::one() * skeleton_attr.head_scale;
 
-        next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + wave_ultra_slow * 0.3);
-        next.chest.ori = Quaternion::rotation_x(0.0);
-        next.chest.scale = Vec3::one() * 1.01 + wave_ultra_slow_abs * 0.05;
+        next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + slow * 0.3);
+        next.chest.ori = Quaternion::rotation_z(head_look.x * 0.6);
+        next.chest.scale = Vec3::one() * 1.01;
 
-        next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + wave_ultra_slow * 0.3);
-        next.belt.ori = Quaternion::rotation_x(0.0);
-        next.belt.scale = Vec3::one() + wave_ultra_slow_abs * 0.05;
+        next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + slow * 0.3);
+        next.belt.ori = Quaternion::rotation_z(head_look.x * 0.4);
+        next.belt.scale = Vec3::one() + breathe * 0.05;
 
-        next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + wave_ultra_slow * 0.3);
+        next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + slow * 0.3);
         next.shorts.ori = Quaternion::rotation_x(0.0);
         next.shorts.scale = Vec3::one();
 
-        next.l_hand.offset = Vec3::new(
-            -6.0,
-            -0.25 + wave_ultra_slow_cos * 0.15,
-            5.0 + wave_ultra_slow * 0.5,
-        );
+        next.l_hand.offset = Vec3::new(-7.0, -0.25 + slow * 0.15, 5.0 + slow * 0.5);
 
-        next.l_hand.ori = Quaternion::rotation_x(0.0 + wave_ultra_slow * -0.06);
+        next.l_hand.ori = Quaternion::rotation_x(0.0 + slow * -0.06);
         next.l_hand.scale = Vec3::one();
 
-        next.r_hand.offset = Vec3::new(
-            6.0,
-            -0.25 + wave_ultra_slow_cos * 0.15,
-            5.0 + wave_ultra_slow * 0.5 + wave_ultra_slow_abs * -0.05,
-        );
-        next.r_hand.ori = Quaternion::rotation_x(0.0 + wave_ultra_slow * -0.06);
-        next.r_hand.scale = Vec3::one() + wave_ultra_slow_abs * -0.05;
+        next.r_hand.offset = Vec3::new(7.0, -0.25 + slow * 0.15, 5.0 + slow * 0.5);
+        next.r_hand.ori = Quaternion::rotation_x(0.0 + slow * -0.06);
+        next.r_hand.scale = Vec3::one();
 
         next.l_foot.offset = Vec3::new(-3.4, -0.1, 8.0);
         next.l_foot.ori = Quaternion::identity();
@@ -80,26 +71,34 @@ impl Animation for StandAnimation {
         next.r_foot.ori = Quaternion::identity();
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-        next.main.scale = Vec3::one() + wave_ultra_slow_abs * -0.05;
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 5.0);
         next.l_shoulder.ori = Quaternion::rotation_x(0.0);
-        next.l_shoulder.scale = (Vec3::one() + wave_ultra_slow_abs * -0.05) * 1.15;
+        next.l_shoulder.scale = (Vec3::one() + breathe * -0.05) * 1.15;
 
         next.r_shoulder.offset = Vec3::new(5.0, 0.0, 5.0);
         next.r_shoulder.ori = Quaternion::rotation_x(0.0);
-        next.r_shoulder.scale = (Vec3::one() + wave_ultra_slow_abs * -0.05) * 1.15;
+        next.r_shoulder.scale = (Vec3::one() + breathe * -0.05) * 1.15;
 
         next.glider.offset = Vec3::new(0.0, 5.0, 0.0);
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            18.0,
+        );
+        next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
         next.lantern.ori = Quaternion::rotation_x(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -108,6 +107,17 @@ impl Animation for StandAnimation {
         next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/swim.rs b/voxygen/src/anim/character/swim.rs
index 4531e0ae8a..8b8220277d 100644
--- a/voxygen/src/anim/character/swim.rs
+++ b/voxygen/src/anim/character/swim.rs
@@ -95,15 +95,6 @@ impl Animation for SwimAnimation {
         next.r_foot.ori = Quaternion::rotation_x(-0.0 + wave_cos * 1.5);
         next.r_foot.scale = Vec3::one();
 
-        next.main.offset = Vec3::new(
-            -7.0 + skeleton_attr.weapon_x,
-            -5.0 + skeleton_attr.weapon_y,
-            15.0,
-        );
-        next.main.ori =
-            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25);
-        next.main.scale = Vec3::one();
-
         next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7);
         next.l_shoulder.ori = Quaternion::rotation_x(wave_cos * 0.15);
         next.l_shoulder.scale = Vec3::one() * 1.1;
@@ -116,6 +107,23 @@ impl Animation for SwimAnimation {
         next.glider.ori = Quaternion::rotation_y(0.0);
         next.glider.scale = Vec3::one() * 0.0;
 
+        next.main.offset = Vec3::new(
+            -7.0 + skeleton_attr.weapon_x,
+            -5.0 + skeleton_attr.weapon_y,
+            18.0,
+        );
+        next.main.ori =
+            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25);
+        next.main.scale = Vec3::one();
+
+        next.second.offset = Vec3::new(
+            0.0 + skeleton_attr.weapon_x,
+            0.0 + skeleton_attr.weapon_y,
+            0.0,
+        );
+        next.second.ori = Quaternion::rotation_y(0.0);
+        next.second.scale = Vec3::one() * 0.0;
+
         next.lantern.offset = Vec3::new(0.0, 5.0, 0.0);
         next.lantern.ori = Quaternion::rotation_y(0.0);
         next.lantern.scale = Vec3::one() * 0.0;
@@ -126,6 +134,17 @@ impl Animation for SwimAnimation {
                 * Quaternion::rotation_y(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
+        next.control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.control.ori = Quaternion::rotation_x(0.0);
+        next.control.scale = Vec3::one();
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/character/wield.rs b/voxygen/src/anim/character/wield.rs
index 68d18d2c9d..9e882fed3c 100644
--- a/voxygen/src/anim/character/wield.rs
+++ b/voxygen/src/anim/character/wield.rs
@@ -30,21 +30,23 @@ impl Animation for WieldAnimation {
         match active_tool_kind {
             //TODO: Inventory
             Some(Tool::Sword) => {
-                next.l_hand.offset = Vec3::new(-6.0, -2.0, 1.0);
+                next.l_hand.offset = Vec3::new(0.0, -5.0, -5.0);
                 next.l_hand.ori = Quaternion::rotation_x(1.27);
-                next.l_hand.scale = Vec3::one() * 1.00;
-                next.r_hand.offset = Vec3::new(-6.0, -2.5, -1.0);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, -6.0, -8.0);
                 next.r_hand.ori = Quaternion::rotation_x(1.27);
-                next.r_hand.scale = Vec3::one() * 1.01;
-                next.main.offset = Vec3::new(
-                    -6.0 + skeleton_attr.weapon_x,
-                    5.5 + skeleton_attr.weapon_y,
-                    1.0,
-                );
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 0.0, -6.0);
                 next.main.ori = Quaternion::rotation_x(-0.3)
                     * Quaternion::rotation_y(0.0)
                     * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-8.0, 4.0, 6.0);
+                next.control.ori = Quaternion::rotation_x(0.0)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.control.scale = Vec3::one();
             },
             Some(Tool::Axe) => {
                 next.l_hand.offset = Vec3::new(-6.5, -0.5, 6.0);
@@ -200,6 +202,14 @@ impl Animation for WieldAnimation {
         next.torso.offset = Vec3::new(0.0, 0.3 + wave * -0.08, 0.4) * skeleton_attr.scaler;
         next.torso.ori = Quaternion::rotation_x(wave_stop * -0.2);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
+
+        next.l_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.l_control.ori = Quaternion::rotation_x(0.0);
+        next.l_control.scale = Vec3::one();
+
+        next.r_control.offset = Vec3::new(0.0, 0.0, 0.0);
+        next.r_control.ori = Quaternion::rotation_x(0.0);
+        next.r_control.scale = Vec3::one();
         next
     }
 }
diff --git a/voxygen/src/anim/critter/mod.rs b/voxygen/src/anim/critter/mod.rs
index 9677461239..4a2c05ef6d 100644
--- a/voxygen/src/anim/critter/mod.rs
+++ b/voxygen/src/anim/critter/mod.rs
@@ -32,7 +32,7 @@ impl CritterSkeleton {
 impl Skeleton for CritterSkeleton {
     type Attr = CritterAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         [
             FigureBoneData::new(self.head.compute_base_matrix()),
             FigureBoneData::new(self.chest.compute_base_matrix()),
@@ -50,6 +50,8 @@ impl Skeleton for CritterSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/dragon/mod.rs b/voxygen/src/anim/dragon/mod.rs
index c3bfec7e61..131d78dc24 100644
--- a/voxygen/src/anim/dragon/mod.rs
+++ b/voxygen/src/anim/dragon/mod.rs
@@ -49,7 +49,7 @@ impl DragonSkeleton {
 impl Skeleton for DragonSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let chest_front_mat = self.chest_front.compute_base_matrix();
         let wing_in_l_mat = self.wing_in_l.compute_base_matrix();
         let wing_in_r_mat = self.wing_in_r.compute_base_matrix();
@@ -72,6 +72,8 @@ impl Skeleton for DragonSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/fish_medium/mod.rs b/voxygen/src/anim/fish_medium/mod.rs
index b085ed7220..5912719299 100644
--- a/voxygen/src/anim/fish_medium/mod.rs
+++ b/voxygen/src/anim/fish_medium/mod.rs
@@ -35,7 +35,7 @@ impl FishMediumSkeleton {
 impl Skeleton for FishMediumSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let torso_mat = self.torso.compute_base_matrix();
         let rear_mat = self.rear.compute_base_matrix();
 
@@ -56,6 +56,8 @@ impl Skeleton for FishMediumSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/fish_small/mod.rs b/voxygen/src/anim/fish_small/mod.rs
index ed26ef0247..e1b47513f7 100644
--- a/voxygen/src/anim/fish_small/mod.rs
+++ b/voxygen/src/anim/fish_small/mod.rs
@@ -27,7 +27,7 @@ impl FishSmallSkeleton {
 impl Skeleton for FishSmallSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let torso_mat = self.torso.compute_base_matrix();
 
         [
@@ -47,6 +47,8 @@ impl Skeleton for FishSmallSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/fixture/mod.rs b/voxygen/src/anim/fixture/mod.rs
index 92a68d0125..a243b923a4 100644
--- a/voxygen/src/anim/fixture/mod.rs
+++ b/voxygen/src/anim/fixture/mod.rs
@@ -13,7 +13,7 @@ impl FixtureSkeleton {
 impl Skeleton for FixtureSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         [
             FigureBoneData::new(vek::Mat4::identity()),
             FigureBoneData::new(vek::Mat4::identity()),
@@ -31,6 +31,8 @@ impl Skeleton for FixtureSkeleton {
             FigureBoneData::new(vek::Mat4::identity()),
             FigureBoneData::new(vek::Mat4::identity()),
             FigureBoneData::new(vek::Mat4::identity()),
+            FigureBoneData::new(vek::Mat4::identity()),
+            FigureBoneData::new(vek::Mat4::identity()),
         ]
     }
 
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
index 1a309e95c9..347df6f7e6 100644
--- a/voxygen/src/anim/mod.rs
+++ b/voxygen/src/anim/mod.rs
@@ -51,7 +51,7 @@ impl Bone {
 pub trait Skeleton: Send + Sync + 'static {
     type Attr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16];
+    fn compute_matrices(&self) -> [FigureBoneData; 18];
 
     /// Change the current skeleton to be more like `target`.
     fn interpolate(&mut self, target: &Self, dt: f32);
diff --git a/voxygen/src/anim/object/mod.rs b/voxygen/src/anim/object/mod.rs
index d6f3ac510e..b9befc2522 100644
--- a/voxygen/src/anim/object/mod.rs
+++ b/voxygen/src/anim/object/mod.rs
@@ -15,7 +15,7 @@ const SCALE: f32 = 1.0 / 11.0;
 impl Skeleton for ObjectSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         [
             FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
             FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
@@ -33,6 +33,8 @@ impl Skeleton for ObjectSkeleton {
             FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
             FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
             FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
+            FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
+            FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
         ]
     }
 
diff --git a/voxygen/src/anim/quadruped_medium/mod.rs b/voxygen/src/anim/quadruped_medium/mod.rs
index 57f36c9c1f..a30eaa0203 100644
--- a/voxygen/src/anim/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/quadruped_medium/mod.rs
@@ -31,7 +31,7 @@ impl QuadrupedMediumSkeleton {
 impl Skeleton for QuadrupedMediumSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         let ears_mat = self.ears.compute_base_matrix();
         let head_upper_mat = self.head_upper.compute_base_matrix();
         let head_lower_mat = self.head_lower.compute_base_matrix();
@@ -53,6 +53,8 @@ impl Skeleton for QuadrupedMediumSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/quadruped_small/idle.rs b/voxygen/src/anim/quadruped_small/idle.rs
index 9293d7cec7..59a3c2fc0c 100644
--- a/voxygen/src/anim/quadruped_small/idle.rs
+++ b/voxygen/src/anim/quadruped_small/idle.rs
@@ -17,11 +17,10 @@ impl Animation for IdleAnimation {
     ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave = (anim_time as f32 * 14.0).sin();
-        let wave_slow = (anim_time as f32 * 3.5 + PI).sin();
-        let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos();
+        let slow = (anim_time as f32 * 3.5).sin();
+        let slow_alt = (anim_time as f32 * 3.5 + PI).sin();
 
-        let pig_head_look = Vec2::new(
+        let head_look = Vec2::new(
             ((global_time + anim_time) as f32 / 8.0)
                 .floor()
                 .mul(7331.0)
@@ -35,17 +34,17 @@ impl Animation for IdleAnimation {
         );
 
         next.head.offset =
-            Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + wave * 0.2) / 11.0;
-        next.head.ori = Quaternion::rotation_z(pig_head_look.x)
-            * Quaternion::rotation_x(pig_head_look.y + wave_slow_cos * 0.03);
+            Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + slow * 0.2) / 11.0;
+        next.head.ori = Quaternion::rotation_z(head_look.x)
+            * Quaternion::rotation_x(head_look.y + slow_alt * 0.03);
         next.head.scale = Vec3::one() / 10.5;
 
         next.chest.offset = Vec3::new(
-            wave_slow * 0.05,
+            slow * 0.05,
             skeleton_attr.chest.0,
-            skeleton_attr.chest.1 + wave_slow_cos * 0.2,
+            skeleton_attr.chest.1 + slow_alt * 0.2,
         ) / 11.0;
-        next.chest.ori = Quaternion::rotation_y(wave_slow * 0.05);
+        next.chest.ori = Quaternion::rotation_y(slow * 0.05);
         next.chest.scale = Vec3::one() / 11.0;
 
         next.leg_lf.offset = Vec3::new(
@@ -53,7 +52,7 @@ impl Animation for IdleAnimation {
             skeleton_attr.feet_f.1,
             skeleton_attr.feet_f.2,
         ) / 11.0;
-        next.leg_lf.ori = Quaternion::rotation_x(wave_slow * 0.08);
+        next.leg_lf.ori = Quaternion::rotation_x(slow * 0.08);
         next.leg_lf.scale = Vec3::one() / 11.0;
 
         next.leg_rf.offset = Vec3::new(
@@ -61,7 +60,7 @@ impl Animation for IdleAnimation {
             skeleton_attr.feet_f.1,
             skeleton_attr.feet_f.2,
         ) / 11.0;
-        next.leg_rf.ori = Quaternion::rotation_x(wave_slow_cos * 0.08);
+        next.leg_rf.ori = Quaternion::rotation_x(slow_alt * 0.08);
         next.leg_rf.scale = Vec3::one() / 11.0;
 
         next.leg_lb.offset = Vec3::new(
@@ -69,7 +68,7 @@ impl Animation for IdleAnimation {
             skeleton_attr.feet_b.1,
             skeleton_attr.feet_b.2,
         ) / 11.0;
-        next.leg_lb.ori = Quaternion::rotation_x(wave_slow_cos * 0.08);
+        next.leg_lb.ori = Quaternion::rotation_x(slow_alt * 0.08);
         next.leg_lb.scale = Vec3::one() / 11.0;
 
         next.leg_rb.offset = Vec3::new(
@@ -77,7 +76,7 @@ impl Animation for IdleAnimation {
             skeleton_attr.feet_b.1,
             skeleton_attr.feet_b.2,
         ) / 11.0;
-        next.leg_rb.ori = Quaternion::rotation_x(wave_slow * 0.08);
+        next.leg_rb.ori = Quaternion::rotation_x(slow * 0.08);
         next.leg_rb.scale = Vec3::one() / 11.0;
 
         next
diff --git a/voxygen/src/anim/quadruped_small/mod.rs b/voxygen/src/anim/quadruped_small/mod.rs
index fb4c559fbf..a277b5aff8 100644
--- a/voxygen/src/anim/quadruped_small/mod.rs
+++ b/voxygen/src/anim/quadruped_small/mod.rs
@@ -26,7 +26,7 @@ impl QuadrupedSmallSkeleton {
 impl Skeleton for QuadrupedSmallSkeleton {
     type Attr = SkeletonAttr;
 
-    fn compute_matrices(&self) -> [FigureBoneData; 16] {
+    fn compute_matrices(&self) -> [FigureBoneData; 18] {
         [
             FigureBoneData::new(self.head.compute_base_matrix()),
             FigureBoneData::new(self.chest.compute_base_matrix()),
@@ -44,6 +44,8 @@ impl Skeleton for QuadrupedSmallSkeleton {
             FigureBoneData::default(),
             FigureBoneData::default(),
             FigureBoneData::default(),
+            FigureBoneData::default(),
+            FigureBoneData::default(),
         ]
     }
 
diff --git a/voxygen/src/anim/quadruped_small/run.rs b/voxygen/src/anim/quadruped_small/run.rs
index 38a7cfeb58..801c66ddb4 100644
--- a/voxygen/src/anim/quadruped_small/run.rs
+++ b/voxygen/src/anim/quadruped_small/run.rs
@@ -1,4 +1,5 @@
 use super::{super::Animation, QuadrupedSmallSkeleton, SkeletonAttr};
+use std::f32::consts::PI;
 use vek::*;
 
 pub struct RunAnimation;
@@ -16,55 +17,55 @@ impl Animation for RunAnimation {
     ) -> Self::Skeleton {
         let mut next = (*skeleton).clone();
 
-        let wave = (anim_time as f32 * 14.0).sin();
-        let wave_quick = (anim_time as f32 * 20.0).sin();
-        let wave_quick_cos = (anim_time as f32 * 20.0).cos();
-        let wave_cos = (anim_time as f32 * 14.0).cos();
+        let slow = (anim_time as f32 * 14.0).sin();
+        let fast = (anim_time as f32 * 20.0).sin();
+        let fast_alt = (anim_time as f32 * 20.0 + PI / 2.0).sin();
+        let slow_alt = (anim_time as f32 * 14.0 + PI / 2.0).sin();
 
         next.head.offset =
-            Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + wave * 1.5) / 11.0;
+            Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + slow * 1.5) / 11.0;
         next.head.ori =
-            Quaternion::rotation_x(0.2 + wave * 0.05) * Quaternion::rotation_y(wave_cos * 0.03);
+            Quaternion::rotation_x(0.2 + slow * 0.05) * Quaternion::rotation_y(slow_alt * 0.03);
         next.head.scale = Vec3::one() / 10.5;
 
         next.chest.offset = Vec3::new(
             0.0,
             skeleton_attr.chest.0,
-            skeleton_attr.chest.1 + wave_cos * 1.2,
+            skeleton_attr.chest.1 + slow_alt * 1.2,
         ) / 11.0;
-        next.chest.ori = Quaternion::rotation_x(wave * 0.1);
+        next.chest.ori = Quaternion::rotation_x(slow * 0.1);
         next.chest.scale = Vec3::one() / 11.0;
 
         next.leg_lf.offset = Vec3::new(
             -skeleton_attr.feet_f.0,
-            skeleton_attr.feet_f.1 + wave_quick * 0.8,
-            skeleton_attr.feet_f.2 + wave_quick_cos * 1.5,
+            skeleton_attr.feet_f.1 + fast * 0.8,
+            skeleton_attr.feet_f.2 + fast_alt * 1.5,
         ) / 11.0;
-        next.leg_lf.ori = Quaternion::rotation_x(wave_quick * 0.3);
+        next.leg_lf.ori = Quaternion::rotation_x(fast * 0.3);
         next.leg_lf.scale = Vec3::one() / 11.0;
 
         next.leg_rf.offset = Vec3::new(
             skeleton_attr.feet_f.0,
-            skeleton_attr.feet_f.1 - wave_quick_cos * 0.8,
-            skeleton_attr.feet_f.2 + wave_quick * 1.5,
+            skeleton_attr.feet_f.1 + fast_alt * -0.8,
+            skeleton_attr.feet_f.2 + fast * 1.5,
         ) / 11.0;
-        next.leg_rf.ori = Quaternion::rotation_x(wave_quick_cos * -0.3);
+        next.leg_rf.ori = Quaternion::rotation_x(fast_alt * -0.3);
         next.leg_rf.scale = Vec3::one() / 11.0;
 
         next.leg_lb.offset = Vec3::new(
             -skeleton_attr.feet_b.0,
-            skeleton_attr.feet_b.1 - wave_quick_cos * 0.8,
-            skeleton_attr.feet_b.2 + wave_quick * 1.5,
+            skeleton_attr.feet_b.1 + fast_alt * -0.8,
+            skeleton_attr.feet_b.2 + fast * 1.5,
         ) / 11.0;
-        next.leg_lb.ori = Quaternion::rotation_x(wave_quick_cos * -0.3);
+        next.leg_lb.ori = Quaternion::rotation_x(fast_alt * -0.3);
         next.leg_lb.scale = Vec3::one() / 11.0;
 
         next.leg_rb.offset = Vec3::new(
             skeleton_attr.feet_b.0,
-            skeleton_attr.feet_b.1 + wave_quick * 0.8,
-            skeleton_attr.feet_b.2 + wave_quick_cos * 1.5,
+            skeleton_attr.feet_b.1 + fast * 0.8,
+            skeleton_attr.feet_b.2 + fast_alt * 1.5,
         ) / 11.0;
-        next.leg_rb.ori = Quaternion::rotation_x(wave_quick * 0.3);
+        next.leg_rb.ori = Quaternion::rotation_x(fast * 0.3);
         next.leg_rb.scale = Vec3::one() / 11.0;
 
         next
diff --git a/voxygen/src/audio/channel.rs b/voxygen/src/audio/channel.rs
index 00c36646c0..8c65e6dc98 100644
--- a/voxygen/src/audio/channel.rs
+++ b/voxygen/src/audio/channel.rs
@@ -1,51 +1,125 @@
-use crate::audio::fader::Fader;
-use rodio::{Device, Sample, Source, SpatialSink};
+use crate::audio::fader::{FadeDirection, Fader};
+use rodio::{Device, Sample, Sink, Source, SpatialSink};
 use vek::*;
 
-#[derive(PartialEq, Clone, Copy)]
-pub enum AudioType {
-    Sfx,
-    Music,
-    None,
-}
-
 #[derive(PartialEq, Clone, Copy)]
 enum ChannelState {
-    // Init,
-    // ToPlay,
-    // Loading,
     Playing,
-    Stopping,
+    Fading,
     Stopped,
 }
 
+/// Each MusicChannel has a MusicChannelTag which help us determine how we
+/// should transition between music types
 #[derive(PartialEq, Clone, Copy)]
-pub enum ChannelTag {
+pub enum MusicChannelTag {
     TitleMusic,
-    Soundtrack,
+    Exploration,
 }
 
-pub struct Channel {
-    id: usize,
-    sink: SpatialSink,
-    audio_type: AudioType,
+/// A MusicChannel uses a non-positional audio sink designed to play music which
+/// is always heard at the player's position
+pub struct MusicChannel {
+    tag: MusicChannelTag,
+    sink: Sink,
     state: ChannelState,
     fader: Fader,
-    tag: Option<ChannelTag>,
+}
+
+impl MusicChannel {
+    pub fn new(device: &Device) -> Self {
+        Self {
+            sink: Sink::new(device),
+            tag: MusicChannelTag::TitleMusic,
+            state: ChannelState::Stopped,
+            fader: Fader::default(),
+        }
+    }
+
+    // Play a music track item on this channel. If the channel has an existing track
+    // playing, the new sounds will be appended and played once they complete.
+    // Otherwise it will begin playing immediately.
+    pub fn play<S>(&mut self, source: S, tag: MusicChannelTag)
+    where
+        S: Source + Send + 'static,
+        S::Item: Sample,
+        S::Item: Send,
+        <S as std::iter::Iterator>::Item: std::fmt::Debug,
+    {
+        self.tag = tag;
+        self.sink.append(source);
+
+        self.state = if !self.fader.is_finished() {
+            ChannelState::Fading
+        } else {
+            ChannelState::Playing
+        };
+    }
+
+    /// Set the volume of the current channel. If the channel is currently
+    /// fading, the volume of the fader is updated to this value.
+    pub fn set_volume(&mut self, volume: f32) {
+        if !self.fader.is_finished() {
+            self.fader.update_target_volume(volume);
+        } else {
+            self.sink.set_volume(volume);
+        }
+    }
+
+    /// Set a fader for the channel. If a fader exists already, it is replaced.
+    /// If the channel has not begun playing, and the fader is set to fade in,
+    /// we set the volume of the channel to the initial volume of the fader so
+    /// that the volumes match when playing begins.
+    pub fn set_fader(&mut self, fader: Fader) {
+        self.fader = fader;
+        self.state = ChannelState::Fading;
+
+        if self.state == ChannelState::Stopped && fader.direction() == FadeDirection::In {
+            self.sink.set_volume(fader.get_volume());
+        }
+    }
+
+    /// Returns true if either the channels sink reports itself as empty (no
+    /// more sounds in the queue) or we have forcibly set the channels state to
+    /// the 'Stopped' state
+    pub fn is_done(&self) -> bool { self.sink.empty() || self.state == ChannelState::Stopped }
+
+    pub fn get_tag(&self) -> MusicChannelTag { self.tag }
+
+    /// Maintain the fader attached to this channel. If the channel is not
+    /// fading, no action is taken.
+    pub fn maintain(&mut self, dt: f32) {
+        if self.state == ChannelState::Fading {
+            self.fader.update(dt);
+            self.sink.set_volume(self.fader.get_volume());
+
+            if self.fader.is_finished() {
+                match self.fader.direction() {
+                    FadeDirection::Out => {
+                        self.state = ChannelState::Stopped;
+                        self.sink.stop();
+                    },
+                    FadeDirection::In => {
+                        self.state = ChannelState::Playing;
+                    },
+                }
+            }
+        }
+    }
+}
+
+/// An SfxChannel uses a positional audio sink, and is designed for short-lived
+/// audio which can be spatially controlled, but does not need control over
+/// playback or fading/transitions
+pub struct SfxChannel {
+    sink: SpatialSink,
     pub pos: Vec3<f32>,
 }
 
-// TODO: Implement asynchronous loading
-impl Channel {
-    /// Create an empty channel for future use
+impl SfxChannel {
     pub fn new(device: &Device) -> Self {
         Self {
-            id: 0,
             sink: SpatialSink::new(device, [0.0; 3], [1.0, 0.0, 0.0], [-1.0, 0.0, 0.0]),
-            audio_type: AudioType::None,
-            state: ChannelState::Stopped,
-            fader: Fader::fade_in(0.0),
-            tag: None,
             pos: Vec3::zero(),
         }
     }
@@ -57,31 +131,13 @@ impl Channel {
         S::Item: Send,
         <S as std::iter::Iterator>::Item: std::fmt::Debug,
     {
-        self.state = ChannelState::Playing;
         self.sink.append(source);
     }
 
-    pub fn is_done(&self) -> bool { self.sink.empty() || self.state == ChannelState::Stopped }
-
-    pub fn set_tag(&mut self, tag: Option<ChannelTag>) { self.tag = tag; }
-
-    pub fn get_tag(&self) -> Option<ChannelTag> { self.tag }
-
-    pub fn stop(&mut self, fader: Fader) {
-        self.state = ChannelState::Stopping;
-        self.fader = fader;
-    }
-
-    pub fn get_id(&self) -> usize { self.id }
-
-    pub fn set_id(&mut self, new_id: usize) { self.id = new_id; }
-
-    pub fn get_audio_type(&self) -> AudioType { self.audio_type }
-
-    pub fn set_audio_type(&mut self, audio_type: AudioType) { self.audio_type = audio_type; }
-
     pub fn set_volume(&mut self, volume: f32) { self.sink.set_volume(volume); }
 
+    pub fn is_done(&self) -> bool { self.sink.empty() }
+
     pub fn set_emitter_position(&mut self, pos: [f32; 3]) { self.sink.set_emitter_position(pos); }
 
     pub fn set_left_ear_position(&mut self, pos: [f32; 3]) { self.sink.set_left_ear_position(pos); }
@@ -89,20 +145,4 @@ impl Channel {
     pub fn set_right_ear_position(&mut self, pos: [f32; 3]) {
         self.sink.set_right_ear_position(pos);
     }
-
-    pub fn update(&mut self, dt: f32) {
-        match self.state {
-            // ChannelState::Init | ChannelState::ToPlay | ChannelState::Loading => {}
-            ChannelState::Playing => {},
-            ChannelState::Stopping => {
-                self.fader.update(dt);
-                self.sink.set_volume(self.fader.get_volume());
-
-                if self.fader.is_finished() {
-                    self.state = ChannelState::Stopped;
-                }
-            },
-            ChannelState::Stopped => {},
-        }
-    }
 }
diff --git a/voxygen/src/audio/fader.rs b/voxygen/src/audio/fader.rs
index dd835a2045..1af58c8c20 100644
--- a/voxygen/src/audio/fader.rs
+++ b/voxygen/src/audio/fader.rs
@@ -6,13 +6,18 @@ pub struct Fader {
     volume_to: f32,
     is_running: bool,
 }
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum FadeDirection {
+    In,
+    Out,
+}
 
 fn lerp(t: f32, a: f32, b: f32) -> f32 { (1.0 - t) * a + t * b }
 
 impl Fader {
-    pub fn fade(time: f32, volume_from: f32, volume_to: f32) -> Self {
+    pub fn fade(length: f32, volume_from: f32, volume_to: f32) -> Self {
         Self {
-            length: time,
+            length,
             running_time: 0.0,
             volume_from,
             volume_to,
@@ -20,23 +25,28 @@ impl Fader {
         }
     }
 
-    pub fn fade_in(time: f32) -> Self {
-        Self {
-            length: time,
-            running_time: 0.0,
-            volume_from: 0.0,
-            volume_to: 1.0,
-            is_running: true,
+    pub fn fade_in(time: f32, volume_to: f32) -> Self { Self::fade(time, 0.0, volume_to) }
+
+    pub fn fade_out(time: f32, volume_from: f32) -> Self { Self::fade(time, volume_from, 0.0) }
+
+    pub fn update_target_volume(&mut self, volume: f32) {
+        match self.direction() {
+            FadeDirection::In => {
+                self.volume_to = volume;
+            },
+            FadeDirection::Out => {
+                if self.get_volume() > volume {
+                    self.volume_from = volume;
+                }
+            },
         }
     }
 
-    pub fn fade_out(time: f32, volume_from: f32) -> Self {
-        Self {
-            length: time,
-            running_time: 0.0,
-            volume_from,
-            volume_to: 0.0,
-            is_running: true,
+    pub fn direction(&self) -> FadeDirection {
+        if self.volume_to < self.volume_from {
+            FadeDirection::Out
+        } else {
+            FadeDirection::In
         }
     }
 
@@ -60,3 +70,107 @@ impl Fader {
 
     pub fn is_finished(&self) -> bool { self.running_time >= self.length || !self.is_running }
 }
+
+/// Returns a stopped fader with no running duration
+impl Default for Fader {
+    fn default() -> Self {
+        Self {
+            length: 0.0,
+            running_time: 0.0,
+            volume_from: 0.0,
+            volume_to: 1.0,
+            is_running: false,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn fade_direction_in() {
+        let fader = Fader::fade_in(10.0, 0.0);
+
+        assert_eq!(fader.direction(), FadeDirection::In);
+    }
+
+    #[test]
+    fn fade_direction_out() {
+        let fader = Fader::fade_out(10.0, 1.0);
+
+        assert_eq!(fader.direction(), FadeDirection::Out);
+    }
+
+    #[test]
+    fn fade_out_completes() {
+        let mut fader = Fader::fade_out(10.0, 1.0);
+
+        // Run for the full duration
+        fader.update(10.0);
+
+        assert_eq!(fader.get_volume(), 0.0);
+        assert!(fader.is_finished());
+    }
+
+    #[test]
+    fn update_target_volume_fading_out_when_currently_above() {
+        let mut fader = Fader::fade_out(20.0, 1.0);
+
+        // After 0.1s, the fader should still be close to 1.0
+        fader.update(0.1);
+
+        // Reduce volume to 0.4. We are currently above that.
+        fader.update_target_volume(0.4);
+
+        // The volume should immediately reduce to < 0.4 on the next update
+        fader.update(0.1);
+
+        assert!(fader.get_volume() < 0.4)
+    }
+
+    #[test]
+    fn update_target_volume_fading_out_when_currently_below() {
+        let mut fader = Fader::fade_out(10.0, 0.8);
+
+        // After 9s, the fader should be close to 0
+        fader.update(9.0);
+
+        // Notify of a volume increase to 1.0. We are already far below that.
+        fader.update_target_volume(1.0);
+
+        // The fader should be unaffected by the new value, and continue dropping
+        fader.update(0.1);
+
+        assert!(fader.get_volume() < 0.2);
+    }
+
+    #[test]
+    fn update_target_volume_fading_in_when_currently_above() {
+        let mut fader = Fader::fade_in(10.0, 1.0);
+
+        // After 9s, the fader should be close to 1.0
+        fader.update(9.0);
+
+        // Reduce volume to 0.4. We are currently above that.
+        fader.update_target_volume(0.4);
+
+        // Run out the fader. It's volume should be 0.4
+        fader.update(1.0);
+
+        assert_eq!(fader.get_volume(), 0.4);
+    }
+
+    #[test]
+    fn update_target_volume_fading_in_when_currently_below() {
+        let mut fader = Fader::fade_in(20.0, 1.0);
+
+        // After 0.1s, the fader should still be close to 0.0
+        fader.update(0.1);
+
+        // Reduce volume to 0.4. The volume_to should be reduced accordingly.
+        fader.update_target_volume(0.4);
+
+        assert_eq!(fader.volume_to, 0.4);
+    }
+}
diff --git a/voxygen/src/audio/mod.rs b/voxygen/src/audio/mod.rs
index 7e73d9a752..1709649c89 100644
--- a/voxygen/src/audio/mod.rs
+++ b/voxygen/src/audio/mod.rs
@@ -4,13 +4,13 @@ pub mod music;
 pub mod sfx;
 pub mod soundcache;
 
-use channel::{AudioType, Channel, ChannelTag};
+use channel::{MusicChannel, MusicChannelTag, SfxChannel};
 use fader::Fader;
 use soundcache::SoundCache;
 
 use common::assets;
 use cpal::traits::DeviceTrait;
-use rodio::{Decoder, Device};
+use rodio::{source::Source, Decoder, Device};
 use vek::*;
 
 const FALLOFF: f32 = 0.13;
@@ -21,8 +21,8 @@ pub struct AudioFrontend {
     audio_device: Option<Device>,
     sound_cache: SoundCache,
 
-    channels: Vec<Channel>,
-    next_channel_id: usize,
+    music_channels: Vec<MusicChannel>,
+    sfx_channels: Vec<SfxChannel>,
 
     sfx_volume: f32,
     music_volume: f32,
@@ -36,21 +36,23 @@ pub struct AudioFrontend {
 
 impl AudioFrontend {
     /// Construct with given device
-    pub fn new(device: String, channel_num: usize) -> Self {
-        let mut channels = Vec::with_capacity(channel_num);
+    pub fn new(device: String, max_sfx_channels: usize) -> Self {
+        let mut sfx_channels = Vec::with_capacity(max_sfx_channels);
         let audio_device = get_device_raw(&device);
+
         if let Some(audio_device) = &audio_device {
-            for _i in 0..channel_num {
-                channels.push(Channel::new(&audio_device));
+            for _ in 0..max_sfx_channels {
+                sfx_channels.push(SfxChannel::new(&audio_device));
             }
         }
+
         Self {
             device: device.clone(),
             device_list: list_devices(),
             audio_device,
             sound_cache: SoundCache::new(),
-            channels,
-            next_channel_id: 1,
+            music_channels: Vec::new(),
+            sfx_channels,
             sfx_volume: 1.0,
             music_volume: 1.0,
             listener_pos: Vec3::zero(),
@@ -67,8 +69,8 @@ impl AudioFrontend {
             device_list: Vec::new(),
             audio_device: None,
             sound_cache: SoundCache::new(),
-            channels: Vec::new(),
-            next_channel_id: 1,
+            music_channels: Vec::new(),
+            sfx_channels: Vec::new(),
             sfx_volume: 1.0,
             music_volume: 1.0,
             listener_pos: Vec3::zero(),
@@ -78,75 +80,89 @@ impl AudioFrontend {
         }
     }
 
-    /// Maintain audio
+    /// Drop any unused music channels, and update their faders
     pub fn maintain(&mut self, dt: f32) {
-        for channel in self.channels.iter_mut() {
-            channel.update(dt);
+        self.music_channels.retain(|c| !c.is_done());
+
+        for channel in self.music_channels.iter_mut() {
+            channel.maintain(dt);
         }
     }
 
-    pub fn get_channel(
+    fn get_sfx_channel(&mut self) -> Option<&mut SfxChannel> {
+        if self.audio_device.is_some() {
+            if let Some(channel) = self.sfx_channels.iter_mut().find(|c| c.is_done()) {
+                channel.set_volume(self.sfx_volume);
+
+                return Some(channel);
+            }
+        }
+
+        None
+    }
+
+    /// Retrieve a music channel from the channel list. This inspects the
+    /// MusicChannelTag to determine whether we are transitioning between
+    /// music types and acts accordingly. For example transitioning between
+    /// `TitleMusic` and `Exploration` should fade out the title channel and
+    /// fade in a new `Exploration` channel.
+    fn get_music_channel(
         &mut self,
-        audio_type: AudioType,
-        channel_tag: Option<ChannelTag>,
-    ) -> Option<&mut Channel> {
-        if let Some(channel) = self.channels.iter_mut().find(|c| c.is_done()) {
-            let id = self.next_channel_id;
-            self.next_channel_id += 1;
+        next_channel_tag: MusicChannelTag,
+    ) -> Option<&mut MusicChannel> {
+        if let Some(audio_device) = &self.audio_device {
+            if self.music_channels.is_empty() {
+                let mut next_music_channel = MusicChannel::new(&audio_device);
+                next_music_channel.set_volume(self.music_volume);
 
-            let volume = match audio_type {
-                AudioType::Music => self.music_volume,
-                _ => self.sfx_volume,
-            };
+                self.music_channels.push(next_music_channel);
+            } else {
+                let existing_channel = self.music_channels.last_mut()?;
 
-            channel.set_id(id);
-            channel.set_tag(channel_tag);
-            channel.set_audio_type(audio_type);
-            channel.set_volume(volume);
+                if existing_channel.get_tag() != next_channel_tag {
+                    // Fade the existing channel out. It will be removed when the fade completes.
+                    existing_channel.set_fader(Fader::fade_out(2.0, self.music_volume));
 
-            Some(channel)
-        } else {
-            None
+                    let mut next_music_channel = MusicChannel::new(&audio_device);
+
+                    next_music_channel.set_fader(Fader::fade_in(12.0, self.music_volume));
+
+                    self.music_channels.push(next_music_channel);
+                }
+            }
         }
+
+        self.music_channels.last_mut()
     }
 
-    /// Play specfied sound file.
-    pub fn play_sound(&mut self, sound: &str, pos: Vec3<f32>) -> Option<usize> {
+    pub fn play_sfx(&mut self, sound: &str, pos: Vec3<f32>, vol: Option<f32>) {
         if self.audio_device.is_some() {
             let calc_pos = ((pos - self.listener_pos) * FALLOFF).into_array();
 
-            let sound = self.sound_cache.load_sound(sound);
+            let sound = self
+                .sound_cache
+                .load_sound(sound)
+                .amplify(vol.unwrap_or(1.0));
 
             let left_ear = self.listener_ear_left.into_array();
             let right_ear = self.listener_ear_right.into_array();
 
-            if let Some(channel) = self.get_channel(AudioType::Sfx, None) {
+            if let Some(channel) = self.get_sfx_channel() {
                 channel.set_emitter_position(calc_pos);
                 channel.set_left_ear_position(left_ear);
                 channel.set_right_ear_position(right_ear);
                 channel.play(sound);
-
-                return Some(channel.get_id());
             }
         }
-
-        None
     }
 
-    pub fn play_music(&mut self, sound: &str, channel_tag: Option<ChannelTag>) -> Option<usize> {
-        if self.audio_device.is_some() {
-            if let Some(channel) = self.get_channel(AudioType::Music, channel_tag) {
-                let file = assets::load_file(&sound, &["ogg"]).expect("Failed to load sound");
-                let sound = Decoder::new(file).expect("Failed to decode sound");
+    fn play_music(&mut self, sound: &str, channel_tag: MusicChannelTag) {
+        if let Some(channel) = self.get_music_channel(channel_tag) {
+            let file = assets::load_file(&sound, &["ogg"]).expect("Failed to load sound");
+            let sound = Decoder::new(file).expect("Failed to decode sound");
 
-                channel.set_emitter_position([0.0; 3]);
-                channel.play(sound);
-
-                return Some(channel.get_id());
-            }
+            channel.play(sound, channel_tag);
         }
-
-        None
     }
 
     pub fn set_listener_pos(&mut self, pos: &Vec3<f32>, ori: &Vec3<f32>) {
@@ -161,8 +177,8 @@ impl AudioFrontend {
         self.listener_ear_left = pos_left;
         self.listener_ear_right = pos_right;
 
-        for channel in self.channels.iter_mut() {
-            if !channel.is_done() && channel.get_audio_type() == AudioType::Sfx {
+        for channel in self.sfx_channels.iter_mut() {
+            if !channel.is_done() {
                 // TODO: Update this to correctly determine the updated relative position of
                 // the SFX emitter when the player (listener) moves
                 // channel.set_emitter_position(
@@ -174,32 +190,18 @@ impl AudioFrontend {
         }
     }
 
-    pub fn play_title_music(&mut self) -> Option<usize> {
+    pub fn play_title_music(&mut self) {
         if self.music_enabled() {
             self.play_music(
                 "voxygen.audio.soundtrack.veloren_title_tune",
-                Some(ChannelTag::TitleMusic),
+                MusicChannelTag::TitleMusic,
             )
-        } else {
-            None
         }
     }
 
-    pub fn stop_title_music(&mut self) {
-        let index = self.channels.iter().position(|c| {
-            !c.is_done() && c.get_tag().is_some() && c.get_tag().unwrap() == ChannelTag::TitleMusic
-        });
-
-        if let Some(index) = index {
-            self.channels[index].stop(Fader::fade_out(1.5, self.music_volume));
-        }
-    }
-
-    pub fn stop_channel(&mut self, channel_id: usize, fader: Fader) {
-        let index = self.channels.iter().position(|c| c.get_id() == channel_id);
-
-        if let Some(index) = index {
-            self.channels[index].stop(fader);
+    pub fn play_exploration_music(&mut self, item: &str) {
+        if self.music_enabled() {
+            self.play_music(item, MusicChannelTag::Exploration)
         }
     }
 
@@ -214,24 +216,16 @@ impl AudioFrontend {
     pub fn set_sfx_volume(&mut self, sfx_volume: f32) {
         self.sfx_volume = sfx_volume;
 
-        for channel in self.channels.iter_mut() {
-            if channel.get_audio_type() == AudioType::Sfx {
-                channel.set_volume(sfx_volume);
-            }
+        for channel in self.sfx_channels.iter_mut() {
+            channel.set_volume(sfx_volume);
         }
     }
 
     pub fn set_music_volume(&mut self, music_volume: f32) {
         self.music_volume = music_volume;
 
-        for channel in self.channels.iter_mut() {
-            if channel.get_audio_type() == AudioType::Music {
-                if music_volume > 0.0 {
-                    channel.set_volume(music_volume);
-                } else {
-                    channel.stop(Fader::fade_out(0.0, 0.0));
-                }
-            }
+        for channel in self.music_channels.iter_mut() {
+            channel.set_volume(music_volume);
         }
     }
 
diff --git a/voxygen/src/audio/music.rs b/voxygen/src/audio/music.rs
index 8f6ecc0525..397472472f 100644
--- a/voxygen/src/audio/music.rs
+++ b/voxygen/src/audio/music.rs
@@ -1,6 +1,5 @@
-use crate::audio::{channel::ChannelTag, AudioFrontend};
-use client::Client;
-use common::assets;
+use crate::audio::AudioFrontend;
+use common::{assets, state::State};
 use rand::{seq::IteratorRandom, thread_rng};
 use serde::Deserialize;
 use std::time::Instant;
@@ -31,7 +30,6 @@ pub struct MusicMgr {
     soundtrack: SoundtrackCollection,
     began_playing: Instant,
     next_track_change: f64,
-    current_music: Option<usize>,
     last_track: String,
 }
 
@@ -41,24 +39,23 @@ impl MusicMgr {
             soundtrack: Self::load_soundtrack_items(),
             began_playing: Instant::now(),
             next_track_change: 0.0,
-            current_music: None,
             last_track: String::from("None"),
         }
     }
 
-    pub fn maintain(&mut self, audio: &mut AudioFrontend, client: &Client) {
+    pub fn maintain(&mut self, audio: &mut AudioFrontend, state: &State) {
         if audio.music_enabled()
             && self.began_playing.elapsed().as_secs_f64() > self.next_track_change
         {
-            self.current_music = self.play_random_track(audio, client);
+            self.play_random_track(audio, state);
         }
     }
 
-    fn play_random_track(&mut self, audio: &mut AudioFrontend, client: &Client) -> Option<usize> {
+    fn play_random_track(&mut self, audio: &mut AudioFrontend, state: &State) {
         const SILENCE_BETWEEN_TRACKS_SECONDS: f64 = 45.0;
 
-        let game_time = (client.state().get_time_of_day() as u64 % 86400) as u32;
-        let current_period_of_day = self.get_current_day_period(game_time);
+        let game_time = (state.get_time_of_day() as u64 % 86400) as u32;
+        let current_period_of_day = Self::get_current_day_period(game_time);
         let mut rng = thread_rng();
 
         let track = self
@@ -79,10 +76,10 @@ impl MusicMgr {
         self.began_playing = Instant::now();
         self.next_track_change = track.length + SILENCE_BETWEEN_TRACKS_SECONDS;
 
-        audio.play_music(&track.path, Some(ChannelTag::Soundtrack))
+        audio.play_exploration_music(&track.path);
     }
 
-    fn get_current_day_period(&self, game_time: u32) -> DayPeriod {
+    fn get_current_day_period(game_time: u32) -> DayPeriod {
         if game_time > DAY_START_SECONDS && game_time < DAY_END_SECONDS {
             DayPeriod::Day
         } else {
diff --git a/voxygen/src/audio/sfx/event_mapper/mod.rs b/voxygen/src/audio/sfx/event_mapper/mod.rs
index e195d1cba2..a745b4de67 100644
--- a/voxygen/src/audio/sfx/event_mapper/mod.rs
+++ b/voxygen/src/audio/sfx/event_mapper/mod.rs
@@ -1,11 +1,12 @@
-pub mod movement;
-pub mod progression;
+mod movement;
+mod progression;
+
+use common::state::State;
 
 use movement::MovementEventMapper;
 use progression::ProgressionEventMapper;
 
 use super::SfxTriggers;
-use client::Client;
 
 pub struct SfxEventMapper {
     progression_event_mapper: ProgressionEventMapper,
@@ -20,8 +21,15 @@ impl SfxEventMapper {
         }
     }
 
-    pub fn maintain(&mut self, client: &Client, triggers: &SfxTriggers) {
-        self.progression_event_mapper.maintain(client, triggers);
-        self.movement_event_mapper.maintain(client, triggers);
+    pub fn maintain(
+        &mut self,
+        state: &State,
+        player_entity: specs::Entity,
+        triggers: &SfxTriggers,
+    ) {
+        self.progression_event_mapper
+            .maintain(state, player_entity, triggers);
+        self.movement_event_mapper
+            .maintain(state, player_entity, triggers);
     }
 }
diff --git a/voxygen/src/audio/sfx/event_mapper/movement.rs b/voxygen/src/audio/sfx/event_mapper/movement.rs
deleted file mode 100644
index 4a1c96934b..0000000000
--- a/voxygen/src/audio/sfx/event_mapper/movement.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-/// event_mapper::movement watches all local entities movements and determines
-/// which sfx to emit, and the position at which the sound should be emitted
-/// from
-use crate::audio::sfx::{SfxTriggerItem, SfxTriggers};
-
-use client::Client;
-use common::{
-    comp::{ActionState, Body, CharacterState, MovementState, Pos, Vel},
-    event::{EventBus, SfxEvent, SfxEventItem},
-};
-use hashbrown::HashMap;
-use specs::{Entity as EcsEntity, Join, WorldExt};
-use std::time::{Duration, Instant};
-use vek::*;
-
-#[derive(Clone)]
-struct LastSfxEvent {
-    event: SfxEvent,
-    time: Instant,
-}
-
-pub struct MovementEventMapper {
-    event_history: HashMap<EcsEntity, LastSfxEvent>,
-}
-
-impl MovementEventMapper {
-    pub fn new() -> Self {
-        Self {
-            event_history: HashMap::new(),
-        }
-    }
-
-    pub fn maintain(&mut self, client: &Client, triggers: &SfxTriggers) {
-        const SFX_DIST_LIMIT_SQR: f32 = 22500.0;
-        let ecs = client.state().ecs();
-
-        let player_position = ecs
-            .read_storage::<Pos>()
-            .get(client.entity())
-            .map_or(Vec3::zero(), |pos| pos.0);
-
-        for (entity, pos, vel, body, character) in (
-            &ecs.entities(),
-            &ecs.read_storage::<Pos>(),
-            &ecs.read_storage::<Vel>(),
-            &ecs.read_storage::<Body>(),
-            ecs.read_storage::<CharacterState>().maybe(),
-        )
-            .join()
-            .filter(|(_, e_pos, ..)| {
-                (e_pos.0.distance_squared(player_position)) < SFX_DIST_LIMIT_SQR
-            })
-        {
-            if let Some(character) = character {
-                let state = self
-                    .event_history
-                    .entry(entity)
-                    .or_insert_with(|| LastSfxEvent {
-                        event: SfxEvent::Idle,
-                        time: Instant::now(),
-                    });
-
-                let mapped_event = match body {
-                    Body::Humanoid(_) => {
-                        Self::map_movement_event(character, state.event.clone(), vel.0)
-                    },
-                    Body::QuadrupedMedium(_) => {
-                        // TODO: Quadriped running sfx
-                        SfxEvent::Idle
-                    },
-                    _ => SfxEvent::Idle,
-                };
-
-                // Check for SFX config entry for this movement
-                if Self::should_emit(state, triggers.get_key_value(&mapped_event)) {
-                    ecs.read_resource::<EventBus<SfxEventItem>>()
-                        .emitter()
-                        .emit(SfxEventItem::new(mapped_event, Some(pos.0)));
-
-                    // Update the last play time
-                    state.event = mapped_event;
-                    state.time = Instant::now();
-                } else {
-                    // Keep the last event, it may not have an SFX trigger but it helps us determine
-                    // the next one
-                    state.event = mapped_event;
-                }
-            }
-        }
-
-        self.cleanup(client.entity());
-    }
-
-    /// As the player explores the world, we track the last event of the nearby
-    /// entities to determine the correct SFX item to play next based on
-    /// their activity. `cleanup` will remove entities from event tracking if
-    /// they have not triggered an event for > n seconds. This prevents
-    /// stale records from bloating the Map size.
-    fn cleanup(&mut self, player: EcsEntity) {
-        const TRACKING_TIMEOUT: u64 = 15;
-
-        let now = Instant::now();
-        self.event_history.retain(|entity, event| {
-            now.duration_since(event.time) < Duration::from_secs(TRACKING_TIMEOUT)
-                || entity.id() == player.id()
-        });
-    }
-
-    /// When specific entity movements are detected, the associated sound (if
-    /// any) needs to satisfy two conditions to be allowed to play:
-    /// 1. An sfx.ron entry exists for the movement (we need to know which sound
-    /// file(s) to play) 2. The sfx has not been played since it's timeout
-    /// threshold has elapsed, which prevents firing every tick
-    fn should_emit(
-        last_play_entry: &LastSfxEvent,
-        sfx_trigger_item: Option<(&SfxEvent, &SfxTriggerItem)>,
-    ) -> bool {
-        if let Some((event, item)) = sfx_trigger_item {
-            if &last_play_entry.event == event {
-                last_play_entry.time.elapsed().as_secs_f64() >= item.threshold
-            } else {
-                true
-            }
-        } else {
-            false
-        }
-    }
-
-    /// Voxygen has an existing list of character states via `MovementState::*`
-    /// and `ActionState::*` however that list does not provide enough
-    /// resolution to target specific entity events, such as opening or
-    /// closing the glider. These methods translate those entity states with
-    /// some additional data into more specific `SfxEvent`'s which we attach
-    /// sounds to
-    fn map_movement_event(
-        current_event: &CharacterState,
-        previous_event: SfxEvent,
-        vel: Vec3<f32>,
-    ) -> SfxEvent {
-        match (current_event.movement, current_event.action, previous_event) {
-            (_, ActionState::Roll { .. }, _) => SfxEvent::Roll,
-            (MovementState::Climb, ..) => SfxEvent::Climb,
-            (MovementState::Swim, ..) => SfxEvent::Swim,
-            (MovementState::Run, ..) => {
-                // If the entitys's velocity is very low, they may be stuck, or walking into a
-                // solid object. We should not trigger the run SFX in this case,
-                // even if their move state indicates running. The 0.1 value is
-                // an approximation from playtesting scenarios where this can occur.
-                if vel.magnitude() > 0.1 {
-                    SfxEvent::Run
-                } else {
-                    SfxEvent::Idle
-                }
-            },
-            (MovementState::Jump, ..) => SfxEvent::Jump,
-            (MovementState::Fall, _, SfxEvent::Glide) => SfxEvent::GliderClose,
-            (MovementState::Stand, _, SfxEvent::Fall) => SfxEvent::Run,
-            (MovementState::Fall, _, SfxEvent::Jump) => SfxEvent::Idle,
-            (MovementState::Fall, _, _) => SfxEvent::Fall,
-            (MovementState::Glide, _, previous_event) => {
-                if previous_event != SfxEvent::GliderOpen && previous_event != SfxEvent::Glide {
-                    SfxEvent::GliderOpen
-                } else {
-                    SfxEvent::Glide
-                }
-            },
-            (MovementState::Stand, _, SfxEvent::Glide) => SfxEvent::GliderClose,
-            _ => SfxEvent::Idle,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use common::{
-        comp::{ActionState, MovementState},
-        event::SfxEvent,
-    };
-    use std::time::{Duration, Instant};
-
-    #[test]
-    fn no_item_config_no_emit() {
-        let last_sfx_event = LastSfxEvent {
-            event: SfxEvent::Idle,
-            time: Instant::now(),
-        };
-
-        let result = MovementEventMapper::should_emit(&last_sfx_event, None);
-
-        assert_eq!(result, false);
-    }
-
-    #[test]
-    fn config_but_played_since_threshold_no_emit() {
-        let event = SfxEvent::Run;
-
-        let trigger_item = SfxTriggerItem {
-            files: vec![String::from("some.path.to.sfx.file")],
-            threshold: 1.0,
-        };
-
-        // Triggered a 'Run' 0 seconds ago
-        let last_sfx_event = LastSfxEvent {
-            event: SfxEvent::Run,
-            time: Instant::now(),
-        };
-
-        let result =
-            MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
-
-        assert_eq!(result, false);
-    }
-
-    #[test]
-    fn config_and_not_played_since_threshold_emits() {
-        let event = SfxEvent::Run;
-
-        let trigger_item = SfxTriggerItem {
-            files: vec![String::from("some.path.to.sfx.file")],
-            threshold: 0.5,
-        };
-
-        let last_sfx_event = LastSfxEvent {
-            event: SfxEvent::Idle,
-            time: Instant::now().checked_add(Duration::from_secs(1)).unwrap(),
-        };
-
-        let result =
-            MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
-
-        assert_eq!(result, true);
-    }
-
-    #[test]
-    fn same_previous_event_elapsed_emits() {
-        let event = SfxEvent::Run;
-
-        let trigger_item = SfxTriggerItem {
-            files: vec![String::from("some.path.to.sfx.file")],
-            threshold: 0.5,
-        };
-
-        let last_sfx_event = LastSfxEvent {
-            event: SfxEvent::Run,
-            time: Instant::now()
-                .checked_sub(Duration::from_millis(500))
-                .unwrap(),
-        };
-
-        let result =
-            MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
-
-        assert_eq!(result, true);
-    }
-
-    #[test]
-    fn maps_idle() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Stand,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Idle,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::Idle);
-    }
-
-    #[test]
-    fn maps_run_with_sufficient_velocity() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Run,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Idle,
-            Vec3::new(0.5, 0.8, 0.0),
-        );
-
-        assert_eq!(result, SfxEvent::Run);
-    }
-
-    #[test]
-    fn does_not_map_run_with_insufficient_velocity() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Run,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Idle,
-            Vec3::new(0.02, 0.0001, 0.0),
-        );
-
-        assert_eq!(result, SfxEvent::Idle);
-    }
-
-    #[test]
-    fn maps_roll() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                action: ActionState::Roll {
-                    time_left: Duration::new(1, 0),
-                    was_wielding: false,
-                },
-                movement: MovementState::Run,
-            },
-            SfxEvent::Run,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::Roll);
-    }
-
-    #[test]
-    fn maps_fall() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Fall,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Fall,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::Fall);
-    }
-
-    #[test]
-    fn maps_land_on_ground_to_run() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Stand,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Fall,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::Run);
-    }
-
-    #[test]
-    fn maps_glider_open() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Glide,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Jump,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::GliderOpen);
-    }
-
-    #[test]
-    fn maps_glide() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Glide,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Glide,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::Glide);
-    }
-
-    #[test]
-    fn maps_glider_close_when_closing_mid_flight() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Fall,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Glide,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::GliderClose);
-    }
-
-    #[test]
-    fn maps_glider_close_when_landing() {
-        let result = MovementEventMapper::map_movement_event(
-            &CharacterState {
-                movement: MovementState::Stand,
-                action: ActionState::Idle,
-            },
-            SfxEvent::Glide,
-            Vec3::zero(),
-        );
-
-        assert_eq!(result, SfxEvent::GliderClose);
-    }
-}
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs
new file mode 100644
index 0000000000..d222042a64
--- /dev/null
+++ b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs
@@ -0,0 +1,238 @@
+/// event_mapper::movement watches all local entities movements and determines
+/// which sfx to emit, and the position at which the sound should be emitted
+/// from
+use crate::audio::sfx::{SfxTriggerItem, SfxTriggers};
+
+use common::{
+    comp::{ActionState, Body, CharacterState, Item, ItemKind, MovementState, Pos, Stats, Vel},
+    event::{EventBus, SfxEvent, SfxEventItem},
+    state::State,
+};
+use hashbrown::HashMap;
+use specs::{Entity as EcsEntity, Join, WorldExt};
+use std::time::{Duration, Instant};
+use vek::*;
+
+#[derive(Clone)]
+struct LastSfxEvent {
+    event: SfxEvent,
+    weapon_drawn: bool,
+    time: Instant,
+}
+
+pub struct MovementEventMapper {
+    event_history: HashMap<EcsEntity, LastSfxEvent>,
+}
+
+impl MovementEventMapper {
+    pub fn new() -> Self {
+        Self {
+            event_history: HashMap::new(),
+        }
+    }
+
+    pub fn maintain(&mut self, state: &State, player_entity: EcsEntity, triggers: &SfxTriggers) {
+        const SFX_DIST_LIMIT_SQR: f32 = 20000.0;
+        let ecs = state.ecs();
+
+        let player_position = ecs
+            .read_storage::<Pos>()
+            .get(player_entity)
+            .map_or(Vec3::zero(), |pos| pos.0);
+
+        for (entity, pos, vel, body, stats, character) in (
+            &ecs.entities(),
+            &ecs.read_storage::<Pos>(),
+            &ecs.read_storage::<Vel>(),
+            &ecs.read_storage::<Body>(),
+            &ecs.read_storage::<Stats>(),
+            ecs.read_storage::<CharacterState>().maybe(),
+        )
+            .join()
+            .filter(|(_, e_pos, ..)| {
+                (e_pos.0.distance_squared(player_position)) < SFX_DIST_LIMIT_SQR
+            })
+        {
+            if let Some(character) = character {
+                let state = self
+                    .event_history
+                    .entry(entity)
+                    .or_insert_with(|| LastSfxEvent {
+                        event: SfxEvent::Idle,
+                        weapon_drawn: false,
+                        time: Instant::now(),
+                    });
+
+                let mapped_event = match body {
+                    Body::Humanoid(_) => Self::map_movement_event(character, state, vel.0, stats),
+                    Body::QuadrupedMedium(_)
+                    | Body::QuadrupedSmall(_)
+                    | Body::BirdMedium(_)
+                    | Body::BirdSmall(_)
+                    | Body::BipedLarge(_) => {
+                        Self::map_non_humanoid_movement_event(character, vel.0)
+                    },
+                    _ => SfxEvent::Idle, // Ignore fish, critters, etc...
+                };
+
+                // Check for SFX config entry for this movement
+                if Self::should_emit(state, triggers.get_key_value(&mapped_event)) {
+                    ecs.read_resource::<EventBus<SfxEventItem>>()
+                        .emitter()
+                        .emit(SfxEventItem::new(
+                            mapped_event,
+                            Some(pos.0),
+                            Some(Self::get_volume_for_body_type(body)),
+                        ));
+
+                    // Update the last play time
+                    state.event = mapped_event;
+                    state.time = Instant::now();
+                    state.weapon_drawn = Self::has_weapon_drawn(character.action);
+                } else {
+                    // Keep the last event, it may not have an SFX trigger but it helps us determine
+                    // the next one
+                    state.event = mapped_event;
+                }
+            }
+        }
+
+        self.cleanup(player_entity);
+    }
+
+    /// As the player explores the world, we track the last event of the nearby
+    /// entities to determine the correct SFX item to play next based on
+    /// their activity. `cleanup` will remove entities from event tracking if
+    /// they have not triggered an event for > n seconds. This prevents
+    /// stale records from bloating the Map size.
+    fn cleanup(&mut self, player: EcsEntity) {
+        const TRACKING_TIMEOUT: u64 = 10;
+
+        let now = Instant::now();
+        self.event_history.retain(|entity, event| {
+            now.duration_since(event.time) < Duration::from_secs(TRACKING_TIMEOUT)
+                || entity.id() == player.id()
+        });
+    }
+
+    /// When specific entity movements are detected, the associated sound (if
+    /// any) needs to satisfy two conditions to be allowed to play:
+    /// 1. An sfx.ron entry exists for the movement (we need to know which sound
+    /// file(s) to play) 2. The sfx has not been played since it's timeout
+    /// threshold has elapsed, which prevents firing every tick
+    fn should_emit(
+        last_play_entry: &LastSfxEvent,
+        sfx_trigger_item: Option<(&SfxEvent, &SfxTriggerItem)>,
+    ) -> bool {
+        if let Some((event, item)) = sfx_trigger_item {
+            if &last_play_entry.event == event {
+                last_play_entry.time.elapsed().as_secs_f64() >= item.threshold
+            } else {
+                true
+            }
+        } else {
+            false
+        }
+    }
+
+    /// Voxygen has an existing list of character states via `MovementState::*`
+    /// and `ActionState::*` however that list does not provide enough
+    /// resolution to target specific entity events, such as opening or
+    /// closing the glider. These methods translate those entity states with
+    /// some additional data into more specific `SfxEvent`'s which we attach
+    /// sounds to
+    fn map_movement_event(
+        current_event: &CharacterState,
+        previous_event: &LastSfxEvent,
+        vel: Vec3<f32>,
+        stats: &Stats,
+    ) -> SfxEvent {
+        // Handle any weapon wielding changes up front. Doing so here first simplifies
+        // handling the movement/action state later, since they don't require querying
+        // stats or previous wield state.
+        if let Some(Item {
+            kind: ItemKind::Tool { kind, .. },
+            ..
+        }) = stats.equipment.main
+        {
+            if let Some(wield_event) = match (
+                previous_event.weapon_drawn,
+                current_event.action.is_roll(),
+                Self::has_weapon_drawn(current_event.action),
+            ) {
+                (false, false, true) => Some(SfxEvent::Wield(kind)),
+                (true, false, false) => Some(SfxEvent::Unwield(kind)),
+                _ => None,
+            } {
+                return wield_event;
+            }
+        }
+
+        // Match all other Movemement and Action states
+        match (
+            current_event.movement,
+            current_event.action,
+            previous_event.event.clone(),
+        ) {
+            (_, ActionState::Roll { .. }, _) => SfxEvent::Roll,
+            (MovementState::Climb, ..) => SfxEvent::Climb,
+            (MovementState::Swim, ..) => SfxEvent::Swim,
+            (MovementState::Run, ..) => {
+                // If the entitys's velocity is very low, they may be stuck, or walking into a
+                // solid object. We should not trigger the run SFX in this case,
+                // even if their move state indicates running. The 0.1 value is
+                // an approximation from playtesting scenarios where this can occur.
+                if vel.magnitude() > 0.1 {
+                    SfxEvent::Run
+                } else {
+                    SfxEvent::Idle
+                }
+            },
+            (MovementState::Jump, ..) => SfxEvent::Jump,
+            (MovementState::Fall, _, SfxEvent::Glide) => SfxEvent::GliderClose,
+            (MovementState::Stand, _, SfxEvent::Fall) => SfxEvent::Run,
+            (MovementState::Fall, _, SfxEvent::Jump) => SfxEvent::Idle,
+            (MovementState::Fall, _, _) => SfxEvent::Fall,
+            (MovementState::Glide, _, previous_event) => {
+                if previous_event != SfxEvent::GliderOpen && previous_event != SfxEvent::Glide {
+                    SfxEvent::GliderOpen
+                } else {
+                    SfxEvent::Glide
+                }
+            },
+            (MovementState::Stand, _, SfxEvent::Glide) => SfxEvent::GliderClose,
+            _ => SfxEvent::Idle,
+        }
+    }
+
+    /// Maps a limited set of movements for other non-humanoid entities
+    fn map_non_humanoid_movement_event(current_event: &CharacterState, vel: Vec3<f32>) -> SfxEvent {
+        if current_event.movement == MovementState::Run && vel.magnitude() > 0.1 {
+            SfxEvent::Run
+        } else {
+            SfxEvent::Idle
+        }
+    }
+
+    /// Returns true for any state where the player has their weapon drawn. This
+    /// helps us manage the wield/unwield sfx events
+    fn has_weapon_drawn(state: ActionState) -> bool {
+        state.is_wield() | state.is_attack() | state.is_block() | state.is_charge()
+    }
+
+    /// Returns a relative volume value for a body type. This helps us emit sfx
+    /// at a volume appropriate fot the entity we are emitting the event for
+    fn get_volume_for_body_type(body: &Body) -> f32 {
+        match body {
+            Body::Humanoid(_) => 0.9,
+            Body::QuadrupedSmall(_) => 0.3,
+            Body::QuadrupedMedium(_) => 0.7,
+            Body::BirdMedium(_) => 0.3,
+            Body::BirdSmall(_) => 0.2,
+            Body::BipedLarge(_) => 1.0,
+            _ => 0.9,
+        }
+    }
+}
+
+#[cfg(test)] mod tests;
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
new file mode 100644
index 0000000000..251efba8a5
--- /dev/null
+++ b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
@@ -0,0 +1,456 @@
+use super::*;
+use common::{
+    assets,
+    comp::{
+        bird_small, humanoid, item::Tool, quadruped_medium, quadruped_small, ActionState, Body,
+        MovementState, Stats,
+    },
+    event::SfxEvent,
+};
+use std::time::{Duration, Instant};
+
+#[test]
+fn no_item_config_no_emit() {
+    let last_sfx_event = LastSfxEvent {
+        event: SfxEvent::Idle,
+        weapon_drawn: false,
+        time: Instant::now(),
+    };
+
+    let result = MovementEventMapper::should_emit(&last_sfx_event, None);
+
+    assert_eq!(result, false);
+}
+
+#[test]
+fn config_but_played_since_threshold_no_emit() {
+    let event = SfxEvent::Run;
+
+    let trigger_item = SfxTriggerItem {
+        files: vec![String::from("some.path.to.sfx.file")],
+        threshold: 1.0,
+    };
+
+    // Triggered a 'Run' 0 seconds ago
+    let last_sfx_event = LastSfxEvent {
+        event: SfxEvent::Run,
+        weapon_drawn: false,
+        time: Instant::now(),
+    };
+
+    let result = MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
+
+    assert_eq!(result, false);
+}
+
+#[test]
+fn config_and_not_played_since_threshold_emits() {
+    let event = SfxEvent::Run;
+
+    let trigger_item = SfxTriggerItem {
+        files: vec![String::from("some.path.to.sfx.file")],
+        threshold: 0.5,
+    };
+
+    let last_sfx_event = LastSfxEvent {
+        event: SfxEvent::Idle,
+        weapon_drawn: false,
+        time: Instant::now().checked_add(Duration::from_secs(1)).unwrap(),
+    };
+
+    let result = MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
+
+    assert_eq!(result, true);
+}
+
+#[test]
+fn same_previous_event_elapsed_emits() {
+    let event = SfxEvent::Run;
+
+    let trigger_item = SfxTriggerItem {
+        files: vec![String::from("some.path.to.sfx.file")],
+        threshold: 0.5,
+    };
+
+    let last_sfx_event = LastSfxEvent {
+        event: SfxEvent::Run,
+        weapon_drawn: false,
+        time: Instant::now()
+            .checked_sub(Duration::from_millis(500))
+            .unwrap(),
+    };
+
+    let result = MovementEventMapper::should_emit(&last_sfx_event, Some((&event, &trigger_item)));
+
+    assert_eq!(result, true);
+}
+
+#[test]
+fn maps_idle() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Stand,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Idle);
+}
+
+#[test]
+fn maps_run_with_sufficient_velocity() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Run,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::new(0.5, 0.8, 0.0),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Run);
+}
+
+#[test]
+fn does_not_map_run_with_insufficient_velocity() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Run,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::new(0.02, 0.0001, 0.0),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Idle);
+}
+
+#[test]
+fn maps_roll() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            action: ActionState::Roll {
+                time_left: Duration::new(1, 0),
+                was_wielding: false,
+            },
+            movement: MovementState::Run,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Run,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Roll);
+}
+
+#[test]
+fn maps_fall() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Fall,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Fall,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Fall);
+}
+
+#[test]
+fn maps_land_on_ground_to_run() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Stand,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Fall,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Run);
+}
+
+#[test]
+fn maps_glider_open() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Glide,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Jump,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::GliderOpen);
+}
+
+#[test]
+fn maps_glide() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Glide,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Glide,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Glide);
+}
+
+#[test]
+fn maps_glider_close_when_closing_mid_flight() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Fall,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Glide,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::GliderClose);
+}
+
+#[test]
+fn maps_glider_close_when_landing() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Stand,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Glide,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::GliderClose);
+}
+
+#[test]
+fn maps_wield() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        Some(assets::load_expect_cloned(
+            "common.items.weapons.starter_sword",
+        )),
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Stand,
+            action: ActionState::Wield {
+                time_left: Duration::from_millis(800),
+            },
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Wield(Tool::Sword));
+}
+
+#[test]
+fn maps_unwield() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        Some(assets::load_expect_cloned(
+            "common.items.weapons.starter_axe",
+        )),
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Stand,
+            action: ActionState::Idle,
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: true,
+            time: Instant::now(),
+        },
+        Vec3::zero(),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Unwield(Tool::Axe));
+}
+
+#[test]
+fn does_not_map_wield_when_no_main_weapon() {
+    let stats = Stats::new(
+        String::from("test"),
+        Body::Humanoid(humanoid::Body::random()),
+        None,
+    );
+
+    let result = MovementEventMapper::map_movement_event(
+        &CharacterState {
+            movement: MovementState::Run,
+            action: ActionState::Wield {
+                time_left: Duration::from_millis(600),
+            },
+        },
+        &LastSfxEvent {
+            event: SfxEvent::Idle,
+            weapon_drawn: false,
+            time: Instant::now(),
+        },
+        Vec3::new(0.5, 0.8, 0.0),
+        &stats,
+    );
+
+    assert_eq!(result, SfxEvent::Run);
+}
+
+#[test]
+fn maps_quadrupeds_running() {
+    let result = MovementEventMapper::map_non_humanoid_movement_event(
+        &CharacterState {
+            movement: MovementState::Run,
+            action: ActionState::Idle,
+        },
+        Vec3::new(0.5, 0.8, 0.0),
+    );
+
+    assert_eq!(result, SfxEvent::Run);
+}
+
+#[test]
+fn determines_relative_volumes() {
+    let human =
+        MovementEventMapper::get_volume_for_body_type(&Body::Humanoid(humanoid::Body::random()));
+
+    let quadruped_medium = MovementEventMapper::get_volume_for_body_type(&Body::QuadrupedMedium(
+        quadruped_medium::Body::random(),
+    ));
+
+    let quadruped_small = MovementEventMapper::get_volume_for_body_type(&Body::QuadrupedSmall(
+        quadruped_small::Body::random(),
+    ));
+
+    let bird_small =
+        MovementEventMapper::get_volume_for_body_type(&Body::BirdSmall(bird_small::Body::random()));
+
+    assert!(quadruped_medium < human);
+    assert!(quadruped_small < quadruped_medium);
+    assert!(bird_small < quadruped_small);
+}
diff --git a/voxygen/src/audio/sfx/event_mapper/progression.rs b/voxygen/src/audio/sfx/event_mapper/progression.rs
index 3edfcf1f7b..7c05db0360 100644
--- a/voxygen/src/audio/sfx/event_mapper/progression.rs
+++ b/voxygen/src/audio/sfx/event_mapper/progression.rs
@@ -2,10 +2,10 @@
 /// and experience and emits associated SFX
 use crate::audio::sfx::SfxTriggers;
 
-use client::Client;
 use common::{
     comp::Stats,
     event::{EventBus, SfxEvent, SfxEventItem},
+    state::State,
 };
 use specs::WorldExt;
 
@@ -30,13 +30,18 @@ impl ProgressionEventMapper {
         }
     }
 
-    pub fn maintain(&mut self, client: &Client, triggers: &SfxTriggers) {
-        let ecs = client.state().ecs();
+    pub fn maintain(
+        &mut self,
+        state: &State,
+        player_entity: specs::Entity,
+        triggers: &SfxTriggers,
+    ) {
+        let ecs = state.ecs();
 
         // level and exp changes
         let next_state =
             ecs.read_storage::<Stats>()
-                .get(client.entity())
+                .get(player_entity)
                 .map_or(self.state.clone(), |stats| ProgressionState {
                     level: stats.level.level(),
                     exp: stats.exp.current(),
diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs
index cbd6d50f5b..86771e86c2 100644
--- a/voxygen/src/audio/sfx/mod.rs
+++ b/voxygen/src/audio/sfx/mod.rs
@@ -4,11 +4,11 @@
 mod event_mapper;
 
 use crate::audio::AudioFrontend;
-use client::Client;
 use common::{
     assets,
     comp::{Ori, Pos},
     event::{EventBus, SfxEvent, SfxEventItem},
+    state::State,
 };
 use event_mapper::SfxEventMapper;
 use hashbrown::HashMap;
@@ -50,23 +50,29 @@ impl SfxMgr {
         }
     }
 
-    pub fn maintain(&mut self, audio: &mut AudioFrontend, client: &Client) {
+    pub fn maintain(
+        &mut self,
+        audio: &mut AudioFrontend,
+        state: &State,
+        player_entity: specs::Entity,
+    ) {
         if !audio.sfx_enabled() {
             return;
         }
 
-        self.event_mapper.maintain(client, &self.triggers);
+        self.event_mapper
+            .maintain(state, player_entity, &self.triggers);
 
-        let ecs = client.state().ecs();
+        let ecs = state.ecs();
 
         let player_position = ecs
             .read_storage::<Pos>()
-            .get(client.entity())
+            .get(player_entity)
             .map_or(Vec3::zero(), |pos| pos.0);
 
         let player_ori = ecs
             .read_storage::<Ori>()
-            .get(client.entity())
+            .get(player_entity)
             .map_or(Vec3::zero(), |pos| pos.0);
 
         audio.set_listener_pos(&player_position, &player_ori);
@@ -91,7 +97,7 @@ impl SfxMgr {
                     },
                 };
 
-                audio.play_sound(sfx_file, position);
+                audio.play_sfx(sfx_file, position, event.vol);
             }
         }
     }
diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs
new file mode 100644
index 0000000000..77049acc21
--- /dev/null
+++ b/voxygen/src/controller.rs
@@ -0,0 +1,329 @@
+//! Module containing controller-specific abstractions allowing complex
+//! keybindings
+
+use crate::window::{GameInput, MenuInput};
+use gilrs::{ev::Code as GilCode, Axis as GilAxis, Button as GilButton};
+use hashbrown::HashMap;
+use serde_derive::{Deserialize, Serialize};
+
+/// Contains all controller related settings and keymaps
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ControllerSettings {
+    pub game_button_map: HashMap<Button, Vec<GameInput>>,
+    pub menu_button_map: HashMap<Button, Vec<MenuInput>>,
+    pub game_analog_button_map: HashMap<AnalogButton, Vec<AnalogButtonGameAction>>,
+    pub menu_analog_button_map: HashMap<AnalogButton, Vec<AnalogButtonMenuAction>>,
+    pub game_axis_map: HashMap<Axis, Vec<AxisGameAction>>,
+    pub menu_axis_map: HashMap<Axis, Vec<AxisMenuAction>>,
+    pub pan_sensitivity: u32,
+    pub axis_deadzones: HashMap<Axis, f32>,
+    pub button_deadzones: HashMap<AnalogButton, f32>,
+    pub mouse_emulation_sensitivity: u32,
+    pub inverted_axes: Vec<Axis>,
+}
+
+impl ControllerSettings {
+    pub fn apply_axis_deadzone(&self, k: &Axis, input: f32) -> f32 {
+        let threshold = *self.axis_deadzones.get(k).unwrap_or(&0.2);
+
+        // This could be one comparison per handled event faster if threshold was
+        // guaranteed to fall into <0, 1) range
+        let input_abs = input.abs();
+        if input_abs <= threshold || threshold >= 1.0 {
+            0.0
+        } else if threshold <= 0.0 {
+            input
+        } else {
+            (input_abs - threshold) / (1.0 - threshold) * input.signum()
+        }
+    }
+
+    pub fn apply_button_deadzone(&self, k: &AnalogButton, input: f32) -> f32 {
+        let threshold = *self.button_deadzones.get(k).unwrap_or(&0.2);
+
+        // This could be one comparison per handled event faster if threshold was
+        // guaranteed to fall into <0, 1) range
+        if input <= threshold || threshold >= 1.0 {
+            0.0
+        } else if threshold <= 0.0 {
+            input
+        } else {
+            (input - threshold) / (1.0 - threshold)
+        }
+    }
+}
+
+impl From<&crate::settings::GamepadSettings> for ControllerSettings {
+    fn from(settings: &crate::settings::GamepadSettings) -> Self {
+        Self {
+            game_button_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.game_buttons.primary)
+                    .or_default()
+                    .push(GameInput::Primary);
+                map.entry(settings.game_buttons.secondary)
+                    .or_default()
+                    .push(GameInput::Secondary);
+                map.entry(settings.game_buttons.toggle_cursor)
+                    .or_default()
+                    .push(GameInput::ToggleCursor);
+                map.entry(settings.game_buttons.escape)
+                    .or_default()
+                    .push(GameInput::Escape);
+                map.entry(settings.game_buttons.enter)
+                    .or_default()
+                    .push(GameInput::Enter);
+                map.entry(settings.game_buttons.command)
+                    .or_default()
+                    .push(GameInput::Command);
+                map.entry(settings.game_buttons.move_forward)
+                    .or_default()
+                    .push(GameInput::MoveForward);
+                map.entry(settings.game_buttons.move_left)
+                    .or_default()
+                    .push(GameInput::MoveLeft);
+                map.entry(settings.game_buttons.move_back)
+                    .or_default()
+                    .push(GameInput::MoveBack);
+                map.entry(settings.game_buttons.move_right)
+                    .or_default()
+                    .push(GameInput::MoveRight);
+                map.entry(settings.game_buttons.jump)
+                    .or_default()
+                    .push(GameInput::Jump);
+                map.entry(settings.game_buttons.sit)
+                    .or_default()
+                    .push(GameInput::Sit);
+                map.entry(settings.game_buttons.glide)
+                    .or_default()
+                    .push(GameInput::Glide);
+                map.entry(settings.game_buttons.climb)
+                    .or_default()
+                    .push(GameInput::Climb);
+                map.entry(settings.game_buttons.climb_down)
+                    .or_default()
+                    .push(GameInput::ClimbDown);
+                map.entry(settings.game_buttons.wall_leap)
+                    .or_default()
+                    .push(GameInput::WallLeap);
+                map.entry(settings.game_buttons.mount)
+                    .or_default()
+                    .push(GameInput::Mount);
+                map.entry(settings.game_buttons.map)
+                    .or_default()
+                    .push(GameInput::Map);
+                map.entry(settings.game_buttons.bag)
+                    .or_default()
+                    .push(GameInput::Bag);
+                map.entry(settings.game_buttons.quest_log)
+                    .or_default()
+                    .push(GameInput::QuestLog);
+                map.entry(settings.game_buttons.character_window)
+                    .or_default()
+                    .push(GameInput::CharacterWindow);
+                map.entry(settings.game_buttons.social)
+                    .or_default()
+                    .push(GameInput::Social);
+                map.entry(settings.game_buttons.spellbook)
+                    .or_default()
+                    .push(GameInput::Spellbook);
+                map.entry(settings.game_buttons.settings)
+                    .or_default()
+                    .push(GameInput::Settings);
+                map.entry(settings.game_buttons.help)
+                    .or_default()
+                    .push(GameInput::Help);
+                map.entry(settings.game_buttons.toggle_interface)
+                    .or_default()
+                    .push(GameInput::ToggleInterface);
+                map.entry(settings.game_buttons.toggle_debug)
+                    .or_default()
+                    .push(GameInput::ToggleDebug);
+                map.entry(settings.game_buttons.fullscreen)
+                    .or_default()
+                    .push(GameInput::Fullscreen);
+                map.entry(settings.game_buttons.screenshot)
+                    .or_default()
+                    .push(GameInput::Screenshot);
+                map.entry(settings.game_buttons.toggle_ingame_ui)
+                    .or_default()
+                    .push(GameInput::ToggleIngameUi);
+                map.entry(settings.game_buttons.roll)
+                    .or_default()
+                    .push(GameInput::Roll);
+                map.entry(settings.game_buttons.respawn)
+                    .or_default()
+                    .push(GameInput::Respawn);
+                map.entry(settings.game_buttons.interact)
+                    .or_default()
+                    .push(GameInput::Interact);
+                map.entry(settings.game_buttons.toggle_wield)
+                    .or_default()
+                    .push(GameInput::ToggleWield);
+                map.entry(settings.game_buttons.charge)
+                    .or_default()
+                    .push(GameInput::Charge);
+                map
+            },
+            menu_button_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.menu_buttons.up)
+                    .or_default()
+                    .push(MenuInput::Up);
+                map.entry(settings.menu_buttons.down)
+                    .or_default()
+                    .push(MenuInput::Down);
+                map.entry(settings.menu_buttons.left)
+                    .or_default()
+                    .push(MenuInput::Left);
+                map.entry(settings.menu_buttons.right)
+                    .or_default()
+                    .push(MenuInput::Right);
+                map.entry(settings.menu_buttons.scroll_up)
+                    .or_default()
+                    .push(MenuInput::ScrollUp);
+                map.entry(settings.menu_buttons.scroll_down)
+                    .or_default()
+                    .push(MenuInput::ScrollDown);
+                map.entry(settings.menu_buttons.scroll_left)
+                    .or_default()
+                    .push(MenuInput::ScrollLeft);
+                map.entry(settings.menu_buttons.scroll_right)
+                    .or_default()
+                    .push(MenuInput::ScrollRight);
+                map.entry(settings.menu_buttons.home)
+                    .or_default()
+                    .push(MenuInput::Home);
+                map.entry(settings.menu_buttons.end)
+                    .or_default()
+                    .push(MenuInput::End);
+                map.entry(settings.menu_buttons.apply)
+                    .or_default()
+                    .push(MenuInput::Apply);
+                map.entry(settings.menu_buttons.back)
+                    .or_default()
+                    .push(MenuInput::Back);
+                map.entry(settings.menu_buttons.exit)
+                    .or_default()
+                    .push(MenuInput::Exit);
+                map
+            },
+            game_analog_button_map: HashMap::new(),
+            menu_analog_button_map: HashMap::new(),
+            game_axis_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.game_axis.movement_x)
+                    .or_default()
+                    .push(AxisGameAction::MovementX);
+                map.entry(settings.game_axis.movement_y)
+                    .or_default()
+                    .push(AxisGameAction::MovementY);
+                map.entry(settings.game_axis.camera_x)
+                    .or_default()
+                    .push(AxisGameAction::CameraX);
+                map.entry(settings.game_axis.camera_y)
+                    .or_default()
+                    .push(AxisGameAction::CameraY);
+                map
+            },
+            menu_axis_map: {
+                let mut map: HashMap<_, Vec<_>> = HashMap::new();
+                map.entry(settings.menu_axis.move_x)
+                    .or_default()
+                    .push(AxisMenuAction::MoveX);
+                map.entry(settings.menu_axis.move_y)
+                    .or_default()
+                    .push(AxisMenuAction::MoveY);
+                map.entry(settings.menu_axis.scroll_x)
+                    .or_default()
+                    .push(AxisMenuAction::ScrollX);
+                map.entry(settings.menu_axis.scroll_y)
+                    .or_default()
+                    .push(AxisMenuAction::ScrollY);
+                map
+            },
+            pan_sensitivity: settings.pan_sensitivity,
+            axis_deadzones: settings.axis_deadzones.clone(),
+            button_deadzones: settings.button_deadzones.clone(),
+            mouse_emulation_sensitivity: settings.mouse_emulation_sensitivity,
+            inverted_axes: settings.inverted_axes.clone(),
+        }
+    }
+}
+
+/// All the menu actions you can bind to an Axis
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AxisMenuAction {
+    MoveX,
+    MoveY,
+    ScrollX,
+    ScrollY,
+}
+
+/// All the game actions you can bind to an Axis
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AxisGameAction {
+    MovementX,
+    MovementY,
+    CameraX,
+    CameraY,
+}
+
+/// All the menu actions you can bind to an analog button
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButtonMenuAction {}
+
+/// All the game actions you can bind to an analog button
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButtonGameAction {}
+
+/// Button::Simple(GilButton::Unknown) is invalid and equal to mapping an action
+/// to nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum Button {
+    Simple(GilButton),
+    EventCode(u32),
+}
+
+/// AnalogButton::Simple(GilButton::Unknown) is invalid and equal to mapping an
+/// action to nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum AnalogButton {
+    Simple(GilButton),
+    EventCode(u32),
+}
+
+/// Axis::Simple(GilAxis::Unknown) is invalid and equal to mapping an action to
+/// nothing
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum Axis {
+    Simple(GilAxis),
+    EventCode(u32),
+}
+
+impl From<(GilAxis, GilCode)> for Axis {
+    fn from((axis, code): (GilAxis, GilCode)) -> Self {
+        match axis {
+            GilAxis::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(axis),
+        }
+    }
+}
+
+impl From<(GilButton, GilCode)> for Button {
+    fn from((button, code): (GilButton, GilCode)) -> Self {
+        match button {
+            GilButton::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(button),
+        }
+    }
+}
+
+impl From<(GilButton, GilCode)> for AnalogButton {
+    fn from((button, code): (GilButton, GilCode)) -> Self {
+        match button {
+            GilButton::Unknown => Self::EventCode(code.into_u32()),
+            _ => Self::Simple(button),
+        }
+    }
+}
diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index 3869b778f1..70e27498de 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -1,9 +1,9 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
     item_imgs::{ItemImgs, ItemKey},
-    Event as HudEvent, Fonts, TEXT_COLOR,
+    Event as HudEvent, TEXT_COLOR,
 };
-use crate::ui::{ImageFrame, Tooltip, TooltipManager, Tooltipable};
+use crate::ui::{fonts::ConrodVoxygenFonts, ImageFrame, Tooltip, TooltipManager, Tooltipable};
 use client::Client;
 use conrod_core::{
     color, image,
@@ -35,7 +35,7 @@ pub struct Bag<'a> {
     client: &'a Client,
     imgs: &'a Imgs,
     item_imgs: &'a ItemImgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
     rot_imgs: &'a ImgsRot,
@@ -48,7 +48,7 @@ impl<'a> Bag<'a> {
         client: &'a Client,
         imgs: &'a Imgs,
         item_imgs: &'a ItemImgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         rot_imgs: &'a ImgsRot,
         tooltip_manager: &'a mut TooltipManager,
         pulse: f32,
@@ -118,10 +118,11 @@ impl<'a> Widget for Bag<'a> {
                 5.0,
             )
         })
-        .title_font_size(15)
+        .title_font_size(self.fonts.cyri.scale(15))
         .parent(ui.window)
-        .desc_font_size(12)
+        .desc_font_size(self.fonts.cyri.scale(12))
         .title_text_color(TEXT_COLOR)
+        .font_id(self.fonts.cyri.conrod_id)
         .desc_text_color(TEXT_COLOR);
 
         // Bag parts
@@ -257,6 +258,7 @@ impl<'a> Widget for Bag<'a> {
         if let Some(to_drop) = state.selected_slot {
             if ui.widget_input(ui.window).clicks().left().next().is_some() {
                 event = Some(Event::HudEvent(HudEvent::DropInventorySlot(to_drop)));
+                state.update(|s| s.selected_slot = None);
             }
         }
 
diff --git a/voxygen/src/hud/buttons.rs b/voxygen/src/hud/buttons.rs
index d37a186dcf..65c0a209c4 100644
--- a/voxygen/src/hud/buttons.rs
+++ b/voxygen/src/hud/buttons.rs
@@ -3,8 +3,8 @@ use conrod_core::{
     widget_ids, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
 };
 
-use super::{img_ids::Imgs, Fonts, Windows, TEXT_COLOR};
-use crate::ui::ToggleButton;
+use super::{img_ids::Imgs, Windows, TEXT_COLOR};
+use crate::ui::{fonts::ConrodVoxygenFonts, ToggleButton};
 
 widget_ids! {
     struct Ids {
@@ -31,7 +31,7 @@ pub struct Buttons<'a> {
     show_bag: bool,
 
     imgs: &'a Imgs,
-    _fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
 }
@@ -42,14 +42,14 @@ impl<'a> Buttons<'a> {
         show_map: bool,
         show_bag: bool,
         imgs: &'a Imgs,
-        _fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
     ) -> Self {
         Self {
             open_windows,
             show_map,
             show_bag,
             imgs,
-            _fonts,
+            fonts,
             common: widget::CommonBuilder::default(),
         }
     }
@@ -101,6 +101,7 @@ impl<'a> Widget for Buttons<'a> {
             Text::new("B")
                 .bottom_right_with_margins_on(state.ids.bag, 0.0, 0.0)
                 .font_size(10)
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.bag_text, ui);
         } else {
@@ -111,6 +112,7 @@ impl<'a> Widget for Buttons<'a> {
             Text::new("B")
                 .bottom_right_with_margins_on(state.ids.bag, 0.0, 0.0)
                 .font_size(10)
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.bag_text, ui);
         }
@@ -122,6 +124,7 @@ impl<'a> Widget for Buttons<'a> {
             .hover_image(self.imgs.settings_hover)
             .press_image(self.imgs.settings_press)
             .label("N")
+            .label_font_id(self.fonts.cyri.conrod_id)
             .label_font_size(10)
             .label_color(TEXT_COLOR)
             .label_y(conrod_core::position::Relative::Scalar(-7.0))
@@ -144,6 +147,7 @@ impl<'a> Widget for Buttons<'a> {
             .hover_image(self.imgs.map_hover)
             .press_image(self.imgs.map_press)
             .label("M")
+            .label_font_id(self.fonts.cyri.conrod_id)
             .label_font_size(10)
             .label_color(TEXT_COLOR)
             .label_y(conrod_core::position::Relative::Scalar(-7.0))
@@ -185,6 +189,7 @@ impl<'a> Widget for Buttons<'a> {
                 .hover_image(self.imgs.social_hover)
                 .press_image(self.imgs.social_press)
                 .label("O")
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(10)
                 .label_color(TEXT_COLOR)
                 .label_y(conrod_core::position::Relative::Scalar(-7.0))
@@ -202,6 +207,7 @@ impl<'a> Widget for Buttons<'a> {
                 .hover_image(self.imgs.spellbook_hover)
                 .press_image(self.imgs.spellbook_press)
                 .label("P")
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(10)
                 .label_color(TEXT_COLOR)
                 .label_y(conrod_core::position::Relative::Scalar(-7.0))
@@ -219,6 +225,7 @@ impl<'a> Widget for Buttons<'a> {
                 .hover_image(self.imgs.character_hover)
                 .press_image(self.imgs.character_press)
                 .label("C")
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(10)
                 .label_color(TEXT_COLOR)
                 .label_y(conrod_core::position::Relative::Scalar(-7.0))
@@ -236,6 +243,7 @@ impl<'a> Widget for Buttons<'a> {
                 .hover_image(self.imgs.qlog_hover)
                 .press_image(self.imgs.qlog_press)
                 .label("L")
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_font_size(10)
                 .label_color(TEXT_COLOR)
                 .label_y(conrod_core::position::Relative::Scalar(-7.0))
diff --git a/voxygen/src/hud/character_window.rs b/voxygen/src/hud/character_window.rs
index ecf972250d..48b460a16f 100644
--- a/voxygen/src/hud/character_window.rs
+++ b/voxygen/src/hud/character_window.rs
@@ -1,5 +1,5 @@
-use super::{img_ids::Imgs, Fonts, Show, TEXT_COLOR, XP_COLOR};
-use crate::i18n::VoxygenLocalization;
+use super::{img_ids::Imgs, Show, TEXT_COLOR, XP_COLOR};
+use crate::{i18n::VoxygenLocalization, ui::fonts::ConrodVoxygenFonts};
 use common::comp::Stats;
 use conrod_core::{
     color,
@@ -71,7 +71,7 @@ widget_ids! {
 pub struct CharacterWindow<'a> {
     _show: &'a Show,
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     stats: &'a Stats,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
 
@@ -84,7 +84,7 @@ impl<'a> CharacterWindow<'a> {
         _show: &'a Show,
         stats: &'a Stats,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
@@ -155,8 +155,8 @@ impl<'a> Widget for CharacterWindow<'a> {
                 .get("character_window.character_name"),
         )
         .mid_top_with_margin_on(state.charwindow_frame, 6.0)
-        .font_id(self.fonts.cyri)
-        .font_size(14)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(14))
         .color(TEXT_COLOR)
         .set(state.charwindow_title, ui);
 
@@ -352,8 +352,8 @@ impl<'a> Widget for CharacterWindow<'a> {
         // Level
         Text::new(&level)
             .mid_top_with_margin_on(state.charwindow_rectangle, 10.0)
-            .font_id(self.fonts.cyri)
-            .font_size(30)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(30))
             .color(TEXT_COLOR)
             .set(state.charwindow_tab1_level, ui);
 
@@ -376,8 +376,8 @@ impl<'a> Widget for CharacterWindow<'a> {
         // Exp-Text
         Text::new(&exp_treshold)
             .mid_top_with_margin_on(state.charwindow_tab1_expbar, 10.0)
-            .font_id(self.fonts.cyri)
-            .font_size(15)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(15))
             .color(TEXT_COLOR)
             .set(state.charwindow_tab1_exp, ui);
 
@@ -395,8 +395,8 @@ impl<'a> Widget for CharacterWindow<'a> {
                 .get("character_window.character_stats"),
         )
         .top_left_with_margins_on(state.charwindow_rectangle, 140.0, 5.0)
-        .font_id(self.fonts.cyri)
-        .font_size(16)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(16))
         .color(TEXT_COLOR)
         .set(state.charwindow_tab1_statnames, ui);
 
@@ -406,8 +406,8 @@ impl<'a> Widget for CharacterWindow<'a> {
             self.stats.endurance, self.stats.fitness, self.stats.willpower
         ))
         .top_right_with_margins_on(state.charwindow_rectangle, 140.0, 5.0)
-        .font_id(self.fonts.cyri)
-        .font_size(16)
+        .font_id(self.fonts.cyri.conrod_id)
+        .font_size(self.fonts.cyri.scale(16))
         .color(TEXT_COLOR)
         .set(state.charwindow_tab1_stats, ui);
 
diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs
index 1b7b1859c8..2a3197fdaa 100644
--- a/voxygen/src/hud/chat.rs
+++ b/voxygen/src/hud/chat.rs
@@ -1,8 +1,8 @@
 use super::{
-    img_ids::Imgs, Fonts, BROADCAST_COLOR, FACTION_COLOR, GAME_UPDATE_COLOR, GROUP_COLOR,
-    KILL_COLOR, META_COLOR, PRIVATE_COLOR, SAY_COLOR, TELL_COLOR, TEXT_COLOR,
+    img_ids::Imgs, BROADCAST_COLOR, FACTION_COLOR, GAME_UPDATE_COLOR, GROUP_COLOR, KILL_COLOR,
+    META_COLOR, PRIVATE_COLOR, SAY_COLOR, TELL_COLOR, TEXT_COLOR,
 };
-use crate::GlobalState;
+use crate::{ui::fonts::ConrodVoxygenFonts, GlobalState};
 use client::Event as ClientEvent;
 use common::{msg::validate_chat_msg, ChatType};
 use conrod_core::{
@@ -34,7 +34,7 @@ pub struct Chat<'a> {
 
     global_state: &'a GlobalState,
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
 
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
@@ -48,7 +48,7 @@ impl<'a> Chat<'a> {
         new_messages: &'a mut VecDeque<ClientEvent>,
         global_state: &'a GlobalState,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
     ) -> Self {
         Self {
             new_messages,
@@ -187,8 +187,8 @@ impl<'a> Widget for Chat<'a> {
                 .restrict_to_height(false)
                 .color(TEXT_COLOR)
                 .line_spacing(2.0)
-                .font_size(15)
-                .font_id(self.fonts.opensans);
+                .font_size(self.fonts.opensans.scale(15))
+                .font_id(self.fonts.opensans.conrod_id);
 
             if let Some(pos) = self.force_cursor {
                 text_edit = text_edit.cursor_pos(pos);
@@ -251,8 +251,8 @@ impl<'a> Widget for Chat<'a> {
                             ChatType::Kill => KILL_COLOR,
                         };
                         let text = Text::new(&message)
-                            .font_size(15)
-                            .font_id(self.fonts.opensans)
+                            .font_size(self.fonts.opensans.scale(15))
+                            .font_id(self.fonts.opensans.conrod_id)
                             .w(470.0)
                             .color(color)
                             .line_spacing(2.0);
@@ -270,8 +270,8 @@ impl<'a> Widget for Chat<'a> {
                 // Needs to be larger than the space above.
                 Some(
                     Text::new("")
-                        .font_size(6)
-                        .font_id(self.fonts.opensans)
+                        .font_size(self.fonts.opensans.scale(6))
+                        .font_id(self.fonts.opensans.conrod_id)
                         .w(470.0),
                 )
             };
diff --git a/voxygen/src/hud/esc_menu.rs b/voxygen/src/hud/esc_menu.rs
index 8743805b06..a1d547107f 100644
--- a/voxygen/src/hud/esc_menu.rs
+++ b/voxygen/src/hud/esc_menu.rs
@@ -1,14 +1,15 @@
-use super::{img_ids::Imgs, settings_window::SettingsTab, Fonts, TEXT_COLOR};
-use crate::i18n::VoxygenLocalization;
+use super::{img_ids::Imgs, settings_window::SettingsTab, TEXT_COLOR};
+use crate::{i18n::VoxygenLocalization, ui::fonts::ConrodVoxygenFonts};
 use conrod_core::{
     widget::{self, Button, Image},
-    widget_ids, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
+    widget_ids, Color, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
 };
 
 widget_ids! {
     struct Ids {
         esc_bg,
         fireplace,
+        banner_top,
         menu_button_1,
         menu_button_2,
         menu_button_3,
@@ -21,7 +22,7 @@ widget_ids! {
 #[derive(WidgetCommon)]
 pub struct EscMenu<'a> {
     imgs: &'a Imgs,
-    _fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
 
     #[conrod(common_builder)]
@@ -31,12 +32,12 @@ pub struct EscMenu<'a> {
 impl<'a> EscMenu<'a> {
     pub fn new(
         imgs: &'a Imgs,
-        _fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
             imgs,
-            _fonts,
+            fonts,
             localized_strings,
             common: widget::CommonBuilder::default(),
         }
@@ -72,25 +73,33 @@ impl<'a> Widget for EscMenu<'a> {
         let widget::UpdateArgs { state, ui, .. } = args;
 
         Image::new(self.imgs.esc_frame)
-            .w_h(240.0, 440.0)
+            .w_h(240.0, 380.0)
+            .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.9)))
             .middle_of(ui.window)
             .set(state.ids.esc_bg, ui);
 
-        Image::new(self.imgs.fireplace)
-            .w_h(210.0, 60.0)
-            .mid_top_with_margin_on(state.ids.esc_bg, 15.0)
-            .set(state.ids.fireplace, ui);
+        Image::new(self.imgs.banner_top)
+            .w_h(250.0, 34.0)
+            .mid_top_with_margin_on(state.ids.esc_bg, -34.0)
+            .set(state.ids.banner_top, ui);
+
+        /*Image::new(self.imgs.fireplace)
+        .w_h(210.0, 60.0)
+        .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.8)))
+        .mid_top_with_margin_on(state.ids.esc_bg, 5.0)
+        .set(state.ids.fireplace, ui);*/
 
         // Resume
         if Button::image(self.imgs.button)
-            .mid_bottom_with_margin_on(state.ids.fireplace, -55.0)
+            .mid_bottom_with_margin_on(state.ids.banner_top, -60.0)
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .label(&self.localized_strings.get("common.resume"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_1, ui)
             .was_clicked()
         {
@@ -106,7 +115,8 @@ impl<'a> Widget for EscMenu<'a> {
             .label(&self.localized_strings.get("common.settings"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_2, ui)
             .was_clicked()
         {
@@ -121,7 +131,8 @@ impl<'a> Widget for EscMenu<'a> {
             .label(&self.localized_strings.get("common.controls"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_3, ui)
             .was_clicked()
         {
@@ -136,7 +147,8 @@ impl<'a> Widget for EscMenu<'a> {
             .label(&self.localized_strings.get("common.characters"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_4, ui)
             .was_clicked()
         {
@@ -151,7 +163,8 @@ impl<'a> Widget for EscMenu<'a> {
             .label(&self.localized_strings.get("esc_menu.logout"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_5, ui)
             .was_clicked()
         {
@@ -166,7 +179,8 @@ impl<'a> Widget for EscMenu<'a> {
             .label(&self.localized_strings.get("esc_menu.quit_game"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
-            .label_font_size(20)
+            .label_font_size(self.fonts.cyri.scale(20))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .set(state.ids.menu_button_6, ui)
             .was_clicked()
         {
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 40720c90dc..8139982d88 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -113,6 +113,9 @@ image_ids! {
 ////////////////////////////////////////////////////////////////////////
         <VoxelPixArtGraphic>
 
+         // Esc-Menu
+        fireplace: "voxygen.element.misc_bg.fireplace",
+
         // Skill Icons
         twohsword_m1: "voxygen.element.icons.2hsword_m1",
         twohsword_m2: "voxygen.element.icons.2hsword_m2",
@@ -233,11 +236,6 @@ image_ids! {
         close_button_hover: "voxygen.element.buttons.x_hover",
         close_button_press: "voxygen.element.buttons.x_press",
 
-        // Esc-Menu
-        fireplace: "voxygen.element.misc_bg.fireplace",
-        button: "voxygen.element.buttons.button",
-        button_hover: "voxygen.element.buttons.button_hover",
-        button_press: "voxygen.element.buttons.button_press",
 
         // Items
         potion_red: "voxygen.voxel.object.potion_red",
@@ -263,8 +261,18 @@ image_ids! {
         death_bg: "voxygen.background.death",
         hurt_bg: "voxygen.background.hurt",
 
+        banner_top: "voxygen.element.frames.banner_top",
+
+
+
+        // Buttons
+        button: "voxygen.element.buttons.button",
+        button_hover: "voxygen.element.buttons.button_hover",
+        button_press: "voxygen.element.buttons.button_press",
+
         // Enemy Healthbar
         enemy_health: "voxygen.element.frames.enemybar",
+        enemy_health_bg: "voxygen.element.frames.enemybar_bg",
         // Enemy Bar Content:
         enemy_bar: "voxygen.element.skillbar.enemy_bar_content",
         // Spell Book Window
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 0ce7691198..0b237c72ec 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -1,8 +1,8 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
-    Fonts, Show, TEXT_COLOR,
+    Show, TEXT_COLOR,
 };
-use crate::ui::img_ids;
+use crate::ui::{fonts::ConrodVoxygenFonts, img_ids};
 use client::{self, Client};
 use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize};
 use conrod_core::{
@@ -12,6 +12,7 @@ use conrod_core::{
 };
 use specs::WorldExt;
 use vek::*;
+
 widget_ids! {
     struct Ids {
         map_frame,
@@ -36,7 +37,7 @@ pub struct Map<'a> {
     world_map: &'a (img_ids::Rotations, Vec2<u32>),
     imgs: &'a Imgs,
     rot_imgs: &'a ImgsRot,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
     _pulse: f32,
@@ -49,7 +50,7 @@ impl<'a> Map<'a> {
         imgs: &'a Imgs,
         rot_imgs: &'a ImgsRot,
         world_map: &'a (img_ids::Rotations, Vec2<u32>),
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         pulse: f32,
         velocity: f32,
     ) -> Self {
@@ -149,15 +150,15 @@ impl<'a> Widget for Map<'a> {
         match self.client.current_chunk() {
             Some(chunk) => Text::new(chunk.meta().name())
                 .mid_top_with_margin_on(state.ids.map_bg, 55.0)
-                .font_size(60)
+                .font_size(self.fonts.alkhemi.scale(60))
                 .color(TEXT_COLOR)
-                .font_id(self.fonts.alkhemi)
+                .font_id(self.fonts.alkhemi.conrod_id)
                 .parent(state.ids.map_frame_r)
                 .set(state.ids.location_name, ui),
             None => Text::new(" ")
                 .mid_top_with_margin_on(state.ids.map_bg, 3.0)
-                .font_size(40)
-                .font_id(self.fonts.alkhemi)
+                .font_size(self.fonts.alkhemi.scale(40))
+                .font_id(self.fonts.alkhemi.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.location_name, ui),
         }
diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs
index 259325f178..7fd5190b32 100644
--- a/voxygen/src/hud/minimap.rs
+++ b/voxygen/src/hud/minimap.rs
@@ -1,8 +1,8 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
-    Fonts, Show, HP_COLOR, TEXT_COLOR,
+    Show, HP_COLOR, TEXT_COLOR,
 };
-use crate::ui::img_ids;
+use crate::ui::{fonts::ConrodVoxygenFonts, img_ids};
 use client::{self, Client};
 use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize};
 use conrod_core::{
@@ -38,7 +38,7 @@ pub struct MiniMap<'a> {
     imgs: &'a Imgs,
     rot_imgs: &'a ImgsRot,
     world_map: &'a (img_ids::Rotations, Vec2<u32>),
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
 }
@@ -50,7 +50,7 @@ impl<'a> MiniMap<'a> {
         imgs: &'a Imgs,
         rot_imgs: &'a ImgsRot,
         world_map: &'a (img_ids::Rotations, Vec2<u32>),
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
     ) -> Self {
         Self {
             show,
@@ -276,20 +276,20 @@ impl<'a> Widget for MiniMap<'a> {
                 // Region Name
                 Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned()))
                     .mid_top_with_margin_on(ui.window, 200.0)
-                    .font_size(70)
-                    .font_id(self.fonts.alkhemi)
+                    .font_size(self.fonts.alkhemi.scale(70))
+                    .font_id(self.fonts.alkhemi.conrod_id)
                     .color(Color::Rgba(0.0, 0.0, 0.0, fade))
                     .set(state.ids.zone_display_bg, ui);
                 Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned()))
                     .top_left_with_margins_on(state.ids.zone_display_bg, -2.5, -2.5)
-                    .font_size(70)
-                    .font_id(self.fonts.alkhemi)
+                    .font_size(self.fonts.alkhemi.scale(70))
+                    .font_id(self.fonts.alkhemi.conrod_id)
                     .color(Color::Rgba(1.0, 1.0, 1.0, fade))
                     .set(state.ids.zone_display, ui);
             },
             None => Text::new(" ")
                 .middle_of(ui.window)
-                .font_size(14)
+                .font_size(self.fonts.alkhemi.scale(14))
                 .color(HP_COLOR)
                 .set(state.ids.zone_display, ui),
         }
@@ -303,13 +303,17 @@ impl<'a> Widget for MiniMap<'a> {
                     state.ids.mmap_frame,
                     if self.show.mini_map { 6.0 } else { 0.0 },
                 )
-                .font_size(if self.show.mini_map { 20 } else { 18 })
-                .font_id(self.fonts.cyri)
+                .font_size(
+                    self.fonts
+                        .cyri
+                        .scale(if self.show.mini_map { 20 } else { 18 }),
+                )
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.mmap_location, ui),
             None => Text::new(" ")
                 .mid_top_with_margin_on(state.ids.mmap_frame, 0.0)
-                .font_size(18)
+                .font_size(self.fonts.cyri.scale(18))
                 .color(TEXT_COLOR)
                 .set(state.ids.mmap_location, ui),
         }
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index d1dec24d09..f5a0a89ad8 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -38,8 +38,8 @@ use crate::{
     ecs::comp as vcomp,
     i18n::{i18n_asset_key, LanguageMetadata, VoxygenLocalization},
     render::{AaMode, CloudMode, Consts, FluidMode, Globals, Renderer},
-    scene::camera::Camera,
-    ui::{Graphic, Ingameable, ScaleMode, Ui},
+    scene::camera::{self, Camera},
+    ui::{fonts::ConrodVoxygenFonts, Graphic, Ingameable, ScaleMode, Ui},
     window::{Event as WinEvent, GameInput},
     GlobalState,
 };
@@ -178,16 +178,6 @@ widget_ids! {
     }
 }
 
-font_ids! {
-    pub struct Fonts {
-        opensans: "voxygen.font.OpenSans-Regular",
-        metamorph: "voxygen.font.Metamorphous-Regular",
-        alkhemi: "voxygen.font.Alkhemikal",
-        wizard: "voxygen.font.wizard",
-        cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
-    }
-}
-
 pub struct DebugInfo {
     pub tps: f64,
     pub ping_ms: f64,
@@ -211,6 +201,7 @@ pub enum Event {
     ChangeAudioDevice(String),
     ChangeMaxFPS(u32),
     ChangeFOV(u16),
+    ChangeGamma(f32),
     AdjustWindowSize([u16; 2]),
     ToggleFullscreen,
     ChangeAaMode(AaMode),
@@ -366,7 +357,7 @@ impl Show {
 
     fn toggle_ui(&mut self) { self.ui = !self.ui; }
 
-    fn toggle_windows(&mut self) {
+    fn toggle_windows(&mut self, global_state: &mut GlobalState) {
         if self.bag
             || self.esc_menu
             || self.map
@@ -388,9 +379,19 @@ impl Show {
             self.character_window = false;
             self.open_windows = Windows::None;
             self.want_grab = true;
+
+            // Unpause the game if we are on singleplayer
+            if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                singleplayer.pause(false);
+            };
         } else {
             self.esc_menu = true;
             self.want_grab = false;
+
+            // Pause the game if we are on singleplayer
+            if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                singleplayer.pause(true);
+            };
         }
     }
 
@@ -433,7 +434,7 @@ pub struct Hud {
     world_map: (/* Id */ Rotations, Vec2<u32>),
     imgs: Imgs,
     item_imgs: ItemImgs,
-    fonts: Fonts,
+    fonts: ConrodVoxygenFonts,
     rot_imgs: ImgsRot,
     new_messages: VecDeque<ClientEvent>,
     show: Show,
@@ -446,6 +447,7 @@ pub struct Hud {
     force_chat_cursor: Option<Index>,
     pulse: f32,
     velocity: f32,
+    voxygen_i18n: std::sync::Arc<VoxygenLocalization>,
 }
 
 impl Hud {
@@ -468,8 +470,13 @@ impl Hud {
         let rot_imgs = ImgsRot::load(&mut ui).expect("Failed to load rot images!");
         // Load item images.
         let item_imgs = ItemImgs::new(&mut ui);
+        // Load language
+        let voxygen_i18n = load_expect::<VoxygenLocalization>(&i18n_asset_key(
+            &global_state.settings.language.selected_language,
+        ));
         // Load fonts.
-        let fonts = Fonts::load(&mut ui).expect("Failed to load fonts!");
+        let fonts = ConrodVoxygenFonts::load(&voxygen_i18n.fonts, &mut ui)
+            .expect("Impossible to load fonts!");
 
         Self {
             ui,
@@ -508,9 +515,16 @@ impl Hud {
             force_chat_cursor: None,
             pulse: 0.0,
             velocity: 0.0,
+            voxygen_i18n,
         }
     }
 
+    pub fn update_language(&mut self, voxygen_i18n: std::sync::Arc<VoxygenLocalization>) {
+        self.voxygen_i18n = voxygen_i18n;
+        self.fonts = ConrodVoxygenFonts::load(&self.voxygen_i18n.fonts, &mut self.ui)
+            .expect("Impossible to load fonts!");
+    }
+
     fn update_layout(
         &mut self,
         client: &Client,
@@ -533,10 +547,6 @@ impl Hud {
             common::util::GIT_VERSION.to_string()
         );
 
-        let localized_strings = load_expect::<VoxygenLocalization>(&i18n_asset_key(
-            &global_state.settings.language.selected_language,
-        ));
-
         if self.show.ingame {
             let ecs = client.state().ecs();
             let pos = ecs.read_storage::<comp::Pos>();
@@ -695,20 +705,19 @@ impl Hud {
                 let ingame_pos = pos + Vec3::unit_z() * height_offset;
 
                 // Background
-                Rectangle::fill_with(
-                    [82.0 * BARSIZE + 1.0, 8.0],
-                    Color::Rgba(0.1, 0.1, 0.1, 0.9),
-                )
-                .x_y(0.0, MANA_BAR_Y + 7.0) //-25.0)
-                .position_ingame(ingame_pos)
-                .set(back_id, ui_widgets);
+                Image::new(self.imgs.enemy_health_bg)
+                    .w_h(84.0 * BARSIZE, 10.0 * BARSIZE)
+                    .x_y(0.0, MANA_BAR_Y + 6.5) //-25.5)
+                    .color(Some(Color::Rgba(0.1, 0.1, 0.1, 0.8)))
+                    .position_ingame(ingame_pos)
+                    .set(back_id, ui_widgets);
 
                 // % HP Filling
                 Image::new(self.imgs.enemy_bar)
-                    .w_h(72.9 * (hp_percentage / 100.0) * BARSIZE, 5.9 * BARSIZE)
+                    .w_h(73.0 * (hp_percentage / 100.0) * BARSIZE, 6.0 * BARSIZE)
                     .x_y(
                         (4.5 + (hp_percentage / 100.0 * 36.45 - 36.45)) * BARSIZE,
-                        MANA_BAR_Y + 9.0,
+                        MANA_BAR_Y + 7.5,
                     )
                     .color(Some(if hp_percentage <= 25.0 {
                         crit_hp_color
@@ -722,13 +731,13 @@ impl Hud {
                 // % Mana Filling
                 Rectangle::fill_with(
                     [
-                        73.0 * (energy.current() as f64 / energy.maximum() as f64) * BARSIZE,
+                        72.0 * (energy.current() as f64 / energy.maximum() as f64) * BARSIZE,
                         MANA_BAR_HEIGHT,
                     ],
                     MANA_COLOR,
                 )
                 .x_y(
-                    ((4.5 + (energy_percentage / 100.0 * 36.5)) - 36.45) * BARSIZE,
+                    ((3.5 + (energy_percentage / 100.0 * 36.5)) - 36.45) * BARSIZE,
                     MANA_BAR_Y, //-32.0,
                 )
                 .position_ingame(ingame_pos)
@@ -807,12 +816,14 @@ impl Hud {
 
                         Text::new(&format!("{}", (hp_damage).abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(Color::Rgba(0.0, 0.0, 0.0, fade))
                             .x_y(0.0, y - 3.0)
                             .position_ingame(ingame_pos)
                             .set(sct_bg_id, ui_widgets);
                         Text::new(&format!("{}", hp_damage.abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .x_y(0.0, y)
                             .color(if hp_damage < 0 {
                                 Color::Rgba(font_col.r, font_col.g, font_col.b, fade)
@@ -853,6 +864,7 @@ impl Hud {
 
                             Text::new(&format!("{}", (floater.hp_change).abs()))
                                 .font_size(font_size)
+                                .font_id(self.fonts.cyri.conrod_id)
                                 .color(if floater.hp_change < 0 {
                                     Color::Rgba(0.0, 0.0, 0.0, fade)
                                 } else {
@@ -863,6 +875,7 @@ impl Hud {
                                 .set(sct_bg_id, ui_widgets);
                             Text::new(&format!("{}", (floater.hp_change).abs()))
                                 .font_size(font_size)
+                                .font_id(self.fonts.cyri.conrod_id)
                                 .x_y(0.0, y)
                                 .color(if floater.hp_change < 0 {
                                     Color::Rgba(font_col.r, font_col.g, font_col.b, fade)
@@ -920,6 +933,7 @@ impl Hud {
                             ((crate::ecs::sys::floater::MY_HP_SHOWTIME - timer) * 0.25) + 0.2;
                         Text::new(&format!("{}", (hp_damage).abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(if hp_damage < 0 {
                                 Color::Rgba(0.0, 0.0, 0.0, hp_fade)
                             } else {
@@ -929,6 +943,7 @@ impl Hud {
                             .set(player_sct_bg_id, ui_widgets);
                         Text::new(&format!("{}", (hp_damage).abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(if hp_damage < 0 {
                                 Color::Rgba(1.0, 0.1, 0.0, hp_fade)
                             } else {
@@ -992,11 +1007,13 @@ impl Hud {
                             + 0.2;
                         Text::new(&format!("{}", (floater.hp_change).abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(Color::Rgba(0.0, 0.0, 0.0, hp_fade))
                             .x_y(x, y - 3.0)
                             .set(player_sct_bg_id, ui_widgets);
                         Text::new(&format!("{}", (floater.hp_change).abs()))
                             .font_size(font_size)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(if floater.hp_change < 0 {
                                 Color::Rgba(1.0, 0.1, 0.0, hp_fade)
                             } else {
@@ -1047,6 +1064,7 @@ impl Hud {
 
                         Text::new(&format!("{} Exp", exp_change))
                             .font_size(font_size_xp)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(Color::Rgba(0.0, 0.0, 0.0, fade))
                             .x_y(
                                 ui_widgets.win_w * (0.5 * rand.0 as f64 - 0.25),
@@ -1055,6 +1073,7 @@ impl Hud {
                             .set(player_sct_bg_id, ui_widgets);
                         Text::new(&format!("{} Exp", exp_change))
                             .font_size(font_size_xp)
+                            .font_id(self.fonts.cyri.conrod_id)
                             .color(Color::Rgba(0.59, 0.41, 0.67, fade))
                             .x_y(
                                 ui_widgets.win_w * (0.5 * rand.0 as f64 - 0.25),
@@ -1088,6 +1107,7 @@ impl Hud {
 
                             Text::new(&format!("{} Exp", floater.exp_change))
                                 .font_size(font_size_xp)
+                                .font_id(self.fonts.cyri.conrod_id)
                                 .color(Color::Rgba(0.0, 0.0, 0.0, fade))
                                 .x_y(
                                     ui_widgets.win_w * (0.5 * floater.rand.0 as f64 - 0.25),
@@ -1096,6 +1116,7 @@ impl Hud {
                                 .set(player_sct_bg_id, ui_widgets);
                             Text::new(&format!("{} Exp", floater.exp_change))
                                 .font_size(font_size_xp)
+                                .font_id(self.fonts.cyri.conrod_id)
                                 .color(Color::Rgba(0.59, 0.41, 0.67, fade))
                                 .x_y(
                                     ui_widgets.win_w * (0.5 * floater.rand.0 as f64 - 0.25),
@@ -1168,12 +1189,14 @@ impl Hud {
 
                 // Name
                 Text::new(&name)
+                    .font_id(self.fonts.cyri.conrod_id)
                     .font_size(30)
                     .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                     .x_y(-1.0, MANA_BAR_Y + 48.0)
                     .position_ingame(ingame_pos)
                     .set(name_bg_id, ui_widgets);
                 Text::new(&name)
+                    .font_id(self.fonts.cyri.conrod_id)
                     .font_size(30)
                     .color(Color::Rgba(0.61, 0.61, 0.89, 1.0))
                     .x_y(0.0, MANA_BAR_Y + 50.0)
@@ -1194,6 +1217,7 @@ impl Hud {
                 // -5 - +5 levels around player level -> equal
                 // - 5 levels below player -> low
                 Text::new(if level_comp < 10 { &level_str } else { "?" })
+                    .font_id(self.fonts.cyri.conrod_id)
                     .font_size(if op_level > 9 && level_comp < 10 {
                         14
                     } else {
@@ -1226,7 +1250,7 @@ impl Hud {
         }
 
         // Introduction Text
-        let intro_text = &localized_strings.get("hud.welcome");
+        let intro_text = &self.voxygen_i18n.get("hud.welcome");
         if self.show.intro && !self.show.esc_menu && !self.intro_2 {
             match global_state.settings.gameplay.intro_show {
                 Intro::Show => {
@@ -1236,15 +1260,16 @@ impl Hud {
                         .set(self.ids.intro_bg, ui_widgets);
                     Text::new(intro_text)
                         .top_left_with_margins_on(self.ids.intro_bg, 10.0, 10.0)
-                        .font_size(20)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(20))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR)
                         .set(self.ids.intro_text, ui_widgets);
                     if Button::image(self.imgs.button)
                         .w_h(100.0, 50.0)
                         .mid_bottom_with_margin_on(self.ids.intro_bg, 10.0)
-                        .label(&localized_strings.get("common.close"))
-                        .label_font_size(20)
+                        .label(&self.voxygen_i18n.get("common.close"))
+                        .label_font_size(self.fonts.cyri.scale(20))
+                        .label_font_id(self.fonts.cyri.conrod_id)
                         .label_color(TEXT_COLOR)
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
@@ -1280,10 +1305,10 @@ impl Hud {
                     {
                         self.never_show = !self.never_show
                     };
-                    Text::new(&localized_strings.get("hud.do_not_show_on_startup"))
+                    Text::new(&self.voxygen_i18n.get("hud.do_not_show_on_startup"))
                         .right_from(self.ids.intro_check, 10.0)
-                        .font_size(10)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(10))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR)
                         .set(self.ids.intro_check_text, ui_widgets);
                     // X-button
@@ -1319,15 +1344,16 @@ impl Hud {
                 .set(self.ids.intro_bg, ui_widgets);
             Text::new(intro_text)
                 .top_left_with_margins_on(self.ids.intro_bg, 10.0, 10.0)
-                .font_size(20)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(20))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(self.ids.intro_text, ui_widgets);
             if Button::image(self.imgs.button)
                 .w_h(100.0, 50.0)
                 .mid_bottom_with_margin_on(self.ids.intro_bg, 10.0)
-                .label(&localized_strings.get("common.close"))
-                .label_font_size(20)
+                .label(&self.voxygen_i18n.get("common.close"))
+                .label_font_size(self.fonts.cyri.scale(20))
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_color(TEXT_COLOR)
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
@@ -1364,23 +1390,23 @@ impl Hud {
             // Alpha Version
             Text::new(&version)
                 .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(self.ids.version, ui_widgets);
             // Ticks per second
             Text::new(&format!("FPS: {:.0}", debug_info.tps))
                 .color(TEXT_COLOR)
                 .down_from(self.ids.version, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(14)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
                 .set(self.ids.fps_counter, ui_widgets);
             // Ping
             Text::new(&format!("Ping: {:.0}ms", debug_info.ping_ms))
                 .color(TEXT_COLOR)
                 .down_from(self.ids.fps_counter, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(14)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
                 .set(self.ids.ping, ui_widgets);
             // Player's position
             let coordinates_text = match debug_info.coordinates {
@@ -1393,8 +1419,8 @@ impl Hud {
             Text::new(&coordinates_text)
                 .color(TEXT_COLOR)
                 .down_from(self.ids.ping, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(14)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
                 .set(self.ids.coordinates, ui_widgets);
             // Player's velocity
             let velocity_text = match debug_info.velocity {
@@ -1410,8 +1436,8 @@ impl Hud {
             Text::new(&velocity_text)
                 .color(TEXT_COLOR)
                 .down_from(self.ids.coordinates, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(14)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
                 .set(self.ids.velocity, ui_widgets);
             // Loaded distance
             Text::new(&format!(
@@ -1421,8 +1447,8 @@ impl Hud {
             ))
             .color(TEXT_COLOR)
             .down_from(self.ids.velocity, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.loaded_distance, ui_widgets);
             // Time
             let time_in_seconds = client.state().get_time_of_day();
@@ -1437,8 +1463,8 @@ impl Hud {
             ))
             .color(TEXT_COLOR)
             .down_from(self.ids.loaded_distance, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.time, ui_widgets);
 
             // Number of entities
@@ -1446,8 +1472,8 @@ impl Hud {
             Text::new(&format!("Entity count: {}", entity_count))
                 .color(TEXT_COLOR)
                 .down_from(self.ids.time, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(14)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(14))
                 .set(self.ids.entity_count, ui_widgets);
 
             // Number of chunks
@@ -1457,8 +1483,8 @@ impl Hud {
             ))
             .color(TEXT_COLOR)
             .down_from(self.ids.entity_count, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.num_chunks, ui_widgets);
 
             // Number of figures
@@ -1468,13 +1494,14 @@ impl Hud {
             ))
             .color(TEXT_COLOR)
             .down_from(self.ids.num_chunks, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.num_figures, ui_widgets);
 
             // Help Window
             Text::new(
-                &localized_strings
+                &self
+                    .voxygen_i18n
                     .get("hud.press_key_to_toggle_keybindings_fmt")
                     .replace(
                         "{key}",
@@ -1483,12 +1510,13 @@ impl Hud {
             )
             .color(TEXT_COLOR)
             .down_from(self.ids.num_figures, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.help_info, ui_widgets);
             // Info about Debug Shortcut
             Text::new(
-                &localized_strings
+                &self
+                    .voxygen_i18n
                     .get("hud.press_key_to_toggle_debug_info_fmt")
                     .replace(
                         "{key}",
@@ -1497,13 +1525,14 @@ impl Hud {
             )
             .color(TEXT_COLOR)
             .down_from(self.ids.help_info, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.debug_info, ui_widgets);
         } else {
             // Help Window
             Text::new(
-                &localized_strings
+                &self
+                    .voxygen_i18n
                     .get("hud.press_key_to_show_keybindings_fmt")
                     .replace(
                         "{key}",
@@ -1512,12 +1541,13 @@ impl Hud {
             )
             .color(TEXT_COLOR)
             .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(16)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(16))
             .set(self.ids.help_info, ui_widgets);
             // Info about Debug Shortcut
             Text::new(
-                &localized_strings
+                &self
+                    .voxygen_i18n
                     .get("hud.press_key_to_show_debug_info_fmt")
                     .replace(
                         "{key}",
@@ -1526,8 +1556,8 @@ impl Hud {
             )
             .color(TEXT_COLOR)
             .down_from(self.ids.help_info, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(12)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(12))
             .set(self.ids.debug_info, ui_widgets);
         }
 
@@ -1542,8 +1572,9 @@ impl Hud {
                 .w_h(120.0, 50.0)
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
-                .label(&localized_strings.get("hud.show_tips"))
-                .label_font_size(20)
+                .label(&self.voxygen_i18n.get("hud.show_tips"))
+                .label_font_size(self.fonts.cyri.scale(20))
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .label_color(TEXT_COLOR)
                 .mid_bottom_with_margin_on(self.ids.help, 20.0)
                 .set(self.ids.button_help3, ui_widgets)
@@ -1687,7 +1718,7 @@ impl Hud {
                 &self.show,
                 &self.imgs,
                 &self.fonts,
-                &localized_strings,
+                &self.voxygen_i18n,
             )
             .set(self.ids.settings_window, ui_widgets)
             {
@@ -1704,7 +1735,14 @@ impl Hud {
                     settings_window::Event::ToggleHelp => self.show.help = !self.show.help,
                     settings_window::Event::ToggleDebug => self.show.debug = !self.show.debug,
                     settings_window::Event::ChangeTab(tab) => self.show.open_setting_tab(tab),
-                    settings_window::Event::Close => self.show.settings(false),
+                    settings_window::Event::Close => {
+                        // Unpause the game if we are on singleplayer so that we can logout
+                        if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                            singleplayer.pause(false);
+                        };
+
+                        self.show.settings(false)
+                    },
                     settings_window::Event::AdjustMousePan(sensitivity) => {
                         events.push(Event::AdjustMousePan(sensitivity));
                     },
@@ -1759,6 +1797,9 @@ impl Hud {
                     settings_window::Event::AdjustFOV(new_fov) => {
                         events.push(Event::ChangeFOV(new_fov));
                     },
+                    settings_window::Event::AdjustGamma(new_gamma) => {
+                        events.push(Event::ChangeGamma(new_gamma));
+                    },
                     settings_window::Event::ChangeAaMode(new_aa_mode) => {
                         events.push(Event::ChangeAaMode(new_aa_mode));
                     },
@@ -1788,7 +1829,7 @@ impl Hud {
                 client,
                 &self.imgs,
                 &self.fonts,
-                &localized_strings,
+                &self.voxygen_i18n,
             )
             .set(self.ids.social_window, ui_widgets)
             {
@@ -1811,7 +1852,7 @@ impl Hud {
                 &player_stats,
                 &self.imgs,
                 &self.fonts,
-                &localized_strings,
+                &self.voxygen_i18n,
             )
             .set(self.ids.character_window, ui_widgets)
             {
@@ -1830,7 +1871,7 @@ impl Hud {
                 client,
                 &self.imgs,
                 &self.fonts,
-                &localized_strings,
+                &self.voxygen_i18n,
             )
             .set(self.ids.spell, ui_widgets)
             {
@@ -1849,7 +1890,7 @@ impl Hud {
                 client,
                 &self.imgs,
                 &self.fonts,
-                &localized_strings,
+                &self.voxygen_i18n,
             )
             .set(self.ids.quest, ui_widgets)
             {
@@ -1883,7 +1924,7 @@ impl Hud {
         }
 
         if self.show.esc_menu {
-            match EscMenu::new(&self.imgs, &self.fonts, &localized_strings)
+            match EscMenu::new(&self.imgs, &self.fonts, &self.voxygen_i18n)
                 .set(self.ids.esc_menu, ui_widgets)
             {
                 Some(esc_menu::Event::OpenSettings(tab)) => {
@@ -1893,12 +1934,29 @@ impl Hud {
                     self.show.esc_menu = false;
                     self.show.want_grab = false;
                     self.force_ungrab = true;
+
+                    // Unpause the game if we are on singleplayer
+                    if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                        singleplayer.pause(false);
+                    };
                 },
                 Some(esc_menu::Event::Logout) => {
+                    // Unpause the game if we are on singleplayer so that we can logout
+                    if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                        singleplayer.pause(false);
+                    };
+
                     events.push(Event::Logout);
                 },
                 Some(esc_menu::Event::Quit) => events.push(Event::Quit),
-                Some(esc_menu::Event::CharacterSelection) => events.push(Event::CharacterSelection),
+                Some(esc_menu::Event::CharacterSelection) => {
+                    // Unpause the game if we are on singleplayer so that we can logout
+                    if let Some(singleplayer) = global_state.singleplayer.as_ref() {
+                        singleplayer.pause(false);
+                    };
+
+                    events.push(Event::CharacterSelection)
+                },
                 None => {},
             }
         }
@@ -1968,7 +2026,7 @@ impl Hud {
                     self.ui.focus_widget(None);
                 } else {
                     // Close windows on esc
-                    self.show.toggle_windows();
+                    self.show.toggle_windows(global_state);
                 }
                 true
             },
@@ -2054,9 +2112,13 @@ impl Hud {
             self.ui.focus_widget(maybe_id);
         }
         let events = self.update_layout(client, global_state, debug_info, dt);
-        let (v_mat, p_mat, _) = camera.compute_dependents(client);
-        self.ui
-            .maintain(&mut global_state.window.renderer_mut(), Some(p_mat * v_mat));
+        let camera::Dependents {
+            view_mat, proj_mat, ..
+        } = camera.dependents();
+        self.ui.maintain(
+            &mut global_state.window.renderer_mut(),
+            Some(proj_mat * view_mat),
+        );
 
         // Check if item images need to be reloaded
         self.item_imgs.reload_if_changed(&mut self.ui);
diff --git a/voxygen/src/hud/quest.rs b/voxygen/src/hud/quest.rs
index 094c52629b..795abfd475 100644
--- a/voxygen/src/hud/quest.rs
+++ b/voxygen/src/hud/quest.rs
@@ -1,5 +1,5 @@
-use super::{img_ids::Imgs, Fonts, Show, TEXT_COLOR};
-use crate::i18n::VoxygenLocalization;
+use super::{img_ids::Imgs, Show, TEXT_COLOR};
+use crate::{i18n::VoxygenLocalization, ui::fonts::ConrodVoxygenFonts};
 use client::{self, Client};
 use conrod_core::{
     color,
@@ -23,7 +23,7 @@ pub struct Quest<'a> {
     _client: &'a Client,
 
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
@@ -34,7 +34,7 @@ impl<'a> Quest<'a> {
         show: &'a Show,
         _client: &'a Client,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
@@ -98,8 +98,8 @@ impl<'a> Widget for Quest<'a> {
         // TODO: Use an actual character name.
         Text::new(&self.localized_strings.get("hud.quests"))
             .mid_top_with_margin_on(state.quest_frame, 6.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .color(TEXT_COLOR)
             .set(state.quest_title, ui);
 
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index 66f6f56675..1c63978804 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -1,11 +1,11 @@
 use super::{
-    img_ids::Imgs, BarNumbers, CrosshairType, Fonts, Intro, ShortcutNumbers, Show, XpBar, MENU_BG,
+    img_ids::Imgs, BarNumbers, CrosshairType, Intro, ShortcutNumbers, Show, XpBar, MENU_BG,
     TEXT_COLOR,
 };
 use crate::{
     i18n::{list_localizations, LanguageMetadata, VoxygenLocalization},
     render::{AaMode, CloudMode, FluidMode},
-    ui::{ImageSlider, ScaleMode, ToggleButton},
+    ui::{fonts::ConrodVoxygenFonts, ImageSlider, ScaleMode, ToggleButton},
     GlobalState,
 };
 use conrod_core::{
@@ -89,6 +89,9 @@ widget_ids! {
         fov_slider,
         fov_text,
         fov_value,
+        gamma_slider,
+        gamma_text,
+        gamma_value,
         aa_mode_text,
         aa_mode_list,
         cloud_mode_text,
@@ -155,7 +158,7 @@ pub struct SettingsWindow<'a> {
     global_state: &'a GlobalState,
     show: &'a Show,
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
@@ -166,7 +169,7 @@ impl<'a> SettingsWindow<'a> {
         global_state: &'a GlobalState,
         show: &'a Show,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
@@ -199,6 +202,7 @@ pub enum Event {
     ToggleMouseYInvert(bool),
     AdjustViewDistance(u32),
     AdjustFOV(u16),
+    AdjustGamma(f32),
     AdjustWindowSize([u16; 2]),
     ToggleFullscreen,
     ChangeAaMode(AaMode),
@@ -288,7 +292,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         // Title
         Text::new(&self.localized_strings.get("common.settings"))
             .mid_top_with_margin_on(state.ids.settings_bg, 5.0)
-            .font_size(14)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.settings_title, ui);
 
@@ -311,7 +316,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         })
         .top_left_with_margins_on(state.ids.settings_l, 8.0 * 4.0, 2.0 * 4.0)
         .label(&self.localized_strings.get("common.interface"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .label_color(TEXT_COLOR)
         .set(state.ids.interface, ui)
         .was_clicked()
@@ -328,8 +334,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&self.localized_strings.get("hud.settings.general"))
                 .top_left_with_margins_on(state.ids.settings_content, 5.0, 5.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.general_txt, ui);
 
@@ -351,8 +357,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&self.localized_strings.get("hud.settings.help_window"))
                 .right_from(state.ids.button_help, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.button_help)
                 .color(TEXT_COLOR)
                 .set(state.ids.show_help_label, ui);
@@ -375,8 +381,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&self.localized_strings.get("hud.settings.debug_info"))
                 .right_from(state.ids.debug_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.debug_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.debug_button_label, ui);
@@ -402,8 +408,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             };
             Text::new(&self.localized_strings.get("hud.settings.tips_on_startup"))
                 .right_from(state.ids.tips_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.button_help)
                 .color(TEXT_COLOR)
                 .set(state.ids.tips_button_label, ui);
@@ -411,8 +417,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             // Ui Scale
             Text::new(&self.localized_strings.get("hud.settings.ui_scale"))
                 .down_from(state.ids.tips_button, 20.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.ui_scale_label, ui);
 
@@ -445,8 +451,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(self.localized_strings.get("hud.settings.relative_scaling"))
                 .right_from(state.ids.relative_to_win_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.relative_to_win_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.relative_to_win_text, ui);
@@ -480,8 +486,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(self.localized_strings.get("hud.settings.custom_scaling"))
                 .right_from(state.ids.absolute_scale_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.absolute_scale_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.absolute_scale_text, ui);
@@ -507,8 +513,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                 // Custom Scaling Text
                 Text::new(&format!("{:.2}", scale))
                     .right_from(state.ids.ui_scale_slider, 10.0)
-                    .font_size(14)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(14))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(state.ids.ui_scale_value, ui);
             } else {
@@ -657,14 +663,14 @@ impl<'a> Widget for SettingsWindow<'a> {
             // Crosshair Transparency Text and Slider
             Text::new(&self.localized_strings.get("hud.settings.crosshair"))
                 .down_from(state.ids.absolute_scale_button, 20.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.ch_title, ui);
             Text::new(&self.localized_strings.get("hud.settings.transparency"))
                 .right_from(state.ids.ch_3_bg, 20.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.ch_transp_text, ui);
 
@@ -687,17 +693,17 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&format!("{:.2}", crosshair_transp,))
                 .right_from(state.ids.ch_transp_slider, 8.0)
-                .font_size(14)
+                .font_size(self.fonts.cyri.scale(14))
                 .graphics_for(state.ids.ch_transp_slider)
-                .font_id(self.fonts.cyri)
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.ch_transp_value, ui);
 
             // Hotbar text
             Text::new(&self.localized_strings.get("hud.settings.hotbar"))
                 .down_from(state.ids.ch_1_bg, 20.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.hotbar_title, ui);
             // Show xp bar
@@ -729,8 +735,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.toggle_bar_experience"),
             )
             .right_from(state.ids.show_xpbar_button, 10.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .graphics_for(state.ids.show_xpbar_button)
             .color(TEXT_COLOR)
             .set(state.ids.show_xpbar_text, ui);
@@ -763,8 +769,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             }
             Text::new(&self.localized_strings.get("hud.settings.toggle_shortcuts"))
                 .right_from(state.ids.show_shortcuts_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.show_shortcuts_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.show_shortcuts_text, ui);
@@ -792,8 +798,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.scrolling_combat_text"),
             )
             .top_left_with_margins_on(state.ids.settings_content_r, 5.0, 5.0)
-            .font_size(18)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(18))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.sct_title, ui);
             // Generally toggle the SCT
@@ -817,8 +823,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.scrolling_combat_text"),
             )
             .right_from(state.ids.sct_show_radio, 10.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .graphics_for(state.ids.sct_show_radio)
             .color(TEXT_COLOR)
             .set(state.ids.sct_show_text, ui);
@@ -841,8 +847,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                         .get("hud.settings.single_damage_number"),
                 )
                 .right_from(state.ids.sct_single_dmg_radio, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.sct_single_dmg_radio)
                 .color(TEXT_COLOR)
                 .set(state.ids.sct_single_dmg_text, ui);
@@ -865,8 +871,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                 }
                 Text::new(&self.localized_strings.get("hud.settings.cumulated_damage"))
                     .right_from(state.ids.sct_show_batch_radio, 10.0)
-                    .font_size(14)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(14))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .graphics_for(state.ids.sct_batched_dmg_radio)
                     .color(TEXT_COLOR)
                     .set(state.ids.sct_show_batch_text, ui);
@@ -884,8 +890,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
                 Text::new(&self.localized_strings.get("hud.settings.incoming_damage"))
                     .right_from(state.ids.sct_inc_dmg_radio, 10.0)
-                    .font_size(14)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(14))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .graphics_for(state.ids.sct_inc_dmg_radio)
                     .color(TEXT_COLOR)
                     .set(state.ids.sct_inc_dmg_text, ui);
@@ -912,8 +918,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                         .get("hud.settings.cumulated_incoming_damage"),
                 )
                 .right_from(state.ids.sct_batch_inc_radio, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.sct_batch_inc_radio)
                 .color(TEXT_COLOR)
                 .set(state.ids.sct_batch_inc_text, ui);
@@ -930,8 +936,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     },
                     20.0,
                 )
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.bar_numbers_title, ui);
 
@@ -960,8 +966,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             }
             Text::new(&self.localized_strings.get("hud.settings.none"))
                 .right_from(state.ids.show_bar_numbers_none_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.show_bar_numbers_none_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.show_bar_numbers_none_text, ui);
@@ -991,8 +997,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             }
             Text::new(&self.localized_strings.get("hud.settings.values"))
                 .right_from(state.ids.show_bar_numbers_values_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.show_bar_numbers_values_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.show_bar_numbers_values_text, ui);
@@ -1022,8 +1028,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             }
             Text::new(&self.localized_strings.get("hud.settings.percentages"))
                 .right_from(state.ids.show_bar_numbers_percentage_button, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .graphics_for(state.ids.show_bar_numbers_percentage_button)
                 .color(TEXT_COLOR)
                 .set(state.ids.show_bar_numbers_percentage_text, ui);
@@ -1031,8 +1037,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             // Chat Transp
             Text::new(&self.localized_strings.get("hud.settings.chat"))
                 .down_from(state.ids.show_bar_numbers_percentage_button, 20.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.chat_transp_title, ui);
             Text::new(
@@ -1041,8 +1047,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.background_transparency"),
             )
             .right_from(state.ids.chat_transp_slider, 20.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.chat_transp_text, ui);
 
@@ -1065,8 +1071,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&self.localized_strings.get("common.languages"))
                 .down_from(state.ids.chat_transp_slider, 20.0)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.language_text, ui);
 
@@ -1085,7 +1091,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .w_h(200.0, 22.0)
                 .color(MENU_BG)
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.cyri)
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .set(state.ids.languages_list, ui)
             {
                 events.push(Event::ChangeLanguage(language_list[clicked].to_owned()));
@@ -1111,7 +1117,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         })
         .right_from(state.ids.interface, 0.0)
         .label(&self.localized_strings.get("common.gameplay"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .label_color(TEXT_COLOR)
         .set(state.ids.gameplay, ui)
         .was_clicked()
@@ -1127,8 +1134,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             // Mouse Pan Sensitivity
             Text::new(&self.localized_strings.get("hud.settings.pan_sensitivity"))
                 .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.mouse_pan_label, ui);
 
@@ -1151,16 +1158,16 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&format!("{}", display_pan))
                 .right_from(state.ids.mouse_pan_slider, 8.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.mouse_pan_value, ui);
 
             // Mouse Zoom Sensitivity
             Text::new(&self.localized_strings.get("hud.settings.zoom_sensitivity"))
                 .down_from(state.ids.mouse_pan_slider, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.mouse_zoom_label, ui);
 
@@ -1183,8 +1190,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&format!("{}", display_zoom))
                 .right_from(state.ids.mouse_zoom_slider, 8.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.mouse_zoom_value, ui);
 
@@ -1212,8 +1219,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.invert_scroll_zoom"),
             )
             .right_from(state.ids.mouse_zoom_invert_button, 10.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .graphics_for(state.ids.mouse_zoom_invert_button)
             .color(TEXT_COLOR)
             .set(state.ids.mouse_zoom_invert_label, ui);
@@ -1242,8 +1249,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.invert_mouse_y_axis"),
             )
             .right_from(state.ids.mouse_y_invert_button, 10.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .graphics_for(state.ids.mouse_y_invert_button)
             .color(TEXT_COLOR)
             .set(state.ids.mouse_y_invert_label, ui);
@@ -1268,7 +1275,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         })
         .right_from(state.ids.gameplay, 0.0)
         .label(&self.localized_strings.get("common.controls"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .label_color(TEXT_COLOR)
         .set(state.ids.controls, ui)
         .was_clicked()
@@ -1282,8 +1290,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             Text::new(&self.localized_strings.get("hud.settings.control_names"))
                 .color(TEXT_COLOR)
                 .top_left_with_margins_on(state.ids.settings_content, 5.0, 5.0)
-                .font_id(self.fonts.cyri)
-                .font_size(18)
+                .font_id(self.fonts.cyri.conrod_id)
+                .font_size(self.fonts.cyri.scale(18))
                 .set(state.ids.controls_text, ui);
             // TODO: Replace with buttons that show actual keybinds and allow the user to
             // change them.
@@ -1412,8 +1420,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             ))
             .color(TEXT_COLOR)
             .right_from(state.ids.controls_text, 0.0)
-            .font_id(self.fonts.cyri)
-            .font_size(18)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(18))
             .set(state.ids.controls_controls, ui);
         }
 
@@ -1437,7 +1445,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         .right_from(state.ids.controls, 0.0)
         .label(&self.localized_strings.get("common.video"))
         .parent(state.ids.settings_r)
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .label_color(TEXT_COLOR)
         .set(state.ids.video, ui)
         .was_clicked()
@@ -1450,8 +1459,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             // View Distance
             Text::new(&self.localized_strings.get("hud.settings.view_distance"))
                 .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.vd_text, ui);
 
@@ -1477,16 +1486,16 @@ impl<'a> Widget for SettingsWindow<'a> {
                 self.global_state.settings.graphics.view_distance
             ))
             .right_from(state.ids.vd_slider, 8.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.vd_value, ui);
 
             // Max FPS
             Text::new(&self.localized_strings.get("hud.settings.maximum_fps"))
                 .down_from(state.ids.vd_slider, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.max_fps_text, ui);
 
@@ -1512,16 +1521,16 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&format!("{}", self.global_state.settings.graphics.max_fps))
                 .right_from(state.ids.max_fps_slider, 8.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.max_fps_value, ui);
 
             // FOV
             Text::new(&self.localized_strings.get("hud.settings.fov"))
                 .down_from(state.ids.max_fps_slider, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.fov_text, ui);
 
@@ -1544,16 +1553,48 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             Text::new(&format!("{}", self.global_state.settings.graphics.fov))
                 .right_from(state.ids.fov_slider, 8.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.fov_value, ui);
 
+            // Gamma
+            Text::new(&self.localized_strings.get("hud.settings.gamma"))
+                .down_from(state.ids.fov_slider, 10.0)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
+                .color(TEXT_COLOR)
+                .set(state.ids.gamma_text, ui);
+
+            if let Some(new_val) = ImageSlider::discrete(
+                (self.global_state.settings.graphics.gamma.log2() * 8.0).round() as i32,
+                8,
+                -8,
+                self.imgs.slider_indicator,
+                self.imgs.slider,
+            )
+            .w_h(104.0, 22.0)
+            .down_from(state.ids.gamma_text, 8.0)
+            .track_breadth(12.0)
+            .slider_length(10.0)
+            .pad_track((5.0, 5.0))
+            .set(state.ids.gamma_slider, ui)
+            {
+                events.push(Event::AdjustGamma(2.0f32.powf(new_val as f32 / 8.0)));
+            }
+
+            Text::new(&format!("{}", self.global_state.settings.graphics.gamma))
+                .right_from(state.ids.gamma_slider, 8.0)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
+                .color(TEXT_COLOR)
+                .set(state.ids.gamma_value, ui);
+
             // AaMode
             Text::new(&self.localized_strings.get("hud.settings.antialiasing_mode"))
-                .down_from(state.ids.fov_slider, 8.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .down_from(state.ids.gamma_slider, 8.0)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.aa_mode_text, ui);
 
@@ -1583,7 +1624,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .w_h(400.0, 22.0)
                 .color(MENU_BG)
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.cyri)
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .down_from(state.ids.aa_mode_text, 8.0)
                 .set(state.ids.aa_mode_list, ui)
             {
@@ -1597,8 +1638,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.cloud_rendering_mode"),
             )
             .down_from(state.ids.aa_mode_list, 8.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.cloud_mode_text, ui);
 
@@ -1619,7 +1660,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .w_h(400.0, 22.0)
                 .color(MENU_BG)
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.cyri)
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .down_from(state.ids.cloud_mode_text, 8.0)
                 .set(state.ids.cloud_mode_list, ui)
             {
@@ -1633,8 +1674,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.fluid_rendering_mode"),
             )
             .down_from(state.ids.cloud_mode_list, 8.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.fluid_mode_text, ui);
 
@@ -1657,7 +1698,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .w_h(400.0, 22.0)
                 .color(MENU_BG)
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.cyri)
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .down_from(state.ids.fluid_mode_text, 8.0)
                 .set(state.ids.fluid_mode_list, ui)
             {
@@ -1666,8 +1707,8 @@ impl<'a> Widget for SettingsWindow<'a> {
 
             // Fullscreen
             Text::new(&self.localized_strings.get("hud.settings.fullscreen"))
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .down_from(state.ids.fluid_mode_list, 8.0)
                 .color(TEXT_COLOR)
                 .set(state.ids.fullscreen_label, ui);
@@ -1694,9 +1735,9 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .press_image(self.imgs.settings_button_press)
                 .down_from(state.ids.fullscreen_label, 12.0)
                 .label(&self.localized_strings.get("hud.settings.save_window_size"))
-                .label_font_size(14)
+                .label_font_size(self.fonts.cyri.scale(14))
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.cyri)
+                .label_font_id(self.fonts.cyri.conrod_id)
                 .set(state.ids.save_window_size_button, ui)
                 .was_clicked()
             {
@@ -1730,7 +1771,8 @@ impl<'a> Widget for SettingsWindow<'a> {
         .right_from(state.ids.video, 0.0)
         .parent(state.ids.settings_r)
         .label(&self.localized_strings.get("common.sound"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .label_color(TEXT_COLOR)
         .set(state.ids.sound, ui)
         .was_clicked()
@@ -1743,8 +1785,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             // Music Volume -----------------------------------------------------
             Text::new(&self.localized_strings.get("hud.settings.music_volume"))
                 .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.audio_volume_text, ui);
 
@@ -1772,8 +1814,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                     .get("hud.settings.sound_effect_volume"),
             )
             .down_from(state.ids.audio_volume_slider, 10.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.sfx_volume_text, ui);
 
@@ -1799,8 +1841,8 @@ impl<'a> Widget for SettingsWindow<'a> {
             let device_list = &self.global_state.audio.device_list;
             Text::new(&self.localized_strings.get("hud.settings.audio_device"))
                 .down_from(state.ids.sfx_volume_slider, 10.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.audio_device_text, ui);
 
@@ -1811,7 +1853,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .w_h(400.0, 22.0)
                 .color(MENU_BG)
                 .label_color(TEXT_COLOR)
-                .label_font_id(self.fonts.opensans)
+                .label_font_id(self.fonts.opensans.conrod_id)
                 .down_from(state.ids.audio_device_text, 10.0)
                 .set(state.ids.audio_device_list, ui)
             {
diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs
index 114f1137f8..91781e43eb 100644
--- a/voxygen/src/hud/skillbar.rs
+++ b/voxygen/src/hud/skillbar.rs
@@ -1,9 +1,10 @@
 use super::{
-    img_ids::Imgs, BarNumbers, Fonts, ShortcutNumbers, XpBar, CRITICAL_HP_COLOR, HP_COLOR,
-    LOW_HP_COLOR, MANA_COLOR, TEXT_COLOR, XP_COLOR,
+    img_ids::Imgs, BarNumbers, ShortcutNumbers, XpBar, CRITICAL_HP_COLOR, HP_COLOR, LOW_HP_COLOR,
+    MANA_COLOR, TEXT_COLOR, XP_COLOR,
 };
 use crate::{
     i18n::{i18n_asset_key, VoxygenLocalization},
+    ui::fonts::ConrodVoxygenFonts,
     GlobalState,
 };
 use common::{
@@ -108,7 +109,7 @@ pub enum ResourceType {
 pub struct Skillbar<'a> {
     global_state: &'a GlobalState,
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     stats: &'a Stats,
     energy: &'a Energy,
     character_state: &'a CharacterState,
@@ -123,7 +124,7 @@ impl<'a> Skillbar<'a> {
     pub fn new(
         global_state: &'a GlobalState,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         stats: &'a Stats,
         energy: &'a Energy,
         character_state: &'a CharacterState,
@@ -264,14 +265,14 @@ impl<'a> Widget for Skillbar<'a> {
             .replace("{level_nb}", &self.stats.level.level().to_string());
         Text::new(&level_up_text)
             .middle_of(state.ids.level_align)
-            .font_size(30)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(30))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(Color::Rgba(0.0, 0.0, 0.0, fade_level))
             .set(state.ids.level_message_bg, ui);
         Text::new(&level_up_text)
             .bottom_left_with_margins_on(state.ids.level_message_bg, 2.0, 2.0)
-            .font_size(30)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(30))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(Color::Rgba(1.0, 1.0, 1.0, fade_level))
             .set(state.ids.level_message, ui);
         Image::new(self.imgs.level_up)
@@ -290,8 +291,8 @@ impl<'a> Widget for Skillbar<'a> {
         if self.stats.is_dead {
             Text::new(&localized_strings.get("hud.you_died"))
                 .middle_of(ui.window)
-                .font_size(50)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(50))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.death_message_1_bg, ui);
             Text::new(&localized_strings.get("hud.press_key_to_respawn").replace(
@@ -299,14 +300,14 @@ impl<'a> Widget for Skillbar<'a> {
                 &format!("{:?}", self.global_state.settings.controls.respawn),
             ))
             .mid_bottom_with_margin_on(state.ids.death_message_1_bg, -120.0)
-            .font_size(30)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(30))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
             .set(state.ids.death_message_2_bg, ui);
             Text::new(&localized_strings.get("hud.you_died"))
                 .bottom_left_with_margins_on(state.ids.death_message_1_bg, 2.0, 2.0)
-                .font_size(50)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(50))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(CRITICAL_HP_COLOR)
                 .set(state.ids.death_message_1, ui);
             Text::new(&localized_strings.get("hud.press_key_to_respawn").replace(
@@ -314,7 +315,8 @@ impl<'a> Widget for Skillbar<'a> {
                 &format!("{:?}", self.global_state.settings.controls.respawn),
             ))
             .bottom_left_with_margins_on(state.ids.death_message_2_bg, 2.0, 2.0)
-            .font_size(30)
+            .font_size(self.fonts.cyri.scale(30))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(CRITICAL_HP_COLOR)
             .set(state.ids.death_message_2, ui);
         }
@@ -347,8 +349,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             4.0 * scale,
                         )
-                        .font_size(10)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(10))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -357,8 +359,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             4.0 * scale,
                         )
-                        .font_size(10)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(10))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.next_level_text, ui);
                 } else if self.stats.level.level() < 100 {
@@ -369,8 +371,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             3.0 * scale,
                         )
-                        .font_size(9)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(9))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -379,8 +381,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             3.0 * scale,
                         )
-                        .font_size(9)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(9))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.next_level_text, ui);
                 } else {
@@ -391,8 +393,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             2.5 * scale,
                         )
-                        .font_size(8)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(8))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -401,8 +403,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.5 * scale,
                             2.5 * scale,
                         )
-                        .font_size(8)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(8))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         .set(state.ids.next_level_text, ui);
                 }
@@ -472,8 +474,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             4.0 * scale * 1.5,
                         )
-                        .font_size(17)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(17))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -482,8 +484,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             4.0 * scale * 1.5,
                         )
-                        .font_size(15)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(15))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.next_level_text, ui);
                 } else if self.stats.level.level() < 100 {
@@ -494,8 +496,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             3.0 * scale * 1.5,
                         )
-                        .font_size(15)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(15))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -504,8 +506,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             3.0 * scale * 1.5,
                         )
-                        .font_size(15)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(15))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.next_level_text, ui);
                 } else {
@@ -516,8 +518,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             2.75 * scale * 1.5,
                         )
-                        .font_size(12)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(12))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.level_text, ui);
                     Text::new(&next_level)
@@ -526,8 +528,8 @@ impl<'a> Widget for Skillbar<'a> {
                             3.0 * scale * 1.5,
                             2.75 * scale * 1.5,
                         )
-                        .font_size(12)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(12))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
                         .set(state.ids.next_level_text, ui);
                 }
@@ -849,74 +851,74 @@ impl<'a> Widget for Skillbar<'a> {
         if let ShortcutNumbers::On = shortcuts {
             Text::new("1")
                 .top_right_with_margins_on(state.ids.slot1_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot1_text, ui);
             Text::new("2")
                 .top_right_with_margins_on(state.ids.slot2_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot2_text, ui);
             Text::new("3")
                 .top_right_with_margins_on(state.ids.slot3_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot3_text, ui);
             Text::new("4")
                 .top_right_with_margins_on(state.ids.slot4_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot4_text, ui);
             Text::new("5")
                 .top_right_with_margins_on(state.ids.slot5_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot5_text, ui);
             Text::new("M1")
                 .top_left_with_margins_on(state.ids.m1_slot, 5.0, 5.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.m1_text, ui);
             Text::new("M2")
                 .top_right_with_margins_on(state.ids.m2_slot, 5.0, 5.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.m2_text, ui);
             Text::new("6")
                 .top_left_with_margins_on(state.ids.slot6_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot6_text, ui);
             Text::new("7")
                 .top_left_with_margins_on(state.ids.slot7_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot7_text, ui);
             Text::new("8")
                 .top_left_with_margins_on(state.ids.slot8_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot8_text, ui);
             Text::new("9")
                 .top_left_with_margins_on(state.ids.slot9_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slot9_text, ui);
             Text::new("Q")
                 .top_left_with_margins_on(state.ids.slotq_bg, 1.0, 1.0)
-                .font_size(8)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(8))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.slotq_text, ui);
         };
@@ -961,14 +963,14 @@ impl<'a> Widget for Skillbar<'a> {
             );
             Text::new(&hp_text)
                 .mid_top_with_margin_on(state.ids.healthbar_bg, 6.0 * scale)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.health_text_bg, ui);
             Text::new(&hp_text)
                 .bottom_left_with_margins_on(state.ids.health_text_bg, 2.0, 2.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.health_text, ui);
             let energy_text = format!(
@@ -979,14 +981,14 @@ impl<'a> Widget for Skillbar<'a> {
             );
             Text::new(&energy_text)
                 .mid_top_with_margin_on(state.ids.energybar_bg, 6.0 * scale)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.energy_text_bg, ui);
             Text::new(&energy_text)
                 .bottom_left_with_margins_on(state.ids.energy_text_bg, 2.0, 2.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.energy_text, ui);
         }
@@ -995,27 +997,27 @@ impl<'a> Widget for Skillbar<'a> {
             let hp_text = format!("{}%", hp_percentage as u32);
             Text::new(&hp_text)
                 .mid_top_with_margin_on(state.ids.healthbar_bg, 6.0 * scale)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.health_text_bg, ui);
             Text::new(&hp_text)
                 .bottom_left_with_margins_on(state.ids.health_text_bg, 2.0, 2.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.health_text, ui);
             let energy_text = format!("{}%", energy_percentage as u32);
             Text::new(&energy_text)
                 .mid_top_with_margin_on(state.ids.energybar_bg, 6.0 * scale)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.energy_text_bg, ui);
             Text::new(&energy_text)
                 .bottom_left_with_margins_on(state.ids.energy_text_bg, 2.0, 2.0)
-                .font_size(14)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR)
                 .set(state.ids.energy_text, ui);
         }
diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs
index 641172b128..fb57e8523e 100644
--- a/voxygen/src/hud/social.rs
+++ b/voxygen/src/hud/social.rs
@@ -1,6 +1,6 @@
-use super::{img_ids::Imgs, Fonts, Show, TEXT_COLOR, TEXT_COLOR_3};
+use super::{img_ids::Imgs, Show, TEXT_COLOR, TEXT_COLOR_3};
 
-use crate::i18n::VoxygenLocalization;
+use crate::{i18n::VoxygenLocalization, ui::fonts::ConrodVoxygenFonts};
 use client::{self, Client};
 use conrod_core::{
     color,
@@ -39,7 +39,7 @@ pub struct Social<'a> {
     show: &'a Show,
     client: &'a Client,
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
 
     #[conrod(common_builder)]
@@ -51,7 +51,7 @@ impl<'a> Social<'a> {
         show: &'a Show,
         client: &'a Client,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
@@ -115,8 +115,8 @@ impl<'a> Widget for Social<'a> {
         // Title
         Text::new(&self.localized_strings.get("hud.social"))
             .mid_top_with_margin_on(ids.social_frame, 6.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .color(TEXT_COLOR)
             .set(ids.social_title, ui);
 
@@ -160,7 +160,8 @@ impl<'a> Widget for Social<'a> {
         })
         .top_left_with_margins_on(ids.align, 4.0, 0.0)
         .label(&self.localized_strings.get("hud.social.online"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .parent(ids.frame)
         .label_color(TEXT_COLOR)
         .set(ids.online_tab, ui)
@@ -191,15 +192,15 @@ impl<'a> Widget for Social<'a> {
                     .replace("{nb_player}", &format!("{:?}", count)),
             )
             .top_left_with_margins_on(ids.content_align, -2.0, 7.0)
-            .font_size(14)
-            .font_id(self.fonts.cyri)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(ids.online_title, ui);
             for (i, (_, player_alias)) in self.client.player_list.iter().enumerate() {
                 Text::new(player_alias)
                     .down(3.0)
-                    .font_size(15)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(15))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(ids.player_names[i], ui);
             }
@@ -225,7 +226,8 @@ impl<'a> Widget for Social<'a> {
         })
         .right_from(ids.online_tab, 0.0)
         .label(&self.localized_strings.get("hud.social.friends"))
-        .label_font_size(14)
+        .label_font_size(self.fonts.cyri.scale(14))
+        .label_font_id(self.fonts.cyri.conrod_id)
         .parent(ids.frame)
         .label_color(TEXT_COLOR_3)
         .set(ids.friends_tab, ui)
@@ -239,8 +241,8 @@ impl<'a> Widget for Social<'a> {
         if let SocialTab::Friends = self.show.social_tab {
             Text::new(&self.localized_strings.get("hud.social.not_yet_available"))
                 .middle_of(ids.content_align)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR_3)
                 .set(ids.friends_test, ui);
         }
@@ -256,7 +258,8 @@ impl<'a> Widget for Social<'a> {
             .right_from(ids.friends_tab, 0.0)
             .label(&self.localized_strings.get("hud.social.faction"))
             .parent(ids.frame)
-            .label_font_size(14)
+            .label_font_size(self.fonts.cyri.scale(14))
+            .label_font_id(self.fonts.cyri.conrod_id)
             .label_color(TEXT_COLOR_3)
             .set(ids.faction_tab, ui)
             .was_clicked()
@@ -269,8 +272,8 @@ impl<'a> Widget for Social<'a> {
         if let SocialTab::Faction = self.show.social_tab {
             Text::new(&self.localized_strings.get("hud.social.not_yet_available"))
                 .middle_of(ids.content_align)
-                .font_size(18)
-                .font_id(self.fonts.cyri)
+                .font_size(self.fonts.cyri.scale(18))
+                .font_id(self.fonts.cyri.conrod_id)
                 .color(TEXT_COLOR_3)
                 .set(ids.faction_test, ui);
         }
diff --git a/voxygen/src/hud/spell.rs b/voxygen/src/hud/spell.rs
index 24aa2d55ff..ca49c4b30c 100644
--- a/voxygen/src/hud/spell.rs
+++ b/voxygen/src/hud/spell.rs
@@ -1,4 +1,5 @@
-use super::{img_ids::Imgs, Fonts, Show, TEXT_COLOR};
+use super::{img_ids::Imgs, Show, TEXT_COLOR};
+use crate::ui::fonts::ConrodVoxygenFonts;
 use conrod_core::{
     color,
     widget::{self, Button, Image, Rectangle, Text},
@@ -25,7 +26,7 @@ pub struct Spell<'a> {
     _client: &'a Client,
 
     imgs: &'a Imgs,
-    fonts: &'a Fonts,
+    fonts: &'a ConrodVoxygenFonts,
     localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
 
     #[conrod(common_builder)]
@@ -37,7 +38,7 @@ impl<'a> Spell<'a> {
         show: &'a Show,
         _client: &'a Client,
         imgs: &'a Imgs,
-        fonts: &'a Fonts,
+        fonts: &'a ConrodVoxygenFonts,
         localized_strings: &'a std::sync::Arc<VoxygenLocalization>,
     ) -> Self {
         Self {
@@ -101,8 +102,8 @@ impl<'a> Widget for Spell<'a> {
         // TODO: Use an actual character name.
         Text::new(&self.localized_strings.get("hud.spell"))
             .mid_top_with_margin_on(state.spell_frame, 6.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .color(TEXT_COLOR)
             .set(state.spell_title, ui);
 
diff --git a/voxygen/src/i18n.rs b/voxygen/src/i18n.rs
index 9d1e637067..3b8064a849 100644
--- a/voxygen/src/i18n.rs
+++ b/voxygen/src/i18n.rs
@@ -30,10 +30,26 @@ pub struct LanguageMetadata {
     pub language_identifier: String,
 }
 
+/// Store font metadata
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Font {
+    /// Key to retrieve the font in the asset system
+    pub asset_key: String,
+
+    /// Scale ratio to resize the UI text dynamicly
+    pub scale_ratio: f32,
+}
+
+impl Font {
+    /// Scale input size to final UI size
+    pub fn scale(&self, value: u32) -> u32 { (value as f32 * self.scale_ratio).round() as u32 }
+}
+
+/// Store font metadata
+pub type VoxygenFonts = HashMap<String, Font>;
+
 /// Store internationalization data
-///
-/// TODO: store the font locations here (Font asset path for instance)
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct VoxygenLocalization {
     /// A map storing the localized texts
     ///
@@ -44,6 +60,9 @@ pub struct VoxygenLocalization {
     /// into a ASCII version by using the `deunicode` crate.
     pub convert_utf8_to_ascii: bool,
 
+    /// Font configuration is stored here
+    pub fonts: VoxygenFonts,
+
     pub metadata: LanguageMetadata,
 }
 
diff --git a/voxygen/src/key_state.rs b/voxygen/src/key_state.rs
index 2921c4ce6c..e07474e0db 100644
--- a/voxygen/src/key_state.rs
+++ b/voxygen/src/key_state.rs
@@ -5,6 +5,7 @@ pub struct KeyState {
     pub left: bool,
     pub up: bool,
     pub down: bool,
+    pub analog_matrix: Vec2<f32>,
 }
 
 impl KeyState {
@@ -14,16 +15,21 @@ impl KeyState {
             left: false,
             up: false,
             down: false,
+            analog_matrix: Vec2::zero(),
         }
     }
 
     pub fn dir_vec(&self) -> Vec2<f32> {
-        let dir = Vec2::<f32>::new(
-            if self.right { 1.0 } else { 0.0 } + if self.left { -1.0 } else { 0.0 },
-            if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
-        );
+        let dir = if self.analog_matrix == Vec2::zero() {
+            Vec2::<f32>::new(
+                if self.right { 1.0 } else { 0.0 } + if self.left { -1.0 } else { 0.0 },
+                if self.up { 1.0 } else { 0.0 } + if self.down { -1.0 } else { 0.0 },
+            )
+        } else {
+            self.analog_matrix
+        };
 
-        if dir.magnitude_squared() == 0.0 {
+        if dir.magnitude_squared() <= 1.0 {
             dir
         } else {
             dir.normalized()
diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs
index f3fad20a8b..e1866d1188 100644
--- a/voxygen/src/lib.rs
+++ b/voxygen/src/lib.rs
@@ -1,3 +1,83 @@
-/// Used by benchmarks
+#![deny(unsafe_code)]
+#![feature(drain_filter)]
+#![recursion_limit = "2048"]
+
+#[macro_use]
+pub mod ui;
+pub mod anim;
+pub mod audio;
+pub mod controller;
+mod ecs;
+pub mod error;
+pub mod hud;
+pub mod i18n;
+pub mod key_state;
+pub mod logging;
+pub mod menu;
 pub mod mesh;
+pub mod meta;
 pub mod render;
+pub mod scene;
+pub mod session;
+pub mod settings;
+#[cfg(feature = "singleplayer")]
+pub mod singleplayer;
+pub mod window;
+
+// Reexports
+pub use crate::error::Error;
+
+use crate::{
+    audio::AudioFrontend, meta::Meta, settings::Settings, singleplayer::Singleplayer,
+    window::Window,
+};
+
+/// A type used to store state that is shared between all play states.
+pub struct GlobalState {
+    pub settings: Settings,
+    pub meta: Meta,
+    pub window: Window,
+    pub audio: AudioFrontend,
+    pub info_message: Option<String>,
+    pub singleplayer: Option<Singleplayer>,
+}
+
+impl GlobalState {
+    /// Called after a change in play state has occurred (usually used to
+    /// reverse any temporary effects a state may have made).
+    pub fn on_play_state_changed(&mut self) {
+        self.window.grab_cursor(false);
+        self.window.needs_refresh_resize();
+    }
+
+    pub fn maintain(&mut self, dt: f32) { self.audio.maintain(dt); }
+}
+
+pub enum Direction {
+    Forwards,
+    Backwards,
+}
+
+/// States can either close (and revert to a previous state), push a new state
+/// on top of themselves, or switch to a totally different state.
+pub enum PlayStateResult {
+    /// Pop all play states in reverse order and shut down the program.
+    Shutdown,
+    /// Close the current play state and pop it from the play state stack.
+    Pop,
+    /// Push a new play state onto the play state stack.
+    Push(Box<dyn PlayState>),
+    /// Switch the current play state with a new play state.
+    Switch(Box<dyn PlayState>),
+}
+
+/// A trait representing a playable game state. This may be a menu, a game
+/// session, the title screen, etc.
+pub trait PlayState {
+    /// Play the state until some change of state is required (i.e: a menu is
+    /// opened or the game is closed).
+    fn play(&mut self, direction: Direction, global_state: &mut GlobalState) -> PlayStateResult;
+
+    /// Get a descriptive name for this state type.
+    fn name(&self) -> &'static str;
+}
diff --git a/voxygen/src/logging.rs b/voxygen/src/logging.rs
index 4085b3c30f..50ecbe6481 100644
--- a/voxygen/src/logging.rs
+++ b/voxygen/src/logging.rs
@@ -1,4 +1,5 @@
 use fern::colors::{Color, ColoredLevelConfig};
+use std::fs;
 
 use crate::settings::Settings;
 
@@ -39,12 +40,20 @@ pub fn init(
                 ))
             });
 
-    // Try to create the log file.
-    // Incase of it failing we simply print it out to the console.
-    let mut log_file_created = Ok(());
-    match fern::log_file(&format!("voxygen-{}.log", time.format("%Y-%m-%d-%H"))) {
-        Ok(log_file) => file_cfg = file_cfg.chain(log_file),
-        Err(e) => log_file_created = Err(e),
+    // Try to create the logs file parent directories.
+    let mut log_file_created = fs::create_dir_all(&settings.log.logs_path);
+
+    if log_file_created.is_ok() {
+        // Try to create the log file.
+        match fern::log_file(
+            settings
+                .log
+                .logs_path
+                .join(&format!("voxygen-{}.log", time.format("%Y-%m-%d-%H"))),
+        ) {
+            Ok(log_file) => file_cfg = file_cfg.chain(log_file),
+            Err(e) => log_file_created = Err(e),
+        }
     }
 
     let stdout_cfg = fern::Dispatch::new()
@@ -65,6 +74,7 @@ pub fn init(
         .apply()
         .expect("Failed to setup logging!");
 
+    // Incase that the log file creation failed simply print it to the console
     if let Err(e) = log_file_created {
         log::error!("Failed to create log file! {}", e);
     }
diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index ea6f4ee58c..f2a091daf0 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -1,92 +1,21 @@
 #![deny(unsafe_code)]
-#![feature(drain_filter)]
 #![recursion_limit = "2048"]
 
-#[macro_use]
-pub mod ui;
-pub mod anim;
-pub mod audio;
-mod ecs;
-pub mod error;
-pub mod hud;
-pub mod i18n;
-pub mod key_state;
-mod logging;
-pub mod menu;
-pub mod mesh;
-pub mod meta;
-pub mod render;
-pub mod scene;
-pub mod session;
-pub mod settings;
-#[cfg(feature = "singleplayer")]
-pub mod singleplayer;
-pub mod window;
-
-// Reexports
-pub use crate::error::Error;
-
-use crate::{
-    audio::AudioFrontend,
-    i18n::{i18n_asset_key, VoxygenLocalization},
+use veloren_voxygen::{
+    audio::{self, AudioFrontend},
+    i18n::{self, i18n_asset_key, VoxygenLocalization},
+    logging,
     menu::main::MainMenuState,
     meta::Meta,
     settings::Settings,
     window::Window,
+    Direction, GlobalState, PlayState, PlayStateResult,
 };
+
 use common::assets::{load, load_expect};
 use log::{debug, error};
 use std::{mem, panic, str::FromStr};
 
-/// A type used to store state that is shared between all play states.
-pub struct GlobalState {
-    settings: Settings,
-    meta: Meta,
-    window: Window,
-    audio: AudioFrontend,
-    info_message: Option<String>,
-}
-
-impl GlobalState {
-    /// Called after a change in play state has occurred (usually used to
-    /// reverse any temporary effects a state may have made).
-    pub fn on_play_state_changed(&mut self) {
-        self.window.grab_cursor(false);
-        self.window.needs_refresh_resize();
-    }
-
-    pub fn maintain(&mut self, dt: f32) { self.audio.maintain(dt); }
-}
-
-pub enum Direction {
-    Forwards,
-    Backwards,
-}
-
-/// States can either close (and revert to a previous state), push a new state
-/// on top of themselves, or switch to a totally different state.
-pub enum PlayStateResult {
-    /// Pop all play states in reverse order and shut down the program.
-    Shutdown,
-    /// Close the current play state and pop it from the play state stack.
-    Pop,
-    /// Push a new play state onto the play state stack.
-    Push(Box<dyn PlayState>),
-    /// Switch the current play state with a new play state.
-    Switch(Box<dyn PlayState>),
-}
-
-/// A trait representing a playable game state. This may be a menu, a game
-/// session, the title screen, etc.
-pub trait PlayState {
-    /// Play the state until some change of state is required (i.e: a menu is
-    /// opened or the game is closed).
-    fn play(&mut self, direction: Direction, global_state: &mut GlobalState) -> PlayStateResult;
-
-    /// Get a descriptive name for this state type.
-    fn name(&self) -> &'static str;
-}
-
 fn main() {
     // Initialize logging.
     let term_log_level = std::env::var_os("VOXYGEN_LOG")
@@ -121,7 +50,7 @@ fn main() {
     };
 
     let mut audio = if settings.audio.audio_on {
-        AudioFrontend::new(audio_device(), 16)
+        AudioFrontend::new(audio_device(), settings.audio.max_sfx_channels)
     } else {
         AudioFrontend::no_audio()
     };
@@ -135,6 +64,7 @@ fn main() {
         settings,
         meta,
         info_message: None,
+        singleplayer: None,
     };
 
     // Try to load the localization and log missing entries
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index a3691c3bea..23b43d7eb9 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -1,16 +1,16 @@
-mod scene;
 mod ui;
 
 use crate::{
     i18n::{i18n_asset_key, VoxygenLocalization},
+    scene::simple::{self as scene, Scene},
     session::SessionState,
     window::Event as WinEvent,
     Direction, GlobalState, PlayState, PlayStateResult,
 };
 use client::{self, Client};
-use common::{assets, clock::Clock, comp, msg::ClientState};
+use common::{assets, clock::Clock, comp, msg::ClientState, state::DeltaTime};
 use log::error;
-use scene::Scene;
+use specs::WorldExt;
 use std::{cell::RefCell, rc::Rc, time::Duration};
 use ui::CharSelectionUi;
 
@@ -26,7 +26,10 @@ impl CharSelectionState {
         Self {
             char_selection_ui: CharSelectionUi::new(global_state),
             client,
-            scene: Scene::new(global_state.window.renderer_mut()),
+            scene: Scene::new(
+                global_state.window.renderer_mut(),
+                Some("fixture.selection_bg"),
+            ),
         }
     }
 }
@@ -75,7 +78,7 @@ impl PlayState for CharSelectionState {
                             char_data.body,
                             char_data.tool,
                         );
-                        return PlayStateResult::Push(Box::new(SessionState::new(
+                        return PlayStateResult::Switch(Box::new(SessionState::new(
                             global_state,
                             self.client.clone(),
                         )));
@@ -95,16 +98,23 @@ impl PlayState for CharSelectionState {
                 });
 
             // Maintain the scene.
-            self.scene.maintain(
-                global_state.window.renderer_mut(),
-                &self.client.borrow(),
-                humanoid_body.clone(),
-            );
+            {
+                let client = self.client.borrow();
+                let scene_data = scene::SceneData {
+                    time: client.state().get_time(),
+                    delta_time: client.state().ecs().read_resource::<DeltaTime>().0,
+                    tick: client.get_tick(),
+                    body: humanoid_body.clone(),
+                    gamma: global_state.settings.graphics.gamma,
+                };
+                self.scene
+                    .maintain(global_state.window.renderer_mut(), scene_data);
+            }
 
             // Render the scene.
             self.scene.render(
                 global_state.window.renderer_mut(),
-                &self.client.borrow(),
+                self.client.borrow().get_tick(),
                 humanoid_body.clone(),
                 &comp::Equipment {
                     main: self
@@ -131,7 +141,7 @@ impl PlayState for CharSelectionState {
             ) {
                 global_state.info_message =
                     Some(localized_strings.get("common.connection_lost").to_owned());
-                error!("[session] Failed to tick the scene: {:?}", err);
+                error!("[char_selection] Failed to tick the scene: {:?}", err);
 
                 return PlayStateResult::Pop;
             }
diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs
index 22ec50d31b..561381b271 100644
--- a/voxygen/src/menu/char_selection/ui.rs
+++ b/voxygen/src/menu/char_selection/ui.rs
@@ -3,6 +3,7 @@ use crate::{
     meta::CharacterData,
     render::{Consts, Globals, Renderer},
     ui::{
+        fonts::ConrodVoxygenFonts,
         img_ids::{BlankGraphic, ImageGraphic, VoxelGraphic, VoxelSs9Graphic},
         ImageFrame, ImageSlider, Tooltip, Tooltipable, Ui,
     },
@@ -21,6 +22,7 @@ use conrod_core::{
     widget::{text_box::Event as TextBoxEvent, Button, Image, Rectangle, Scrollbar, Text, TextBox},
     widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, UiCell, Widget,
 };
+
 const STARTER_HAMMER: &str = "common.items.weapons.starter_hammer";
 const STARTER_BOW: &str = "common.items.weapons.starter_bow";
 const STARTER_AXE: &str = "common.items.weapons.starter_axe";
@@ -162,10 +164,6 @@ widget_ids! {
 image_ids! {
     struct Imgs {
         <VoxelGraphic>
-        button: "voxygen.element.buttons.button",
-        button_hover: "voxygen.element.buttons.button_hover",
-        button_press: "voxygen.element.buttons.button_press",
-        name_input: "voxygen.element.misc_bg.textbox",
         charlist_frame: "voxygen.element.frames.window_4",
         server_frame: "voxygen.element.frames.server_frame",
         selection: "voxygen.element.frames.selection",
@@ -184,6 +182,8 @@ image_ids! {
 
         <ImageGraphic>
 
+        name_input: "voxygen.element.misc_bg.textbox_mid",
+
         // Tool Icons
         daggers: "voxygen.element.icons.daggers",
         sword: "voxygen.element.icons.sword",
@@ -213,6 +213,11 @@ image_ids! {
         icon_border_press: "voxygen.element.buttons.border_press",
         icon_border_pressed: "voxygen.element.buttons.border_pressed",
 
+        <ImageGraphic>
+        button: "voxygen.element.buttons.button",
+        button_hover: "voxygen.element.buttons.button_hover",
+        button_press: "voxygen.element.buttons.button_press",
+
         <BlankGraphic>
         nothing: (),
     }
@@ -227,16 +232,6 @@ rotation_image_ids! {
     }
 }
 
-font_ids! {
-    pub struct Fonts {
-        opensans: "voxygen.font.OpenSans-Regular",
-        metamorph: "voxygen.font.Metamorphous-Regular",
-        alkhemi: "voxygen.font.Alkhemikal",
-        cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
-        wizard: "voxygen.font.wizard",
-    }
-}
-
 pub enum Event {
     Logout,
     Play,
@@ -265,10 +260,10 @@ pub struct CharSelectionUi {
     ids: Ids,
     imgs: Imgs,
     rot_imgs: ImgsRot,
-    fonts: Fonts,
+    fonts: ConrodVoxygenFonts,
     //character_creation: bool,
     info_content: InfoContent,
-    selected_language: String,
+    voxygen_i18n: std::sync::Arc<VoxygenLocalization>,
     //deletion_confirmation: bool,
     /*
     pub character_name: String,
@@ -290,8 +285,13 @@ impl CharSelectionUi {
         // Load images
         let imgs = Imgs::load(&mut ui).expect("Failed to load images!");
         let rot_imgs = ImgsRot::load(&mut ui).expect("Failed to load images!");
-        // Load fonts
-        let fonts = Fonts::load(&mut ui).expect("Failed to load fonts!");
+        // Load language
+        let voxygen_i18n = load_expect::<VoxygenLocalization>(&i18n_asset_key(
+            &global_state.settings.language.selected_language,
+        ));
+        // Load fonts.
+        let fonts = ConrodVoxygenFonts::load(&voxygen_i18n.fonts, &mut ui)
+            .expect("Impossible to load fonts!");
 
         // TODO: Randomize initial values.
         Self {
@@ -301,7 +301,7 @@ impl CharSelectionUi {
             rot_imgs,
             fonts,
             info_content: InfoContent::None,
-            selected_language: global_state.settings.language.selected_language.clone(),
+            voxygen_i18n,
             //deletion_confirmation: false,
             /*
             character_creation: false,
@@ -334,8 +334,6 @@ impl CharSelectionUi {
             env!("CARGO_PKG_VERSION"),
             common::util::GIT_VERSION.to_string()
         );
-        let localized_strings =
-            load_expect::<VoxygenLocalization>(&i18n_asset_key(&self.selected_language));
 
         // Tooltip
         let tooltip_human = Tooltip::new({
@@ -350,9 +348,9 @@ impl CharSelectionUi {
                 5.0,
             )
         })
-        .title_font_size(15)
-        .desc_font_size(10)
-        .font_id(self.fonts.cyri)
+        .title_font_size(self.fonts.cyri.scale(15))
+        .desc_font_size(self.fonts.cyri.scale(10))
+        .font_id(self.fonts.cyri.conrod_id)
         .title_text_color(TEXT_COLOR)
         .desc_text_color(TEXT_COLOR_2);
 
@@ -372,10 +370,10 @@ impl CharSelectionUi {
             match self.info_content {
                 InfoContent::None => unreachable!(),
                 InfoContent::Deletion(character_index) => {
-                    Text::new(&localized_strings.get("char_selection.delete_permanently"))
+                    Text::new(&self.voxygen_i18n.get("char_selection.delete_permanently"))
                         .mid_top_with_margin_on(self.ids.info_frame, 40.0)
-                        .font_size(24)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(24))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR)
                         .set(self.ids.delete_text, ui_widgets);
                     if Button::image(self.imgs.button)
@@ -384,9 +382,9 @@ impl CharSelectionUi {
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
                         .label_y(Relative::Scalar(2.0))
-                        .label(&localized_strings.get("common.no"))
-                        .label_font_id(self.fonts.cyri)
-                        .label_font_size(18)
+                        .label(&self.voxygen_i18n.get("common.no"))
+                        .label_font_id(self.fonts.cyri.conrod_id)
+                        .label_font_size(self.fonts.cyri.scale(18))
                         .label_color(TEXT_COLOR)
                         .set(self.ids.info_no, ui_widgets)
                         .was_clicked()
@@ -399,9 +397,9 @@ impl CharSelectionUi {
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
                         .label_y(Relative::Scalar(2.0))
-                        .label(&localized_strings.get("common.yes"))
-                        .label_font_id(self.fonts.cyri)
-                        .label_font_size(18)
+                        .label(&self.voxygen_i18n.get("common.yes"))
+                        .label_font_id(self.fonts.cyri.conrod_id)
+                        .label_font_size(self.fonts.cyri.scale(18))
                         .label_color(TEXT_COLOR)
                         .set(self.ids.info_ok, ui_widgets)
                         .was_clicked()
@@ -456,8 +454,8 @@ impl CharSelectionUi {
                 // Server Name
                 Text::new(&client.server_info.name)
                     .mid_top_with_margin_on(self.ids.server_frame_bg, 5.0)
-                    .font_size(26)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(26))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.server_name_text, ui_widgets);
                 //Change Server
@@ -467,10 +465,10 @@ impl CharSelectionUi {
                     .parent(self.ids.charlist_bg)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("char_selection.change_server"))
+                    .label(&self.voxygen_i18n.get("char_selection.change_server"))
                     .label_color(TEXT_COLOR)
-                    .label_font_id(self.fonts.cyri)
-                    .label_font_size(18)
+                    .label_font_id(self.fonts.cyri.conrod_id)
+                    .label_font_size(self.fonts.cyri.scale(18))
                     .label_y(conrod_core::position::Relative::Scalar(3.0))
                     .set(self.ids.change_server, ui_widgets)
                     .was_clicked()
@@ -480,13 +478,13 @@ impl CharSelectionUi {
 
                 // Enter World Button
                 let character_count = global_state.meta.characters.len();
-                let enter_world_str = &localized_strings.get("char_selection.enter_world");
+                let enter_world_str = &self.voxygen_i18n.get("char_selection.enter_world");
                 let enter_button = Button::image(self.imgs.button)
                     .mid_bottom_with_margin_on(ui_widgets.window, 10.0)
                     .w_h(250.0, 60.0)
                     .label(enter_world_str)
-                    .label_font_size(26)
-                    .label_font_id(self.fonts.cyri)
+                    .label_font_size(self.fonts.cyri.scale(26))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_y(conrod_core::position::Relative::Scalar(3.0));
 
                 if match &self.mode {
@@ -514,10 +512,10 @@ impl CharSelectionUi {
                     .w_h(150.0, 40.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("char_selection.logout"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("char_selection.logout"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
-                    .label_font_size(20)
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(conrod_core::position::Relative::Scalar(3.0))
                     .set(self.ids.logout_button, ui_widgets)
                     .was_clicked()
@@ -528,8 +526,8 @@ impl CharSelectionUi {
                 // Alpha Version
                 Text::new(&version)
                     .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
-                    .font_size(14)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(14))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.version, ui_widgets);
 
@@ -572,7 +570,7 @@ impl CharSelectionUi {
                         .image_color(Color::Rgba(1.0, 1.0, 1.0, 0.8))
                         .hover_image(self.imgs.selection_hover)
                         .press_image(self.imgs.selection_press)
-                        .label_font_id(self.fonts.cyri)
+                        .label_font_id(self.fonts.cyri.conrod_id)
                         .label_y(conrod_core::position::Relative::Scalar(20.0))
                         .set(self.ids.character_boxes[i], ui_widgets)
                         .was_clicked()
@@ -586,7 +584,7 @@ impl CharSelectionUi {
                         .press_image(self.imgs.delete_button_press)
                         .with_tooltip(
                             tooltip_manager,
-                            &localized_strings.get("char_selection.delete_permanently"),
+                            &self.voxygen_i18n.get("char_selection.delete_permanently"),
                             "",
                             &tooltip_human,
                         )
@@ -597,26 +595,27 @@ impl CharSelectionUi {
                     }
                     Text::new(&character.name)
                         .top_left_with_margins_on(self.ids.character_boxes[i], 6.0, 9.0)
-                        .font_size(19)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(19))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR)
                         .set(self.ids.character_names[i], ui_widgets);
 
                     Text::new(
-                        &localized_strings
+                        &self
+                            .voxygen_i18n
                             .get("char_selection.level_fmt")
                             .replace("{level_nb}", "1"),
                     ) //TODO Insert real level here as soon as they get saved
                     .down_from(self.ids.character_names[i], 4.0)
-                    .font_size(17)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(17))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.character_levels[i], ui_widgets);
 
-                    Text::new(&localized_strings.get("char_selection.uncanny_valley"))
+                    Text::new(&self.voxygen_i18n.get("char_selection.uncanny_valley"))
                         .down_from(self.ids.character_levels[i], 4.0)
-                        .font_size(17)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(17))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR)
                         .set(self.ids.character_locations[i], ui_widgets);
                 }
@@ -637,9 +636,9 @@ impl CharSelectionUi {
                     .w_h(386.0, 80.0)
                     .hover_image(self.imgs.selection_hover)
                     .press_image(self.imgs.selection_press)
-                    .label(&localized_strings.get("char_selection.create_new_charater"))
+                    .label(&self.voxygen_i18n.get("char_selection.create_new_charater"))
                     .label_color(Color::Rgba(0.38, 1.0, 0.07, 1.0))
-                    .label_font_id(self.fonts.cyri)
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .image_color(Color::Rgba(0.38, 1.0, 0.07, 1.0))
                     .set(self.ids.character_box_2, ui_widgets)
                     .was_clicked()
@@ -661,10 +660,10 @@ impl CharSelectionUi {
                     .w_h(150.0, 40.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("common.back"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("common.back"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
-                    .label_font_size(20)
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(conrod_core::position::Relative::Scalar(3.0))
                     .set(self.ids.back_button, ui_widgets)
                     .was_clicked()
@@ -677,10 +676,12 @@ impl CharSelectionUi {
                     .w_h(150.0, 40.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("common.create"))
-                    .label_font_id(self.fonts.cyri)
-                    .label_color(TEXT_COLOR)
-                    .label_font_size(20)
+                    .label(&self.voxygen_i18n.get("common.create"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
+                    .label_color(
+                        /* if self.mode { TEXT_COLOR } else { */ TEXT_COLOR, /* ,  } */
+                    )
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(conrod_core::position::Relative::Scalar(3.0))
                     .set(self.ids.create_button, ui_widgets)
                     .was_clicked()
@@ -705,11 +706,11 @@ impl CharSelectionUi {
                 for event in TextBox::new(name)
                     .w_h(300.0, 60.0)
                     .mid_top_with_margin_on(self.ids.name_input, 2.0)
-                    .font_size(26)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(26))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .center_justify()
                     .text_color(TEXT_COLOR)
-                    .font_id(self.fonts.cyri)
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TRANSPARENT)
                     .border_color(TRANSPARENT)
                     .set(self.ids.name_field, ui_widgets)
@@ -745,10 +746,10 @@ impl CharSelectionUi {
                     .set(self.ids.selection_scrollbar, ui_widgets);
 
                 // Male/Female/Race Icons
-                Text::new(&localized_strings.get("char_selection.character_creation"))
+                Text::new(&self.voxygen_i18n.get("char_selection.character_creation"))
                     .mid_top_with_margin_on(self.ids.creation_alignment, 10.0)
-                    .font_size(24)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(24))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.bodyrace_text, ui_widgets);
                 // Alignment
@@ -833,7 +834,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.human"),
+                    &self.voxygen_i18n.get("common.races.human"),
                     "",
                     &tooltip_human,
                 )
@@ -866,7 +867,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.orc"),
+                    &self.voxygen_i18n.get("common.races.orc"),
                     "",
                     &tooltip_human,
                 )
@@ -891,7 +892,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.dwarf"),
+                    &self.voxygen_i18n.get("common.races.dwarf"),
                     "",
                     &tooltip_human,
                 )
@@ -916,7 +917,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.elf"),
+                    &self.voxygen_i18n.get("common.races.elf"),
                     "",
                     &tooltip_human,
                 )
@@ -942,7 +943,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.undead"),
+                    &self.voxygen_i18n.get("common.races.undead"),
                     "",
                     &tooltip_human,
                 )
@@ -967,7 +968,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.races.danari"),
+                    &self.voxygen_i18n.get("common.races.danari"),
                     "",
                     &tooltip_human,
                 )
@@ -993,7 +994,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.weapons.hammer"),
+                    &self.voxygen_i18n.get("common.weapons.hammer"),
                     "",
                     &tooltip_human,
                 )
@@ -1022,7 +1023,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.weapons.bow"),
+                    &self.voxygen_i18n.get("common.weapons.bow"),
                     "",
                     &tooltip_human,
                 )
@@ -1031,10 +1032,6 @@ impl CharSelectionUi {
                 {
                     *tool = Some(STARTER_BOW);
                 }
-                // REMOVE THIS AFTER IMPLEMENTATION
-                /*Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8))
-                .middle_of(self.ids.bow)
-                .set(self.ids.bow_grey, ui_widgets);*/
                 // Staff
                 Image::new(self.imgs.staff)
                     .w_h(70.0, 70.0)
@@ -1050,7 +1047,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.weapons.staff"),
+                    &self.voxygen_i18n.get("common.weapons.staff"),
                     "",
                     &tooltip_human,
                 )
@@ -1059,10 +1056,6 @@ impl CharSelectionUi {
                 {
                     *tool = Some(STARTER_STAFF);
                 }
-                // REMOVE THIS AFTER IMPLEMENTATION
-                /*Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8))
-                .middle_of(self.ids.staff)
-                .set(self.ids.staff_grey, ui_widgets);*/
                 // Sword
                 Image::new(self.imgs.sword)
                     .w_h(70.0, 70.0)
@@ -1078,7 +1071,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.weapons.sword"),
+                    &self.voxygen_i18n.get("common.weapons.sword"),
                     "",
                     &tooltip_human,
                 )
@@ -1126,7 +1119,7 @@ impl CharSelectionUi {
                 .press_image(self.imgs.icon_border_press)
                 .with_tooltip(
                     tooltip_manager,
-                    &localized_strings.get("common.weapons.axe"),
+                    &self.voxygen_i18n.get("common.weapons.axe"),
                     "",
                     &tooltip_human,
                 )
@@ -1136,8 +1129,9 @@ impl CharSelectionUi {
                     *tool = Some(STARTER_AXE);
                 }
                 // Sliders
-                let (metamorph, slider_indicator, slider_range) = (
-                    self.fonts.cyri,
+                let (cyri, cyri_size, slider_indicator, slider_range) = (
+                    self.fonts.cyri.conrod_id,
+                    self.fonts.cyri.scale(18),
                     self.imgs.slider_indicator,
                     self.imgs.slider_range,
                 );
@@ -1151,8 +1145,8 @@ impl CharSelectionUi {
                     Text::new(text)
                         .down_from(prev_id, 22.0)
                         .align_middle_x_of(prev_id)
-                        .font_size(18)
-                        .font_id(metamorph)
+                        .font_size(cyri_size)
+                        .font_id(cyri)
                         .color(TEXT_COLOR)
                         .set(text_id, ui_widgets);
                     ImageSlider::discrete(selected_val, 0, max, slider_indicator, slider_range)
@@ -1167,7 +1161,7 @@ impl CharSelectionUi {
                 // Hair Style
                 if let Some(new_val) = char_slider(
                     self.ids.creation_buttons_alignment_2,
-                    localized_strings.get("char_selection.hair_style"),
+                    self.voxygen_i18n.get("char_selection.hair_style"),
                     self.ids.hairstyle_text,
                     body.race.num_hair_styles(body.body_type) as usize - 1,
                     body.hair_style as usize,
@@ -1179,7 +1173,7 @@ impl CharSelectionUi {
                 // Hair Color
                 if let Some(new_val) = char_slider(
                     self.ids.hairstyle_slider,
-                    localized_strings.get("char_selection.hair_color"),
+                    self.voxygen_i18n.get("char_selection.hair_color"),
                     self.ids.haircolor_text,
                     body.race.num_hair_colors() as usize - 1,
                     body.hair_color as usize,
@@ -1191,7 +1185,7 @@ impl CharSelectionUi {
                 // Skin
                 if let Some(new_val) = char_slider(
                     self.ids.haircolor_slider,
-                    localized_strings.get("char_selection.skin"),
+                    self.voxygen_i18n.get("char_selection.skin"),
                     self.ids.skin_text,
                     body.race.num_skin_colors() as usize - 1,
                     body.skin as usize,
@@ -1204,7 +1198,7 @@ impl CharSelectionUi {
                 let current_eyebrows = body.eyebrows;
                 if let Some(new_val) = char_slider(
                     self.ids.skin_slider,
-                    localized_strings.get("char_selection.eyebrows"),
+                    self.voxygen_i18n.get("char_selection.eyebrows"),
                     self.ids.eyebrows_text,
                     humanoid::ALL_EYEBROWS.len() - 1,
                     humanoid::ALL_EYEBROWS
@@ -1219,7 +1213,7 @@ impl CharSelectionUi {
                 // EyeColor
                 if let Some(new_val) = char_slider(
                     self.ids.eyebrows_slider,
-                    localized_strings.get("char_selection.eye_color"),
+                    self.voxygen_i18n.get("char_selection.eye_color"),
                     self.ids.eyecolor_text,
                     body.race.num_eye_colors() as usize - 1,
                     body.eye_color as usize,
@@ -1232,7 +1226,7 @@ impl CharSelectionUi {
                 let _current_accessory = body.accessory;
                 if let Some(new_val) = char_slider(
                     self.ids.eyecolor_slider,
-                    localized_strings.get("char_selection.accessories"),
+                    self.voxygen_i18n.get("char_selection.accessories"),
                     self.ids.accessories_text,
                     body.race.num_accessories(body.body_type) as usize - 1,
                     body.accessory as usize,
@@ -1245,7 +1239,7 @@ impl CharSelectionUi {
                 if body.race.num_beards(body.body_type) > 1 {
                     if let Some(new_val) = char_slider(
                         self.ids.accessories_slider,
-                        localized_strings.get("char_selection.beard"),
+                        self.voxygen_i18n.get("char_selection.beard"),
                         self.ids.beard_text,
                         body.race.num_beards(body.body_type) as usize - 1,
                         body.beard as usize,
@@ -1255,10 +1249,10 @@ impl CharSelectionUi {
                         body.beard = new_val as u8;
                     }
                 } else {
-                    Text::new(&localized_strings.get("char_selection.beard"))
+                    Text::new(&self.voxygen_i18n.get("char_selection.beard"))
                         .mid_bottom_with_margin_on(self.ids.accessories_slider, -40.0)
-                        .font_size(18)
-                        .font_id(self.fonts.cyri)
+                        .font_size(self.fonts.cyri.scale(18))
+                        .font_id(self.fonts.cyri.conrod_id)
                         .color(TEXT_COLOR_2)
                         .set(self.ids.beard_text, ui_widgets);
                     ImageSlider::discrete(5, 0, 10, self.imgs.nothing, self.imgs.slider_range)
@@ -1275,7 +1269,7 @@ impl CharSelectionUi {
                 let current_chest = body.chest;
                 if let Some(new_val) = char_slider(
                     self.ids.beard_slider,
-                    localized_strings.get("char_selection.chest_color"),
+                    self.voxygen_i18n.get("char_selection.chest_color"),
                     self.ids.chest_text,
                     humanoid::ALL_CHESTS.len() - 1,
                     humanoid::ALL_CHESTS
diff --git a/voxygen/src/menu/main/client_init.rs b/voxygen/src/menu/main/client_init.rs
index 95be603556..87e33fee55 100644
--- a/voxygen/src/menu/main/client_init.rs
+++ b/voxygen/src/menu/main/client_init.rs
@@ -1,6 +1,6 @@
 use client::{error::Error as ClientError, Client};
-use common::{comp, net::PostError};
-use crossbeam::channel::{unbounded, Receiver, TryRecvError};
+use common::net::PostError;
+use crossbeam::channel::{unbounded, Receiver, Sender, TryRecvError};
 use std::{
     net::ToSocketAddrs,
     sync::{
@@ -15,32 +15,39 @@ use std::{
 pub enum Error {
     // Error parsing input string or error resolving host name.
     BadAddress(std::io::Error),
-    // Parsing/host name resolution successful but could not connect.
-    #[allow(dead_code)]
-    ConnectionFailed(ClientError),
+    // Parsing/host name resolution successful but there was an error within the client.
+    ClientError(ClientError),
     // Parsing yielded an empty iterator (specifically to_socket_addrs()).
     NoAddress,
-    InvalidAuth,
     ClientCrashed,
-    ServerIsFull,
 }
 
+pub enum Msg {
+    IsAuthTrusted(String),
+    Done(Result<Client, Error>),
+}
+
+pub struct AuthTrust(String, bool);
+
 // Used to asynchronously parse the server address, resolve host names,
 // and create the client (which involves establishing a connection to the
 // server).
 pub struct ClientInit {
-    rx: Receiver<Result<Client, Error>>,
+    rx: Receiver<Msg>,
+    trust_tx: Sender<AuthTrust>,
     cancel: Arc<AtomicBool>,
 }
 impl ClientInit {
     pub fn new(
         connection_args: (String, u16, bool),
-        player: comp::Player,
+        username: String,
+        view_distance: Option<u32>,
         password: String,
     ) -> Self {
         let (server_address, default_port, prefer_ipv6) = connection_args;
 
         let (tx, rx) = unbounded();
+        let (trust_tx, trust_rx) = unbounded();
         let cancel = Arc::new(AtomicBool::new(false));
         let cancel2 = Arc::clone(&cancel);
 
@@ -66,40 +73,39 @@ impl ClientInit {
                         for socket_addr in
                             first_addrs.clone().into_iter().chain(second_addrs.clone())
                         {
-                            match Client::new(socket_addr, player.view_distance) {
+                            match Client::new(socket_addr, view_distance) {
                                 Ok(mut client) => {
-                                    if let Err(ClientError::InvalidAuth) =
-                                        client.register(player.clone(), password.clone())
+                                    if let Err(err) =
+                                        client.register(username, password, |auth_server| {
+                                            let _ = tx
+                                                .send(Msg::IsAuthTrusted(auth_server.to_string()));
+                                            trust_rx
+                                                .recv()
+                                                .map(|AuthTrust(server, trust)| {
+                                                    trust && &server == auth_server
+                                                })
+                                                .unwrap_or(false)
+                                        })
                                     {
-                                        last_err = Some(Error::InvalidAuth);
-                                        break;
+                                        last_err = Some(Error::ClientError(err));
+                                        break 'tries;
                                     }
-                                    //client.register(player, password);
-                                    let _ = tx.send(Ok(client));
+                                    let _ = tx.send(Msg::Done(Ok(client)));
                                     return;
                                 },
                                 Err(err) => {
                                     match err {
                                         ClientError::Network(PostError::Bincode(_)) => {
-                                            last_err = Some(Error::ConnectionFailed(err));
+                                            last_err = Some(Error::ClientError(err));
                                             break 'tries;
                                         },
                                         // Assume the connection failed and try again soon
                                         ClientError::Network(_) => {},
-                                        ClientError::TooManyPlayers => {
-                                            last_err = Some(Error::ServerIsFull);
+                                        // Non-connection error, stop attempts
+                                        err => {
+                                            last_err = Some(Error::ClientError(err));
                                             break 'tries;
                                         },
-                                        ClientError::InvalidAuth => {
-                                            last_err = Some(Error::InvalidAuth);
-                                            break 'tries;
-                                        },
-                                        // TODO: Handle errors?
-                                        _ => panic!(
-                                            "Unexpected non-network error when creating client: \
-                                             {:?}",
-                                            err
-                                        ),
                                     }
                                 },
                             }
@@ -107,29 +113,38 @@ impl ClientInit {
                         thread::sleep(Duration::from_secs(5));
                     }
                     // Parsing/host name resolution successful but no connection succeeded.
-                    let _ = tx.send(Err(last_err.unwrap_or(Error::NoAddress)));
+                    let _ = tx.send(Msg::Done(Err(last_err.unwrap_or(Error::NoAddress))));
                 },
                 Err(err) => {
                     // Error parsing input string or error resolving host name.
-                    let _ = tx.send(Err(Error::BadAddress(err)));
+                    let _ = tx.send(Msg::Done(Err(Error::BadAddress(err))));
                 },
             }
         });
 
-        ClientInit { rx, cancel }
+        ClientInit {
+            rx,
+            trust_tx,
+            cancel,
+        }
     }
 
     /// Poll if the thread is complete.
     /// Returns None if the thread is still running, otherwise returns the
     /// Result of client creation.
-    pub fn poll(&self) -> Option<Result<Client, Error>> {
+    pub fn poll(&self) -> Option<Msg> {
         match self.rx.try_recv() {
-            Ok(result) => Some(result),
+            Ok(msg) => Some(msg),
             Err(TryRecvError::Empty) => None,
-            Err(TryRecvError::Disconnected) => Some(Err(Error::ClientCrashed)),
+            Err(TryRecvError::Disconnected) => Some(Msg::Done(Err(Error::ClientCrashed))),
         }
     }
 
+    /// Report trust status of auth server
+    pub fn auth_trust(&self, auth_server: String, trusted: bool) {
+        let _ = self.trust_tx.send(AuthTrust(auth_server, trusted));
+    }
+
     pub fn cancel(&mut self) { self.cancel.store(true, Ordering::Relaxed); }
 }
 
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 3c05d71eae..145d8e9b16 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -3,23 +3,17 @@ mod client_init;
 
 use super::char_selection::CharSelectionState;
 use crate::{
-    i18n::{i18n_asset_key, VoxygenLocalization},
-    singleplayer::Singleplayer,
-    window::Event,
-    Direction, GlobalState, PlayState, PlayStateResult,
+    singleplayer::Singleplayer, window::Event, Direction, GlobalState, PlayState, PlayStateResult,
 };
-use argon2::{self, Config};
-use client_init::{ClientInit, Error as InitError};
+use client_init::{ClientInit, Error as InitError, Msg as InitMsg};
 use common::{assets::load_expect, clock::Clock, comp};
-use log::warn;
+use log::{error, warn};
 #[cfg(feature = "singleplayer")]
 use std::time::Duration;
 use ui::{Event as MainMenuEvent, MainMenuUi};
 
 pub struct MainMenuState {
     main_menu_ui: MainMenuUi,
-    title_music_channel: Option<usize>,
-    singleplayer: Option<Singleplayer>,
 }
 
 impl MainMenuState {
@@ -27,8 +21,6 @@ impl MainMenuState {
     pub fn new(global_state: &mut GlobalState) -> Self {
         Self {
             main_menu_ui: MainMenuUi::new(global_state),
-            title_music_channel: None,
-            singleplayer: None,
         }
     }
 }
@@ -44,15 +36,16 @@ impl PlayState for MainMenuState {
         let mut client_init: Option<ClientInit> = None;
 
         // Kick off title music
-        if self.title_music_channel.is_none()
-            && global_state.settings.audio.audio_on
-            && global_state.audio.music_enabled()
-        {
-            self.title_music_channel = global_state.audio.play_title_music();
+        if global_state.settings.audio.audio_on && global_state.audio.music_enabled() {
+            global_state.audio.play_title_music();
         }
 
         // Reset singleplayer server if it was running already
-        self.singleplayer = None;
+        global_state.singleplayer = None;
+
+        let localized_strings = load_expect::<crate::i18n::VoxygenLocalization>(
+            &crate::i18n::i18n_asset_key(&global_state.settings.language.selected_language),
+        );
 
         loop {
             // Handle window events.
@@ -72,7 +65,7 @@ impl PlayState for MainMenuState {
 
             // Poll client creation.
             match client_init.as_ref().and_then(|init| init.poll()) {
-                Some(Ok(mut client)) => {
+                Some(InitMsg::Done(Ok(mut client))) => {
                     self.main_menu_ui.connected();
                     // Register voxygen components / resources
                     crate::ecs::init(client.state_mut().ecs_mut());
@@ -81,18 +74,82 @@ impl PlayState for MainMenuState {
                         std::rc::Rc::new(std::cell::RefCell::new(client)),
                     )));
                 },
-                Some(Err(err)) => {
+                Some(InitMsg::Done(Err(err))) => {
                     client_init = None;
-                    global_state.info_message = Some(
-                        match err {
-                            InitError::BadAddress(_) | InitError::NoAddress => "Server not found",
-                            InitError::InvalidAuth => "Invalid credentials",
-                            InitError::ServerIsFull => "Server is full",
-                            InitError::ConnectionFailed(_) => "Connection failed",
-                            InitError::ClientCrashed => "Client crashed",
-                        }
-                        .to_string(),
-                    );
+                    global_state.info_message = Some({
+                        let err = match err {
+                            InitError::BadAddress(_) | InitError::NoAddress => {
+                                localized_strings.get("main.login.server_not_found").into()
+                            },
+                            InitError::ClientError(err) => match err {
+                                client::Error::AuthErr(e) => format!(
+                                    "{}: {}",
+                                    localized_strings.get("main.login.authentication_error"),
+                                    e
+                                ),
+                                client::Error::TooManyPlayers => {
+                                    localized_strings.get("main.login.server_full").into()
+                                },
+                                client::Error::AuthServerNotTrusted => localized_strings
+                                    .get("main.login.untrusted_auth_server")
+                                    .into(),
+                                client::Error::ServerWentMad => localized_strings
+                                    .get("main.login.outdated_client_or_server")
+                                    .into(),
+                                client::Error::ServerTimeout => {
+                                    localized_strings.get("main.login.timeout").into()
+                                },
+                                client::Error::ServerShutdown => {
+                                    localized_strings.get("main.login.server_shut_down").into()
+                                },
+                                client::Error::AlreadyLoggedIn => {
+                                    localized_strings.get("main.login.already_logged_in").into()
+                                },
+                                client::Error::Network(e) => format!(
+                                    "{}: {:?}",
+                                    localized_strings.get("main.login.network_error"),
+                                    e
+                                ),
+                                client::Error::Other(e) => {
+                                    format!("{}: {}", localized_strings.get("common.error"), e)
+                                },
+                                client::Error::AuthClientError(e) => match e {
+                                    client::AuthClientError::JsonError(e) => format!(
+                                        "{}: {}",
+                                        localized_strings.get("common.fatal_error"),
+                                        e
+                                    ),
+                                    client::AuthClientError::RequestError(_) => format!(
+                                        "{}: {}",
+                                        localized_strings.get("main.login.failed_sending_request"),
+                                        e
+                                    ),
+                                    client::AuthClientError::ServerError(_, e) => format!("{}", e),
+                                },
+                            },
+                            InitError::ClientCrashed => {
+                                localized_strings.get("main.login.client_crashed").into()
+                            },
+                        };
+                        // Log error for possible additional use later or incase that the error
+                        // displayed is cut of.
+                        error!("{}", err);
+                        err
+                    });
+                },
+                Some(InitMsg::IsAuthTrusted(auth_server)) => {
+                    if global_state
+                        .settings
+                        .networking
+                        .trusted_auth_servers
+                        .contains(&auth_server)
+                    {
+                        // Can't fail since we just polled it, it must be Some
+                        client_init.as_ref().unwrap().auth_trust(auth_server, true);
+                    } else {
+                        // Show warning that auth server is not trusted and prompt for approval
+                        self.main_menu_ui.auth_trust_prompt(auth_server);
+                    }
                 },
                 None => {},
             }
@@ -124,7 +181,7 @@ impl PlayState for MainMenuState {
                         // client_init contains Some(ClientInit), which spawns a thread which
                         // contains a TcpStream::connect() call This call is
                         // blocking TODO fix when the network rework happens
-                        self.singleplayer = None;
+                        global_state.singleplayer = None;
                         client_init = None;
                         self.main_menu_ui.cancel_connection();
                     },
@@ -132,7 +189,7 @@ impl PlayState for MainMenuState {
                     MainMenuEvent::StartSingleplayer => {
                         let (singleplayer, server_settings) = Singleplayer::new(None); // TODO: Make client and server use the same thread pool
 
-                        self.singleplayer = Some(singleplayer);
+                        global_state.singleplayer = Some(singleplayer);
 
                         attempt_login(
                             global_state,
@@ -148,15 +205,24 @@ impl PlayState for MainMenuState {
                     MainMenuEvent::DisclaimerClosed => {
                         global_state.settings.show_disclaimer = false
                     },
+                    MainMenuEvent::AuthServerTrust(auth_server, trust) => {
+                        if trust {
+                            global_state
+                                .settings
+                                .networking
+                                .trusted_auth_servers
+                                .insert(auth_server.clone());
+                            global_state.settings.save_to_file_warn();
+                        }
+                        client_init
+                            .as_ref()
+                            .map(|init| init.auth_trust(auth_server, trust));
+                    },
                 }
             }
-            let localized_strings = load_expect::<VoxygenLocalization>(&i18n_asset_key(
-                &global_state.settings.language.selected_language,
-            ));
 
             if let Some(info) = global_state.info_message.take() {
-                self.main_menu_ui
-                    .show_info(info, localized_strings.get("common.okay").to_owned());
+                self.main_menu_ui.show_info(info);
             }
 
             // Draw the UI to the screen.
@@ -197,25 +263,17 @@ fn attempt_login(
         warn!("Failed to save settings: {:?}", err);
     }
 
-    let player = comp::Player::new(
-        username.clone(),
-        Some(global_state.settings.graphics.view_distance),
-    );
-
-    if player.is_valid() {
+    if comp::Player::alias_is_valid(&username) {
         // Don't try to connect if there is already a connection in progress.
         if client_init.is_none() {
             *client_init = Some(ClientInit::new(
                 (server_address, server_port, false),
-                player,
-                {
-                    let salt = b"staticsalt_zTuGkGvybZIjZbNUDtw15";
-                    let config = Config::default();
-                    argon2::hash_encoded(password.as_bytes(), salt, &config).unwrap()
-                },
+                username,
+                Some(global_state.settings.graphics.view_distance),
+                { password },
             ));
         }
     } else {
-        global_state.info_message = Some("Invalid username or password".to_string());
+        global_state.info_message = Some("Invalid username".to_string());
     }
 }
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 3273c9bb96..8832cc7e59 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -3,6 +3,7 @@ use crate::{
     render::Renderer,
     ui::{
         self,
+        fonts::ConrodVoxygenFonts,
         img_ids::{BlankGraphic, ImageGraphic, VoxelGraphic},
         Graphic, ImageFrame, Tooltip, Ui,
     },
@@ -67,7 +68,9 @@ widget_ids! {
         // Info Window
         info_frame,
         info_text,
-        info_bottom
+        info_bottom,
+        // Auth Trust Prompt
+        button_add_auth_trust,
     }
 }
 
@@ -75,18 +78,24 @@ image_ids! {
     struct Imgs {
         <VoxelGraphic>
         v_logo: "voxygen.element.v_logo",
-        input_bg: "voxygen.element.misc_bg.textbox",
-        button: "voxygen.element.buttons.button",
-        button_hover: "voxygen.element.buttons.button_hover",
-        button_press: "voxygen.element.buttons.button_press",
+
         disclaimer: "voxygen.element.frames.disclaimer",
         info_frame: "voxygen.element.frames.info_frame_2",
         banner: "voxygen.element.frames.banner",
-        banner_top: "voxygen.element.frames.banner_top",
+
         banner_bottom: "voxygen.element.frames.banner_bottom",
 
         <ImageGraphic>
         bg: "voxygen.background.bg_main",
+        banner_top: "voxygen.element.frames.banner_top",
+        button: "voxygen.element.buttons.button",
+        button_hover: "voxygen.element.buttons.button_hover",
+        button_press: "voxygen.element.buttons.button_press",
+        input_bg_top: "voxygen.element.misc_bg.textbox_top",
+        input_bg_mid: "voxygen.element.misc_bg.textbox_mid",
+        input_bg_bot: "voxygen.element.misc_bg.textbox_bot",
+
+
 
         <BlankGraphic>
         nothing: (),
@@ -103,16 +112,6 @@ rotation_image_ids! {
     }
 }
 
-font_ids! {
-    pub struct Fonts {
-        opensans: "voxygen.font.OpenSans-Regular",
-        metamorph: "voxygen.font.Metamorphous-Regular",
-        alkhemi: "voxygen.font.Alkhemikal",
-        cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
-        wizard: "voxygen.font.wizard",
-    }
-}
-
 pub enum Event {
     LoginAttempt {
         username: String,
@@ -125,16 +124,17 @@ pub enum Event {
     Quit,
     Settings,
     DisclaimerClosed,
+    AuthServerTrust(String, bool),
 }
 
 pub enum PopupType {
     Error,
     ConnectionInfo,
+    AuthTrustPrompt(String),
 }
 
 pub struct PopupData {
     msg: String,
-    button_text: String,
     popup_type: PopupType,
 }
 
@@ -143,7 +143,6 @@ pub struct MainMenuUi {
     ids: Ids,
     imgs: Imgs,
     rot_imgs: ImgsRot,
-    fonts: Fonts,
     username: String,
     password: String,
     server_address: String,
@@ -154,6 +153,8 @@ pub struct MainMenuUi {
     show_disclaimer: bool,
     time: f32,
     bg_img_id: conrod_core::image::Id,
+    voxygen_i18n: std::sync::Arc<VoxygenLocalization>,
+    fonts: ConrodVoxygenFonts,
 }
 
 impl MainMenuUi {
@@ -184,15 +185,19 @@ impl MainMenuUi {
         let bg_img_id = ui.add_graphic(Graphic::Image(load_expect(
             bg_imgs.choose(&mut rng).unwrap(),
         )));
-        // Load fonts
-        let fonts = Fonts::load(&mut ui).expect("Failed to load fonts");
+        // Load language
+        let voxygen_i18n = load_expect::<VoxygenLocalization>(&i18n_asset_key(
+            &global_state.settings.language.selected_language,
+        ));
+        // Load fonts.
+        let fonts = ConrodVoxygenFonts::load(&voxygen_i18n.fonts, &mut ui)
+            .expect("Impossible to load fonts!");
 
         Self {
             ui,
             ids,
             imgs,
             rot_imgs,
-            fonts,
             username: networking.username.clone(),
             password: "".to_owned(),
             server_address: networking.servers[networking.default_server].clone(),
@@ -203,6 +208,8 @@ impl MainMenuUi {
             time: 0.0,
             show_disclaimer: global_state.settings.show_disclaimer,
             bg_img_id,
+            voxygen_i18n,
+            fonts,
         }
     }
 
@@ -220,10 +227,7 @@ impl MainMenuUi {
         const TEXT_COLOR_2: Color = Color::Rgba(1.0, 1.0, 1.0, 0.2);
         //const INACTIVE: Color = Color::Rgba(0.47, 0.47, 0.47, 0.47);
 
-        let localized_strings = load_expect::<VoxygenLocalization>(&i18n_asset_key(
-            &global_state.settings.language.selected_language,
-        ));
-        let intro_text = &localized_strings.get("main.login_process");
+        let intro_text = &self.voxygen_i18n.get("main.login_process");
 
         // Tooltip
         let _tooltip = Tooltip::new({
@@ -238,8 +242,9 @@ impl MainMenuUi {
                 5.0,
             )
         })
-        .title_font_size(15)
-        .desc_font_size(10)
+        .title_font_size(self.fonts.cyri.scale(15))
+        .desc_font_size(self.fonts.cyri.scale(10))
+        .font_id(self.fonts.cyri.conrod_id)
         .title_text_color(TEXT_COLOR)
         .desc_text_color(TEXT_COLOR_2);
 
@@ -256,45 +261,70 @@ impl MainMenuUi {
         Text::new(&version)
             .color(TEXT_COLOR)
             .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
-            .font_id(self.fonts.cyri)
-            .font_size(14)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.version, ui_widgets);
-        // Popup (Error/Info)
-        if let Some(popup_data) = &self.popup {
-            let text = Text::new(&popup_data.msg)
-                .rgba(1.0, 1.0, 1.0, if self.connect { fade_msg } else { 1.0 })
-                .font_id(self.fonts.cyri);
-            Rectangle::fill_with([65.0 * 6.0, 140.0], color::TRANSPARENT)
+
+        // Popup (Error/Info/AuthTrustPrompt)
+        let mut change_popup = None;
+        if let Some(PopupData { msg, popup_type }) = &self.popup {
+            let text = Text::new(msg)
+                .rgba(
+                    1.0,
+                    1.0,
+                    1.0,
+                    if let PopupType::ConnectionInfo = popup_type {
+                        fade_msg
+                    } else {
+                        1.0
+                    },
+                )
+                .font_id(self.fonts.cyri.conrod_id);
+            let (frame_w, frame_h) = if let PopupType::AuthTrustPrompt(_) = popup_type {
+                (65.0 * 8.0, 370.0)
+            } else {
+                (65.0 * 6.0, 140.0)
+            };
+            let error_bg = Rectangle::fill_with([frame_w, frame_h], color::TRANSPARENT)
                 .rgba(0.1, 0.1, 0.1, if self.connect { 0.0 } else { 1.0 })
-                .parent(ui_widgets.window)
-                .up_from(self.ids.banner_top, 15.0)
-                .set(self.ids.login_error_bg, ui_widgets);
+                .parent(ui_widgets.window);
+            if let PopupType::AuthTrustPrompt(_) = popup_type {
+                error_bg.middle_of(ui_widgets.window)
+            } else {
+                error_bg.up_from(self.ids.banner_top, 15.0)
+            }
+            .set(self.ids.login_error_bg, ui_widgets);
             Image::new(self.imgs.info_frame)
-                .w_h(65.0 * 6.0, 140.0)
+                .w_h(frame_w, frame_h)
                 .color(Some(Color::Rgba(
                     1.0,
                     1.0,
                     1.0,
-                    if self.connect { 0.0 } else { 1.0 },
+                    if let PopupType::ConnectionInfo = popup_type {
+                        0.0
+                    } else {
+                        1.0
+                    },
                 )))
                 .middle_of(self.ids.login_error_bg)
                 .set(self.ids.error_frame, ui_widgets);
-            if self.connect {
+            if let PopupType::ConnectionInfo = popup_type {
                 text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
-                    .font_id(self.fonts.alkhemi)
+                    .font_id(self.fonts.alkhemi.conrod_id)
                     .bottom_left_with_margins_on(ui_widgets.window, 60.0, 60.0)
-                    .font_size(70)
+                    .font_size(self.fonts.cyri.scale(70))
                     .set(self.ids.login_error, ui_widgets);
             } else {
                 text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
-                    .font_id(self.fonts.cyri)
-                    .font_size(25)
+                    .w(frame_w - 10.0 * 2.0)
+                    .font_id(self.fonts.cyri.conrod_id)
+                    .font_size(self.fonts.cyri.scale(25))
                     .set(self.ids.login_error, ui_widgets);
             };
             if Button::image(self.imgs.button)
                 .w_h(100.0, 30.0)
                 .mid_bottom_with_margin_on(
-                    if self.connect {
+                    if let PopupType::ConnectionInfo = popup_type {
                         ui_widgets.window
                     } else {
                         self.ids.login_error_bg
@@ -304,22 +334,55 @@ impl MainMenuUi {
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
                 .label_y(Relative::Scalar(2.0))
-                .label(&popup_data.button_text)
-                .label_font_id(self.fonts.cyri)
-                .label_font_size(15)
+                .label(match popup_type {
+                    PopupType::Error => self.voxygen_i18n.get("common.okay"),
+                    PopupType::ConnectionInfo => self.voxygen_i18n.get("common.cancel"),
+                    PopupType::AuthTrustPrompt(_) => self.voxygen_i18n.get("common.cancel"),
+                })
+                .label_font_id(self.fonts.cyri.conrod_id)
+                .label_font_size(self.fonts.cyri.scale(15))
                 .label_color(TEXT_COLOR)
                 .set(self.ids.button_ok, ui_widgets)
                 .was_clicked()
             {
-                match popup_data.popup_type {
+                match &popup_type {
+                    PopupType::Error => (),
                     PopupType::ConnectionInfo => {
                         events.push(Event::CancelLoginAttempt);
                     },
-                    _ => (),
+                    PopupType::AuthTrustPrompt(auth_server) => {
+                        events.push(Event::AuthServerTrust(auth_server.clone(), false));
+                    },
                 };
-                self.popup = None;
-            };
+                change_popup = Some(None);
+            }
+
+            if let PopupType::AuthTrustPrompt(auth_server) = popup_type {
+                if Button::image(self.imgs.button)
+                    .w_h(100.0, 30.0)
+                    .right_from(self.ids.button_ok, 10.0)
+                    .hover_image(self.imgs.button_hover)
+                    .press_image(self.imgs.button_press)
+                    .label_y(Relative::Scalar(2.0))
+                    .label("Add") // TODO: localize
+                    .label_font_id(self.fonts.cyri.conrod_id)
+                    .label_font_size(self.fonts.cyri.scale(15))
+                    .label_color(TEXT_COLOR)
+                    .set(self.ids.button_add_auth_trust, ui_widgets)
+                    .was_clicked()
+                {
+                    events.push(Event::AuthServerTrust(auth_server.clone(), true));
+                    change_popup = Some(Some(PopupData {
+                        msg: self.voxygen_i18n.get("main.connecting").into(),
+                        popup_type: PopupType::ConnectionInfo,
+                    }));
+                }
+            }
         }
+        if let Some(p) = change_popup {
+            self.popup = p;
+        }
+
         if !self.connect {
             Image::new(self.imgs.banner)
                 .w_h(65.0 * 6.0, 100.0 * 6.0)
@@ -328,14 +391,14 @@ impl MainMenuUi {
                 .set(self.ids.banner, ui_widgets);
 
             Image::new(self.imgs.banner_top)
-                .w_h(65.0 * 6.0, 1.0 * 6.0)
-                .mid_top_with_margin_on(self.ids.banner, 0.0)
+                .w_h(70.0 * 6.0, 34.0)
+                .mid_top_with_margin_on(self.ids.banner, -34.0)
                 .set(self.ids.banner_top, ui_widgets);
 
             // Logo
             Image::new(self.imgs.v_logo)
                 .w_h(123.0 * 2.5, 35.0 * 2.5)
-                .mid_top_with_margin_on(self.ids.banner_top, 40.0)
+                .mid_top_with_margin_on(self.ids.banner_top, 45.0)
                 .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.95)))
                 .set(self.ids.v_logo, ui_widgets);
 
@@ -347,16 +410,16 @@ impl MainMenuUi {
                     .scroll_kids_vertically()
                     .set(self.ids.disc_window, ui_widgets);
 
-                Text::new(&localized_strings.get("common.disclaimer"))
+                Text::new(&self.voxygen_i18n.get("common.disclaimer"))
                     .top_left_with_margins_on(self.ids.disc_window, 30.0, 40.0)
-                    .font_size(35)
-                    .font_id(self.fonts.alkhemi)
+                    .font_size(self.fonts.cyri.scale(35))
+                    .font_id(self.fonts.alkhemi.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.disc_text_1, ui_widgets);
-                Text::new(&localized_strings.get("main.notice"))
+                Text::new(&self.voxygen_i18n.get("main.notice"))
                     .top_left_with_margins_on(self.ids.disc_window, 110.0, 40.0)
-                    .font_size(26)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(26))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.disc_text_2, ui_widgets);
                 if Button::image(self.imgs.button)
@@ -366,9 +429,9 @@ impl MainMenuUi {
                     .press_image(self.imgs.button_press)
                     .label_y(Relative::Scalar(2.0))
                     .label("Accept")
-                    .label_font_size(22)
+                    .label_font_size(self.fonts.cyri.scale(22))
                     .label_color(TEXT_COLOR)
-                    .label_font_id(self.fonts.cyri)
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .set(self.ids.disc_button, ui_widgets)
                     .was_clicked()
                 {
@@ -384,8 +447,7 @@ impl MainMenuUi {
                         self.connect = true;
                         self.connecting = Some(std::time::Instant::now());
                         self.popup = Some(PopupData {
-                            msg: [localized_strings.get("main.connecting"), "..."].concat(),
-                            button_text: localized_strings.get("common.cancel").to_owned(),
+                            msg: [self.voxygen_i18n.get("main.connecting"), "..."].concat(),
                             popup_type: PopupType::ConnectionInfo,
                         });
 
@@ -397,7 +459,7 @@ impl MainMenuUi {
                     };
                 }
                 // Info Window
-                Rectangle::fill_with([550.0, 200.0], color::BLACK)
+                Rectangle::fill_with([550.0, 400.0], color::BLACK)
                     .top_left_with_margins_on(ui_widgets.window, 40.0, 40.0)
                     .color(Color::Rgba(0.0, 0.0, 0.0, 0.95))
                     .set(self.ids.info_frame, ui_widgets);
@@ -408,8 +470,8 @@ impl MainMenuUi {
                     .set(self.ids.info_bottom, ui_widgets);
                 Text::new(intro_text)
                     .top_left_with_margins_on(self.ids.info_frame, 15.0, 15.0)
-                    .font_size(20)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(20))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.info_text, ui_widgets);
 
@@ -422,8 +484,7 @@ impl MainMenuUi {
                         self.connect = true;
                         self.connecting = Some(std::time::Instant::now());
                         self.popup = Some(PopupData {
-                            msg: [localized_strings.get("main.creating_world"), "..."].concat(),
-                            button_text: localized_strings.get("common.cancel").to_owned(),
+                            msg: [self.voxygen_i18n.get("main.creating_world"), "..."].concat(),
                             popup_type: PopupType::ConnectionInfo,
                         });
                     };
@@ -433,15 +494,15 @@ impl MainMenuUi {
                 Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
                     .mid_top_with_margin_on(self.ids.banner_top, 160.0)
                     .set(self.ids.usrnm_bg, ui_widgets);
-                Image::new(self.imgs.input_bg)
+                Image::new(self.imgs.input_bg_top)
                     .w_h(337.0, 67.0)
                     .middle_of(self.ids.usrnm_bg)
                     .set(self.ids.username_bg, ui_widgets);
                 for event in TextBox::new(&self.username)
                     .w_h(290.0, 30.0)
-                    .mid_bottom_with_margin_on(self.ids.username_bg, 44.0 / 2.0)
-                    .font_size(22)
-                    .font_id(self.fonts.cyri)
+                    .mid_bottom_with_margin_on(self.ids.username_bg, 38.0 / 2.0)
+                    .font_size(self.fonts.cyri.scale(22))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .text_color(TEXT_COLOR)
                     // transparent background
                     .color(TRANSPARENT)
@@ -459,36 +520,36 @@ impl MainMenuUi {
                     }
                 }
                 // Password
-                // TODO: REACTIVATE THIS WHEN A PROPER ACCOUNT SYSTEM IS IN PLACE
-                /*Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
+                Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
                     .down_from(self.ids.usrnm_bg, 30.0)
                     .set(self.ids.passwd_bg, ui_widgets);
-                Image::new(self.imgs.input_bg)
+                Image::new(self.imgs.input_bg_mid)
                     .w_h(337.0, 67.0)
                     .middle_of(self.ids.passwd_bg)
-                    .color(Some(INACTIVE))
                     .set(self.ids.password_bg, ui_widgets);
                 for event in TextBox::new(&self.password)
                     .w_h(290.0, 30.0)
                     .mid_bottom_with_margin_on(self.ids.password_bg, 44.0 / 2.0)
-                    .font_size(22)
-                    .font_id(self.fonts.cyri)
+                    .font_size(self.fonts.cyri.scale(22))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .text_color(TEXT_COLOR)
                     // transparent background
                     .color(TRANSPARENT)
                     .border_color(TRANSPARENT)
+                    .hide_text("*")
                     .set(self.ids.password_field, ui_widgets)
                 {
                     match event {
                         TextBoxEvent::Update(password) => {
                             // Note: TextBox limits the input string length to what fits in it
                             self.password = password;
-                        }
+                        },
                         TextBoxEvent::Enter => {
                             login!();
-                        }
+                        },
                     }
-                }*/
+                }
+
                 if self.show_servers {
                     Image::new(self.imgs.info_frame)
                         .mid_top_with_margin_on(self.ids.username_bg, -320.0)
@@ -524,8 +585,8 @@ impl MainMenuUi {
                                     //.press_image(self.imgs.button_press)
                                     .label_y(Relative::Scalar(2.0))
                                     .label(&text)
-                                    .label_font_size(20)
-                                    .label_font_id(self.fonts.cyri)
+                                    .label_font_size(self.fonts.cyri.scale(20))
+                                    .label_font_id(self.fonts.cyri.conrod_id)
                                     .label_color(TEXT_COLOR),
                                 ui_widgets,
                             )
@@ -542,9 +603,9 @@ impl MainMenuUi {
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
                         .label_y(Relative::Scalar(2.0))
-                        .label(&localized_strings.get("common.close"))
-                        .label_font_size(20)
-                        .label_font_id(self.fonts.cyri)
+                        .label(&self.voxygen_i18n.get("common.close"))
+                        .label_font_size(self.fonts.cyri.scale(20))
+                        .label_font_id(self.fonts.cyri.conrod_id)
                         .label_color(TEXT_COLOR)
                         .set(self.ids.servers_close, ui_widgets)
                         .was_clicked()
@@ -554,17 +615,17 @@ impl MainMenuUi {
                 }
                 // Server address
                 Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
-                    .down_from(self.ids.usrnm_bg, 30.0)
+                    .down_from(self.ids.passwd_bg, 30.0)
                     .set(self.ids.srvr_bg, ui_widgets);
-                Image::new(self.imgs.input_bg)
+                Image::new(self.imgs.input_bg_bot)
                     .w_h(337.0, 67.0)
                     .middle_of(self.ids.srvr_bg)
                     .set(self.ids.address_bg, ui_widgets);
                 for event in TextBox::new(&self.server_address)
                     .w_h(290.0, 30.0)
-                    .mid_bottom_with_margin_on(self.ids.address_bg, 44.0 / 2.0)
-                    .font_size(22)
-                    .font_id(self.fonts.cyri)
+                    .mid_top_with_margin_on(self.ids.address_bg, 28.0 / 2.0)
+                    .font_size(self.fonts.cyri.scale(22))
+                    .font_id(self.fonts.cyri.conrod_id)
                     .text_color(TEXT_COLOR)
                     // transparent background
                     .color(TRANSPARENT)
@@ -580,6 +641,7 @@ impl MainMenuUi {
                         },
                     }
                 }
+
                 // Login button
                 if Button::image(self.imgs.button)
                     .hover_image(self.imgs.button_hover)
@@ -587,10 +649,10 @@ impl MainMenuUi {
                     .w_h(258.0, 55.0)
                     .down_from(self.ids.address_bg, 20.0)
                     .align_middle_x_of(self.ids.address_bg)
-                    .label(&localized_strings.get("common.multiplayer"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("common.multiplayer"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
-                    .label_font_size(22)
+                    .label_font_size(self.fonts.cyri.scale(22))
                     .label_y(Relative::Scalar(5.0))
                     /*.with_tooltip(
                         tooltip_manager,
@@ -614,10 +676,10 @@ impl MainMenuUi {
                         .w_h(258.0, 55.0)
                         .down_from(self.ids.login_button, 20.0)
                         .align_middle_x_of(self.ids.address_bg)
-                        .label(&localized_strings.get("common.singleplayer"))
-                        .label_font_id(self.fonts.cyri)
+                        .label(&self.voxygen_i18n.get("common.singleplayer"))
+                        .label_font_id(self.fonts.cyri.conrod_id)
                         .label_color(TEXT_COLOR)
-                        .label_font_size(22)
+                        .label_font_size(self.fonts.cyri.scale(22))
                         .label_y(Relative::Scalar(5.0))
                         .label_x(Relative::Scalar(2.0))
                         .set(self.ids.singleplayer_button, ui_widgets)
@@ -632,10 +694,10 @@ impl MainMenuUi {
                     .bottom_left_with_margins_on(ui_widgets.window, 60.0, 30.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("common.quit"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("common.quit"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
-                    .label_font_size(20)
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(Relative::Scalar(3.0))
                     .set(self.ids.quit_button, ui_widgets)
                     .was_clicked()
@@ -649,10 +711,10 @@ impl MainMenuUi {
                     .up_from(self.ids.quit_button, 8.0)
                     //.hover_image(self.imgs.button_hover)
                     //.press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("common.settings"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("common.settings"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR_2)
-                    .label_font_size(20)
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(Relative::Scalar(3.0))
                     .set(self.ids.settings_button, ui_widgets)
                     .was_clicked()
@@ -666,10 +728,10 @@ impl MainMenuUi {
                     .up_from(self.ids.settings_button, 8.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&localized_strings.get("common.servers"))
-                    .label_font_id(self.fonts.cyri)
+                    .label(&self.voxygen_i18n.get("common.servers"))
+                    .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
-                    .label_font_size(20)
+                    .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(Relative::Scalar(3.0))
                     .set(self.ids.servers_button, ui_widgets)
                     .was_clicked()
@@ -682,10 +744,22 @@ impl MainMenuUi {
         events
     }
 
-    pub fn show_info(&mut self, msg: String, button_text: String) {
+    pub fn auth_trust_prompt(&mut self, auth_server: String) {
+        self.popup = Some(PopupData {
+            msg: format!(
+                "Warning: The server you are trying to connect to has provided this \
+                 authentication server address:\n\n{}\n\nbut it is not in your list of trusted \
+                 authentication servers.\n\nMake sure that you trust this site and owner to not \
+                 try and bruteforce your password!",
+                &auth_server
+            ),
+            popup_type: PopupType::AuthTrustPrompt(auth_server),
+        })
+    }
+
+    pub fn show_info(&mut self, msg: String) {
         self.popup = Some(PopupData {
             msg,
-            button_text,
             popup_type: PopupType::Error,
         });
         self.connecting = None;
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index c797fcd96e..4e6fd5b282 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -26,6 +26,7 @@ gfx_defines! {
         light_shadow_count: [u32; 4] = "light_shadow_count",
         medium: [u32; 4] = "medium",
         select_pos: [i32; 4] = "select_pos",
+        gamma: [f32; 4] = "gamma",
     }
 
     constant Light {
@@ -53,6 +54,7 @@ impl Globals {
         shadow_count: usize,
         medium: BlockKind,
         select_pos: Option<Vec3<i32>>,
+        gamma: f32,
     ) -> Self {
         Self {
             view_mat: arr_to_mat(view_mat.into_col_array()),
@@ -70,6 +72,7 @@ impl Globals {
                 .map(|sp| Vec4::from(sp) + Vec4::unit_w())
                 .unwrap_or(Vec4::zero())
                 .into_array(),
+            gamma: [gamma; 4],
         }
     }
 }
@@ -89,6 +92,7 @@ impl Default for Globals {
             0,
             BlockKind::Air,
             None,
+            1.0,
         )
     }
 }
diff --git a/voxygen/src/scene/camera.rs b/voxygen/src/scene/camera.rs
index a0d0d59e54..9eb279d3c5 100644
--- a/voxygen/src/scene/camera.rs
+++ b/voxygen/src/scene/camera.rs
@@ -1,4 +1,3 @@
-use client::Client;
 use common::vol::{ReadVol, Vox};
 use std::f32::consts::PI;
 use treeculler::Frustum;
@@ -22,6 +21,13 @@ impl Default for CameraMode {
     fn default() -> Self { Self::ThirdPerson }
 }
 
+#[derive(Clone)]
+pub struct Dependents {
+    pub view_mat: Mat4<f32>,
+    pub proj_mat: Mat4<f32>,
+    pub cam_pos: Vec3<f32>,
+}
+
 pub struct Camera {
     tgt_focus: Vec3<f32>,
     focus: Vec3<f32>,
@@ -33,6 +39,8 @@ pub struct Camera {
     mode: CameraMode,
 
     last_time: Option<f64>,
+
+    dependents: Dependents,
 }
 
 impl Camera {
@@ -49,12 +57,18 @@ impl Camera {
             mode,
 
             last_time: None,
+
+            dependents: Dependents {
+                view_mat: Mat4::identity(),
+                proj_mat: Mat4::identity(),
+                cam_pos: Vec3::zero(),
+            },
         }
     }
 
     /// Compute the transformation matrices (view matrix and projection matrix)
     /// and position of the camera.
-    pub fn compute_dependents(&self, client: &Client) -> (Mat4<f32>, Mat4<f32>, Vec3<f32>) {
+    pub fn compute_dependents(&mut self, terrain: &impl ReadVol) {
         let dist = {
             let (start, end) = (
                 self.focus
@@ -66,9 +80,7 @@ impl Camera {
                 self.focus,
             );
 
-            match client
-                .state()
-                .terrain()
+            match terrain
                 .ray(start, end)
                 .ignore_error()
                 .max_iter(500)
@@ -82,7 +94,7 @@ impl Camera {
             .max(0.0)
         };
 
-        let view_mat = Mat4::<f32>::identity()
+        self.dependents.view_mat = Mat4::<f32>::identity()
             * Mat4::translation_3d(-Vec3::unit_z() * dist)
             * Mat4::rotation_z(self.ori.z)
             * Mat4::rotation_x(self.ori.y)
@@ -90,20 +102,21 @@ impl Camera {
             * Mat4::rotation_3d(PI / 2.0, -Vec4::unit_x())
             * Mat4::translation_3d(-self.focus);
 
-        let proj_mat = Mat4::perspective_rh_no(self.fov, self.aspect, NEAR_PLANE, FAR_PLANE);
+        self.dependents.proj_mat =
+            Mat4::perspective_rh_no(self.fov, self.aspect, NEAR_PLANE, FAR_PLANE);
 
         // TODO: Make this more efficient.
-        let cam_pos = Vec3::from(view_mat.inverted() * Vec4::unit_w());
-
-        (view_mat, proj_mat, cam_pos)
+        self.dependents.cam_pos = Vec3::from(self.dependents.view_mat.inverted() * Vec4::unit_w());
     }
 
-    pub fn frustum(&self, client: &Client) -> Frustum<f32> {
-        let (view_mat, proj_mat, _) = self.compute_dependents(client);
-
-        Frustum::from_modelview_projection((proj_mat * view_mat).into_col_arrays())
+    pub fn frustum(&self) -> Frustum<f32> {
+        Frustum::from_modelview_projection(
+            (self.dependents.proj_mat * self.dependents.view_mat).into_col_arrays(),
+        )
     }
 
+    pub fn dependents(&self) -> Dependents { self.dependents.clone() }
+
     /// Rotate the camera about its focus by the given delta, limiting the input
     /// accordingly.
     pub fn rotate_by(&mut self, delta: Vec3<f32>) {
diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
index fdf0aef8cd..dcace2126d 100644
--- a/voxygen/src/scene/figure/cache.rs
+++ b/voxygen/src/scene/figure/cache.rs
@@ -172,19 +172,6 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
                                         },
                                         CameraMode::FirstPerson => None,
                                     },
-                                    if camera_mode != CameraMode::FirstPerson
-                                        || character_state
-                                            .map(|cs| {
-                                                cs.action.is_attack()
-                                                    || cs.action.is_block()
-                                                    || cs.action.is_wield()
-                                            })
-                                            .unwrap_or_default()
-                                    {
-                                        Some(mesh_main(equipment.and_then(|e| e.main.as_ref())))
-                                    } else {
-                                        None
-                                    },
                                     match camera_mode {
                                         CameraMode::ThirdPerson => Some(
                                             humanoid_armor_shoulder_spec.mesh_left_shoulder(&body),
@@ -198,6 +185,19 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
                                         CameraMode::FirstPerson => None,
                                     },
                                     Some(mesh_glider()),
+                                    if camera_mode != CameraMode::FirstPerson
+                                        || character_state
+                                            .map(|cs| {
+                                                cs.action.is_attack()
+                                                    || cs.action.is_block()
+                                                    || cs.action.is_wield()
+                                            })
+                                            .unwrap_or_default()
+                                    {
+                                        Some(mesh_main(equipment.and_then(|e| e.main.as_ref())))
+                                    } else {
+                                        None
+                                    },
                                     Some(mesh_lantern()),
                                     None,
                                     None,
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 9feaf4f7f1..47a0674246 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1,5 +1,5 @@
 mod cache;
-mod load;
+pub mod load;
 
 pub use cache::FigureModelCache;
 pub use load::load_mesh; // TODO: Don't make this public.
@@ -13,14 +13,17 @@ use crate::{
         quadruped_small::QuadrupedSmallSkeleton, Animation, Skeleton,
     },
     render::{Consts, FigureBoneData, FigureLocals, Globals, Light, Renderer, Shadow},
-    scene::camera::{Camera, CameraMode},
+    scene::{
+        camera::{Camera, CameraMode},
+        SceneData,
+    },
 };
-use client::Client;
 use common::{
     comp::{
         ActionState::*, Body, CharacterState, ItemKind, Last, MovementState::*, Ori, Pos, Scale,
         Stats, Vel,
     },
+    state::State,
     terrain::TerrainChunk,
     vol::RectRasterableVol,
 };
@@ -96,17 +99,18 @@ impl FigureMgr {
         self.biped_large_model_cache.clean(tick);
     }
 
-    pub fn maintain(&mut self, renderer: &mut Renderer, client: &Client, camera: &Camera) {
-        let time = client.state().get_time();
-        let tick = client.get_tick();
-        let ecs = client.state().ecs();
-        let view_distance = client.view_distance().unwrap_or(1);
-        let dt = client.state().get_delta_time();
-        let frustum = camera.frustum(client);
+    pub fn maintain(&mut self, renderer: &mut Renderer, scene_data: &SceneData, camera: &Camera) {
+        let state = scene_data.state;
+        let time = state.get_time();
+        let tick = scene_data.tick;
+        let ecs = state.ecs();
+        let view_distance = scene_data.view_distance;
+        let dt = state.get_delta_time();
+        let frustum = camera.frustum();
         // Get player position.
         let player_pos = ecs
             .read_storage::<Pos>()
-            .get(client.entity())
+            .get(scene_data.player_entity)
             .map_or(Vec3::zero(), |pos| pos.0);
 
         for (entity, pos, ori, scale, body, character, last_character, stats) in (
@@ -1181,7 +1185,7 @@ impl FigureMgr {
             }
         }
 
-        // Clear states that have dead entities.
+        // Clear states that have deleted entities.
         self.character_states
             .retain(|entity, _| ecs.entities().is_alive(*entity));
         self.quadruped_small_states
@@ -1209,19 +1213,18 @@ impl FigureMgr {
     pub fn render(
         &mut self,
         renderer: &mut Renderer,
-        client: &mut Client,
+        state: &State,
+        player_entity: EcsEntity,
+        tick: u64,
         globals: &Consts<Globals>,
         lights: &Consts<Light>,
         shadows: &Consts<Shadow>,
         camera: &Camera,
     ) {
-        let tick = client.get_tick();
-        let ecs = client.state().ecs();
+        let ecs = state.ecs();
 
-        let character_state_storage = client
-            .state()
-            .read_storage::<common::comp::CharacterState>();
-        let character_state = character_state_storage.get(client.entity());
+        let character_state_storage = state.read_storage::<common::comp::CharacterState>();
+        let character_state = character_state_storage.get(player_entity);
 
         for (entity, _, _, body, stats, _) in (
             &ecs.entities(),
@@ -1235,7 +1238,7 @@ impl FigureMgr {
             // Don't render dead entities
             .filter(|(_, _, _, _, stats, _)| stats.map_or(true, |s| !s.is_dead))
         {
-            let is_player = entity == client.entity();
+            let is_player = entity == player_entity;
             let player_camera_mode = if is_player {
                 camera.get_mode()
             } else {
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index fd54ae6b62..02996bca7e 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -1,29 +1,29 @@
 pub mod camera;
 pub mod figure;
+pub mod simple;
 pub mod terrain;
 
 use self::{
     camera::{Camera, CameraMode},
     figure::FigureMgr,
-    music::MusicMgr,
     terrain::Terrain,
 };
 use crate::{
     anim::character::SkeletonAttr,
-    audio::{music, sfx::SfxMgr, AudioFrontend},
+    audio::{music::MusicMgr, sfx::SfxMgr, AudioFrontend},
     render::{
         create_pp_mesh, create_skybox_mesh, Consts, Globals, Light, Model, PostProcessLocals,
         PostProcessPipeline, Renderer, Shadow, SkyboxLocals, SkyboxPipeline,
     },
-    window::Event,
+    window::{AnalogGameInput, Event},
 };
-use client::Client;
 use common::{
     comp,
+    state::State,
     terrain::{BlockKind, TerrainChunk},
     vol::ReadVol,
 };
-use specs::{Join, WorldExt};
+use specs::{Entity as EcsEntity, Join, WorldExt};
 use vek::*;
 
 // TODO: Don't hard-code this.
@@ -50,6 +50,7 @@ pub struct Scene {
     lights: Consts<Light>,
     shadows: Consts<Shadow>,
     camera: Camera,
+    camera_input_state: Vec2<f32>,
 
     skybox: Skybox,
     postprocess: PostProcess,
@@ -62,6 +63,15 @@ pub struct Scene {
     music_mgr: MusicMgr,
 }
 
+pub struct SceneData<'a> {
+    pub state: &'a State,
+    pub player_entity: specs::Entity,
+    pub loaded_distance: f32,
+    pub view_distance: u32,
+    pub tick: u64,
+    pub thread_pool: &'a uvth::ThreadPool,
+}
+
 impl Scene {
     /// Create a new `Scene` with default parameters.
     pub fn new(renderer: &mut Renderer) -> Self {
@@ -76,6 +86,7 @@ impl Scene {
                 .create_consts(&[Shadow::default(); MAX_SHADOW_COUNT])
                 .unwrap(),
             camera: Camera::new(resolution.x / resolution.y, CameraMode::ThirdPerson),
+            camera_input_state: Vec2::zero(),
 
             skybox: Skybox {
                 model: renderer.create_model(&create_skybox_mesh()).unwrap(),
@@ -137,6 +148,17 @@ impl Scene {
                     .zoom_switch(delta * (0.05 + self.camera.get_distance() * 0.01));
                 true
             },
+            Event::AnalogGameInput(input) => match input {
+                AnalogGameInput::CameraX(d) => {
+                    self.camera_input_state.x = d;
+                    true
+                },
+                AnalogGameInput::CameraY(d) => {
+                    self.camera_input_state.y = d;
+                    true
+                },
+                _ => false,
+            },
             // All other events are unhandled
             _ => false,
         }
@@ -148,33 +170,40 @@ impl Scene {
         &mut self,
         renderer: &mut Renderer,
         audio: &mut AudioFrontend,
-        client: &Client,
+        scene_data: &SceneData,
+        gamma: f32,
     ) {
         // Get player position.
-        let player_pos = client
-            .state()
+        let player_pos = scene_data
+            .state
             .ecs()
             .read_storage::<comp::Pos>()
-            .get(client.entity())
+            .get(scene_data.player_entity)
             .map_or(Vec3::zero(), |pos| pos.0);
 
-        let player_rolling = client
-            .state()
+        let player_rolling = scene_data
+            .state
             .ecs()
             .read_storage::<comp::CharacterState>()
-            .get(client.entity())
+            .get(scene_data.player_entity)
             .map_or(false, |cs| cs.action.is_roll());
 
-        let player_scale = match client
-            .state()
+        let player_scale = match scene_data
+            .state
             .ecs()
             .read_storage::<comp::Body>()
-            .get(client.entity())
+            .get(scene_data.player_entity)
         {
             Some(comp::Body::Humanoid(body)) => SkeletonAttr::calculate_scale(body),
             _ => 1_f32,
         };
 
+        // Add the analog input to camera
+        self.camera
+            .rotate_by(Vec3::from([self.camera_input_state.x, 0.0, 0.0]));
+        self.camera
+            .rotate_by(Vec3::from([0.0, self.camera_input_state.y, 0.0]));
+
         // Alter camera position to match player.
         let tilt = self.camera.get_orientation().y;
         let dist = self.camera.get_distance();
@@ -195,25 +224,30 @@ impl Scene {
         );
 
         // Tick camera for interpolation.
-        self.camera.update(client.state().get_time());
+        self.camera.update(scene_data.state.get_time());
 
         // Compute camera matrices.
-        let (view_mat, proj_mat, cam_pos) = self.camera.compute_dependents(client);
+        self.camera.compute_dependents(&*scene_data.state.terrain());
+        let camera::Dependents {
+            view_mat,
+            proj_mat,
+            cam_pos,
+        } = self.camera.dependents();
 
         // Update chunk loaded distance smoothly for nice shader fog
-        let loaded_distance = client.loaded_distance();
-        self.loaded_distance = (0.98 * self.loaded_distance + 0.02 * loaded_distance).max(0.01);
+        self.loaded_distance =
+            (0.98 * self.loaded_distance + 0.02 * scene_data.loaded_distance).max(0.01);
 
         // Update light constants
         let mut lights = (
-            &client.state().ecs().read_storage::<comp::Pos>(),
-            client.state().ecs().read_storage::<comp::Ori>().maybe(),
-            client
-                .state()
+            &scene_data.state.ecs().read_storage::<comp::Pos>(),
+            scene_data.state.ecs().read_storage::<comp::Ori>().maybe(),
+            scene_data
+                .state
                 .ecs()
                 .read_storage::<crate::ecs::comp::Interpolated>()
                 .maybe(),
-            &client.state().ecs().read_storage::<comp::LightEmitter>(),
+            &scene_data.state.ecs().read_storage::<comp::LightEmitter>(),
         )
             .join()
             .filter(|(pos, _, _, _)| {
@@ -246,15 +280,15 @@ impl Scene {
 
         // Update shadow constants
         let mut shadows = (
-            &client.state().ecs().read_storage::<comp::Pos>(),
-            client
-                .state()
+            &scene_data.state.ecs().read_storage::<comp::Pos>(),
+            scene_data
+                .state
                 .ecs()
                 .read_storage::<crate::ecs::comp::Interpolated>()
                 .maybe(),
-            client.state().ecs().read_storage::<comp::Scale>().maybe(),
-            &client.state().ecs().read_storage::<comp::Body>(),
-            &client.state().ecs().read_storage::<comp::Stats>(),
+            scene_data.state.ecs().read_storage::<comp::Scale>().maybe(),
+            &scene_data.state.ecs().read_storage::<comp::Body>(),
+            &scene_data.state.ecs().read_storage::<comp::Stats>(),
         )
             .join()
             .filter(|(_, _, _, _, stats)| !stats.is_dead)
@@ -284,25 +318,26 @@ impl Scene {
                 cam_pos,
                 self.camera.get_focus_pos(),
                 self.loaded_distance,
-                client.state().get_time_of_day(),
-                client.state().get_time(),
+                scene_data.state.get_time_of_day(),
+                scene_data.state.get_time(),
                 renderer.get_resolution(),
                 lights.len(),
                 shadows.len(),
-                client
-                    .state()
+                scene_data
+                    .state
                     .terrain()
                     .get(cam_pos.map(|e| e.floor() as i32))
                     .map(|b| b.kind())
                     .unwrap_or(BlockKind::Air),
                 self.select_pos,
+                gamma,
             )])
             .expect("Failed to update global constants");
 
         // Maintain the terrain.
         self.terrain.maintain(
             renderer,
-            client,
+            &scene_data,
             self.camera.get_focus_pos(),
             self.loaded_distance,
             view_mat,
@@ -310,22 +345,31 @@ impl Scene {
         );
 
         // Maintain the figures.
-        self.figure_mgr.maintain(renderer, client, &self.camera);
+        self.figure_mgr.maintain(renderer, scene_data, &self.camera);
 
         // Remove unused figures.
-        self.figure_mgr.clean(client.get_tick());
+        self.figure_mgr.clean(scene_data.tick);
 
         // Maintain audio
-        self.sfx_mgr.maintain(audio, client);
-        self.music_mgr.maintain(audio, client);
+        self.sfx_mgr
+            .maintain(audio, scene_data.state, scene_data.player_entity);
+        self.music_mgr.maintain(audio, scene_data.state);
     }
 
     /// Render the scene using the provided `Renderer`.
-    pub fn render(&mut self, renderer: &mut Renderer, client: &mut Client) {
+    pub fn render(
+        &mut self,
+        renderer: &mut Renderer,
+        state: &State,
+        player_entity: EcsEntity,
+        tick: u64,
+    ) {
         // Render terrain and figures.
         self.figure_mgr.render(
             renderer,
-            client,
+            state,
+            player_entity,
+            tick,
             &self.globals,
             &self.lights,
             &self.shadows,
diff --git a/voxygen/src/menu/char_selection/scene.rs b/voxygen/src/scene/simple.rs
similarity index 66%
rename from voxygen/src/menu/char_selection/scene.rs
rename to voxygen/src/scene/simple.rs
index a28d502dfd..c12a6f9641 100644
--- a/voxygen/src/menu/char_selection/scene.rs
+++ b/voxygen/src/scene/simple.rs
@@ -9,21 +9,37 @@ use crate::{
         PostProcessLocals, PostProcessPipeline, Renderer, Shadow, SkyboxLocals, SkyboxPipeline,
     },
     scene::{
-        camera::{Camera, CameraMode},
+        camera::{self, Camera, CameraMode},
         figure::{load_mesh, FigureModelCache, FigureState},
     },
     window::{Event, PressState},
 };
-use client::Client;
 use common::{
     comp::{humanoid, Body, Equipment},
-    state::DeltaTime,
     terrain::BlockKind,
+    vol::{BaseVol, ReadVol, Vox},
 };
 use log::error;
-use specs::WorldExt;
 use vek::*;
 
+#[derive(PartialEq, Eq, Copy, Clone)]
+struct VoidVox;
+impl Vox for VoidVox {
+    fn empty() -> Self { VoidVox }
+
+    fn is_empty(&self) -> bool { true }
+
+    fn or(self, _other: Self) -> Self { VoidVox }
+}
+struct VoidVol;
+impl BaseVol for VoidVol {
+    type Error = ();
+    type Vox = VoidVox;
+}
+impl ReadVol for VoidVol {
+    fn get<'a>(&'a self, _pos: Vec3<i32>) -> Result<&'a Self::Vox, Self::Error> { Ok(&VoidVox) }
+}
+
 struct Skybox {
     model: Model<SkyboxPipeline>,
     locals: Consts<SkyboxLocals>,
@@ -42,8 +58,7 @@ pub struct Scene {
 
     skybox: Skybox,
     postprocess: PostProcess,
-    backdrop_model: Model<FigurePipeline>,
-    backdrop_state: FigureState<FixtureSkeleton>,
+    backdrop: Option<(Model<FigurePipeline>, FigureState<FixtureSkeleton>)>,
 
     figure_model_cache: FigureModelCache,
     figure_state: FigureState<CharacterSkeleton>,
@@ -52,15 +67,28 @@ pub struct Scene {
     char_ori: f32,
 }
 
+pub struct SceneData {
+    pub time: f64,
+    pub delta_time: f32,
+    pub tick: u64,
+    pub body: Option<humanoid::Body>,
+    pub gamma: f32,
+}
+
 impl Scene {
-    pub fn new(renderer: &mut Renderer) -> Self {
+    pub fn new(renderer: &mut Renderer, backdrop: Option<&str>) -> Self {
         let resolution = renderer.get_resolution().map(|e| e as f32);
 
+        let mut camera = Camera::new(resolution.x / resolution.y, CameraMode::ThirdPerson);
+        camera.set_focus_pos(Vec3::unit_z() * 1.5);
+        camera.set_distance(3.0); // 4.2
+        camera.set_orientation(Vec3::new(0.0, 0.0, 0.0));
+
         Self {
             globals: renderer.create_consts(&[Globals::default()]).unwrap(),
             lights: renderer.create_consts(&[Light::default(); 32]).unwrap(),
             shadows: renderer.create_consts(&[Shadow::default(); 32]).unwrap(),
-            camera: Camera::new(resolution.x / resolution.y, CameraMode::ThirdPerson),
+            camera,
 
             skybox: Skybox {
                 model: renderer.create_model(&create_skybox_mesh()).unwrap(),
@@ -75,13 +103,14 @@ impl Scene {
             figure_model_cache: FigureModelCache::new(),
             figure_state: FigureState::new(renderer, CharacterSkeleton::new()),
 
-            backdrop_model: renderer
-                .create_model(&load_mesh(
-                    "fixture.selection_bg",
-                    Vec3::new(-55.0, -49.5, -2.0),
-                ))
-                .unwrap(),
-            backdrop_state: FigureState::new(renderer, FixtureSkeleton::new()),
+            backdrop: backdrop.map(|specifier| {
+                (
+                    renderer
+                        .create_model(&load_mesh(specifier, Vec3::new(-55.0, -49.5, -2.0)))
+                        .unwrap(),
+                    FigureState::new(renderer, FixtureSkeleton::new()),
+                )
+            }),
 
             turning: false,
             char_ori: 0.0,
@@ -90,6 +119,8 @@ impl Scene {
 
     pub fn globals(&self) -> &Consts<Globals> { &self.globals }
 
+    pub fn camera_mut(&mut self) -> &mut Camera { &mut self.camera }
+
     /// Handle an incoming user input event (e.g.: cursor moved, key pressed,
     /// window closed).
     ///
@@ -114,21 +145,17 @@ impl Scene {
         }
     }
 
-    pub fn maintain(
-        &mut self,
-        renderer: &mut Renderer,
-        client: &Client,
-        body: Option<humanoid::Body>,
-    ) {
-        self.camera.set_focus_pos(Vec3::unit_z() * 1.5);
-        self.camera.update(client.state().get_time());
-        self.camera.set_distance(3.0); // 4.2
-        self.camera
-            .set_orientation(Vec3::new(client.state().get_time() as f32 * 0.0, 0.0, 0.0));
+    pub fn maintain(&mut self, renderer: &mut Renderer, scene_data: SceneData) {
+        self.camera.update(scene_data.time);
 
-        let (view_mat, proj_mat, cam_pos) = self.camera.compute_dependents(client);
-        const VD: f32 = 115.0; //View Distance
-        const TIME: f64 = 43200.0; // hours*3600 seconds
+        self.camera.compute_dependents(&VoidVol);
+        let camera::Dependents {
+            view_mat,
+            proj_mat,
+            cam_pos,
+        } = self.camera.dependents();
+        const VD: f32 = 115.0; // View Distance
+        const TIME: f64 = 43200.0; // 12 hours*3600 seconds
         if let Err(err) = renderer.update_consts(&mut self.globals, &[Globals::new(
             view_mat,
             proj_mat,
@@ -136,30 +163,30 @@ impl Scene {
             self.camera.get_focus_pos(),
             VD,
             TIME,
-            client.state().get_time(),
+            scene_data.time,
             renderer.get_resolution(),
             0,
             0,
             BlockKind::Air,
             None,
+            scene_data.gamma,
         )]) {
             error!("Renderer failed to update: {:?}", err);
         }
 
-        self.figure_model_cache.clean(client.get_tick());
+        self.figure_model_cache.clean(scene_data.tick);
 
-        if let Some(body) = body {
+        if let Some(body) = scene_data.body {
             let tgt_skeleton = IdleAnimation::update_skeleton(
                 self.figure_state.skeleton_mut(),
-                client.state().get_time(),
-                client.state().get_time(),
+                scene_data.time,
+                scene_data.time,
                 &mut 0.0,
                 &SkeletonAttr::from(&body),
             );
-            self.figure_state.skeleton_mut().interpolate(
-                &tgt_skeleton,
-                client.state().ecs().read_resource::<DeltaTime>().0,
-            );
+            self.figure_state
+                .skeleton_mut()
+                .interpolate(&tgt_skeleton, scene_data.delta_time);
         }
 
         self.figure_state.update(
@@ -180,7 +207,7 @@ impl Scene {
     pub fn render(
         &mut self,
         renderer: &mut Renderer,
-        client: &Client,
+        tick: u64,
         body: Option<humanoid::Body>,
         equipment: &Equipment,
     ) {
@@ -193,7 +220,7 @@ impl Scene {
                     renderer,
                     Body::Humanoid(body),
                     Some(equipment),
-                    client.get_tick(),
+                    tick,
                     CameraMode::default(),
                     None,
                 )
@@ -209,14 +236,16 @@ impl Scene {
             );
         }
 
-        renderer.render_figure(
-            &self.backdrop_model,
-            &self.globals,
-            self.backdrop_state.locals(),
-            self.backdrop_state.bone_consts(),
-            &self.lights,
-            &self.shadows,
-        );
+        if let Some((model, state)) = &self.backdrop {
+            renderer.render_figure(
+                model,
+                &self.globals,
+                state.locals(),
+                state.bone_consts(),
+                &self.lights,
+                &self.shadows,
+            );
+        }
 
         renderer.render_post_process(
             &self.postprocess.model,
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index c6c41f4928..be5f7c40c3 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -6,7 +6,7 @@ use crate::{
     },
 };
 
-use client::Client;
+use super::SceneData;
 use common::{
     assets,
     figure::Segment,
@@ -1083,26 +1083,26 @@ impl<V: RectRasterableVol> Terrain<V> {
     pub fn maintain(
         &mut self,
         renderer: &mut Renderer,
-        client: &Client,
+        scene_data: &SceneData,
         focus_pos: Vec3<f32>,
         loaded_distance: f32,
         view_mat: Mat4<f32>,
         proj_mat: Mat4<f32>,
     ) {
-        let current_tick = client.get_tick();
-        let current_time = client.state().get_time();
+        let current_tick = scene_data.tick;
+        let current_time = scene_data.state.get_time();
 
         // Add any recently created or changed chunks to the list of chunks to be
         // meshed.
-        for (modified, pos) in client
-            .state()
+        for (modified, pos) in scene_data
+            .state
             .terrain_changes()
             .modified_chunks
             .iter()
             .map(|c| (true, c))
             .chain(
-                client
-                    .state()
+                scene_data
+                    .state
                     .terrain_changes()
                     .new_chunks
                     .iter()
@@ -1121,8 +1121,8 @@ impl<V: RectRasterableVol> Terrain<V> {
                         let mut neighbours = true;
                         for i in -1..2 {
                             for j in -1..2 {
-                                neighbours &= client
-                                    .state()
+                                neighbours &= scene_data
+                                    .state
                                     .terrain()
                                     .get_key(pos + Vec2::new(i, j))
                                     .is_some();
@@ -1143,20 +1143,20 @@ impl<V: RectRasterableVol> Terrain<V> {
 
         // Add the chunks belonging to recently changed blocks to the list of chunks to
         // be meshed
-        for pos in client
-            .state()
+        for pos in scene_data
+            .state
             .terrain_changes()
             .modified_blocks
             .iter()
             .map(|(p, _)| *p)
         {
-            let chunk_pos = client.state().terrain().pos_key(pos);
+            let chunk_pos = scene_data.state.terrain().pos_key(pos);
             // Only mesh if this chunk has all its neighbors
             let mut neighbours = true;
             for i in -1..2 {
                 for j in -1..2 {
-                    neighbours &= client
-                        .state()
+                    neighbours &= scene_data
+                        .state
                         .terrain()
                         .get_key(chunk_pos + Vec2::new(i, j))
                         .is_some();
@@ -1178,15 +1178,15 @@ impl<V: RectRasterableVol> Terrain<V> {
             for x in -1..2 {
                 for y in -1..2 {
                     let neighbour_pos = pos + Vec3::new(x, y, 0);
-                    let neighbour_chunk_pos = client.state().terrain().pos_key(neighbour_pos);
+                    let neighbour_chunk_pos = scene_data.state.terrain().pos_key(neighbour_pos);
 
                     if neighbour_chunk_pos != chunk_pos {
                         // Only remesh if this chunk has all its neighbors
                         let mut neighbours = true;
                         for i in -1..2 {
                             for j in -1..2 {
-                                neighbours &= client
-                                    .state()
+                                neighbours &= scene_data
+                                    .state
                                     .terrain()
                                     .get_key(neighbour_chunk_pos + Vec2::new(i, j))
                                     .is_some();
@@ -1205,7 +1205,7 @@ impl<V: RectRasterableVol> Terrain<V> {
         }
 
         // Remove any models for chunks that have been recently removed.
-        for pos in &client.state().terrain_changes().removed_chunks {
+        for pos in &scene_data.state.terrain_changes().removed_chunks {
             self.chunks.remove(pos);
             self.mesh_todo.remove(pos);
         }
@@ -1220,7 +1220,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             })
             .min_by_key(|todo| todo.active_worker.unwrap_or(todo.started_tick))
         {
-            if client.thread_pool().queued_jobs() > 0 {
+            if scene_data.thread_pool.queued_jobs() > 0 {
                 break;
             }
 
@@ -1239,7 +1239,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             // Copy out the chunk data we need to perform the meshing. We do this by taking
             // a sample of the terrain that includes both the chunk we want and
             // its neighbours.
-            let volume = match client.state().terrain().sample(aabr) {
+            let volume = match scene_data.state.terrain().sample(aabr) {
                 Ok(sample) => sample,
                 // Either this chunk or its neighbours doesn't yet exist, so we keep it in the
                 // queue to be processed at a later date when we have its neighbours.
@@ -1266,7 +1266,7 @@ impl<V: RectRasterableVol> Terrain<V> {
 
             // Queue the worker thread.
             let started_tick = todo.started_tick;
-            client.thread_pool().execute(move || {
+            scene_data.thread_pool.execute(move || {
                 let _ = send.send(mesh_worker(
                     pos,
                     (min_z as f32, max_z as f32),
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 83b0a736b1..52421d3975 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -3,9 +3,10 @@ use crate::{
     hud::{DebugInfo, Event as HudEvent, Hud},
     i18n::{i18n_asset_key, VoxygenLocalization},
     key_state::KeyState,
+    menu::char_selection::CharSelectionState,
     render::Renderer,
-    scene::Scene,
-    window::{Event, GameInput},
+    scene::{camera, Scene, SceneData},
+    window::{AnalogGameInput, Event, GameInput},
     Direction, Error, GlobalState, PlayState, PlayStateResult,
 };
 use client::{self, Client, Event::Chat};
@@ -13,7 +14,7 @@ use common::{
     assets::{load_watched, watch},
     clock::Clock,
     comp,
-    comp::{Pos, Vel},
+    comp::{Pos, Vel, MAX_PICKUP_RANGE_SQR},
     msg::ClientState,
     terrain::{Block, BlockKind},
     vol::ReadVol,
@@ -24,6 +25,14 @@ use specs::{Join, WorldExt};
 use std::{cell::RefCell, rc::Rc, time::Duration};
 use vek::*;
 
+/// The action to perform after a tick
+enum TickAction {
+    // Continue executing
+    Continue,
+    // Disconnected (i.e. go to main menu)
+    Disconnect,
+}
+
 pub struct SessionState {
     scene: Scene,
     client: Rc<RefCell<Client>>,
@@ -65,7 +74,7 @@ impl SessionState {
 
 impl SessionState {
     /// Tick the session (and the client attached to it).
-    fn tick(&mut self, dt: Duration) -> Result<(), Error> {
+    fn tick(&mut self, dt: Duration) -> Result<TickAction, Error> {
         self.inputs.tick(dt);
         for event in self.client.borrow_mut().tick(
             self.inputs.clone(),
@@ -79,7 +88,7 @@ impl SessionState {
                 } => {
                     self.hud.new_message(event);
                 },
-                client::Event::Disconnect => {}, // TODO
+                client::Event::Disconnect => return Ok(TickAction::Disconnect),
                 client::Event::DisconnectionNotification(time) => {
                     let message = match time {
                         0 => String::from("Goodbye!"),
@@ -94,7 +103,7 @@ impl SessionState {
             }
         }
 
-        Ok(())
+        Ok(TickAction::Continue)
     }
 
     /// Clean up the session (and the client attached to it) after a tick.
@@ -108,7 +117,11 @@ impl SessionState {
         renderer.clear();
 
         // Render the screen using the global renderer
-        self.scene.render(renderer, &mut self.client.borrow_mut());
+        {
+            let client = self.client.borrow();
+            self.scene
+                .render(renderer, client.state(), client.entity(), client.get_tick());
+        }
         // Draw the UI to the screen
         self.hud.render(renderer, self.scene.globals());
 
@@ -126,9 +139,6 @@ impl PlayState for SessionState {
         let mut clock = Clock::start();
         self.client.borrow_mut().clear_terrain();
 
-        // Kill the title music if it is still playing
-        global_state.audio.stop_title_music();
-
         // Send startup commands to the server
         if global_state.settings.send_logon_commands {
             for cmd in &global_state.settings.logon_commands {
@@ -148,31 +158,58 @@ impl PlayState for SessionState {
         let mut current_client_state = self.client.borrow().get_client_state();
         while let ClientState::Pending | ClientState::Character = current_client_state {
             // Compute camera data
-            let (view_mat, _, cam_pos) = self
-                .scene
-                .camera()
-                .compute_dependents(&self.client.borrow());
+            self.scene
+                .camera_mut()
+                .compute_dependents(&*self.client.borrow().state().terrain());
+            let camera::Dependents {
+                view_mat, cam_pos, ..
+            } = self.scene.camera().dependents();
+
+            // Choose a spot above the player's head for item distance checks
+            let player_pos = match self
+                .client
+                .borrow()
+                .state()
+                .read_storage::<comp::Pos>()
+                .get(self.client.borrow().entity())
+            {
+                Some(pos) => pos.0 + (Vec3::unit_z() * 2.0),
+                _ => cam_pos, // Should never happen, but a safe fallback
+            };
+
             let cam_dir: Vec3<f32> = Vec3::from(view_mat.inverted() * -Vec4::unit_z());
 
             // Check to see whether we're aiming at anything
             let (build_pos, select_pos) = {
                 let client = self.client.borrow();
                 let terrain = client.state().terrain();
-                let ray = terrain
+
+                let cam_ray = terrain
                     .ray(cam_pos, cam_pos + cam_dir * 100.0)
                     .until(|block| block.is_tangible())
                     .cast();
-                let dist = ray.0;
-                if let Ok(Some(_)) = ray.1 {
-                    // Hit something!
+
+                let cam_dist = cam_ray.0;
+
+                if let Ok(Some(_)) = cam_ray.1 {
+                    // The ray hit something, is it within pickup range?
+                    let select_pos = if player_pos.distance_squared(cam_pos + cam_dir * cam_dist)
+                        <= MAX_PICKUP_RANGE_SQR
+                    {
+                        Some((cam_pos + cam_dir * cam_dist).map(|e| e.floor() as i32))
+                    } else {
+                        None
+                    };
+
                     (
-                        Some((cam_pos + cam_dir * (dist - 0.01)).map(|e| e.floor() as i32)),
-                        Some((cam_pos + cam_dir * dist).map(|e| e.floor() as i32)),
+                        Some((cam_pos + cam_dir * (cam_dist - 0.01)).map(|e| e.floor() as i32)),
+                        select_pos,
                     )
                 } else {
                     (None, None)
                 }
             };
+
             // Only highlight collectables
             self.scene.set_select_pos(select_pos.filter(|sp| {
                 self.client
@@ -241,7 +278,7 @@ impl PlayState for SessionState {
                             .unwrap_or(false)
                         {
                             self.inputs.secondary.set_state(state);
-                        } else {
+                        } else if state {
                             if let Some(select_pos) = select_pos {
                                 client.collect_block(select_pos);
                             }
@@ -362,6 +399,17 @@ impl PlayState for SessionState {
                     Event::InputUpdate(GameInput::Charge, state) => {
                         self.inputs.charge.set_state(state);
                     },
+                    Event::AnalogGameInput(input) => match input {
+                        AnalogGameInput::MovementX(v) => {
+                            self.key_state.analog_matrix.x = v;
+                        },
+                        AnalogGameInput::MovementY(v) => {
+                            self.key_state.analog_matrix.y = v;
+                        },
+                        other => {
+                            self.scene.handle_input_event(Event::AnalogGameInput(other));
+                        },
+                    },
 
                     // Pass all other events to the scene
                     event => {
@@ -382,18 +430,31 @@ impl PlayState for SessionState {
 
             self.inputs.look_dir = cam_dir;
 
-            // Perform an in-game tick.
-            if let Err(err) = self.tick(clock.get_avg_delta()) {
-                global_state.info_message =
-                    Some(localized_strings.get("common.connection_lost").to_owned());
-                error!("[session] Failed to tick the scene: {:?}", err);
+            // Runs if either in a multiplayer server or the singleplayer server is unpaused
+            if global_state.singleplayer.is_none()
+                || !global_state.singleplayer.as_ref().unwrap().is_paused()
+            {
+                // Perform an in-game tick.
+                match self.tick(clock.get_avg_delta()) {
+                    Ok(TickAction::Continue) => {}, // Do nothing
+                    Ok(TickAction::Disconnect) => return PlayStateResult::Pop, // Go to main menu
+                    Err(err) => {
+                        global_state.info_message =
+                            Some(localized_strings.get("common.connection_lost").to_owned());
+                        error!("[session] Failed to tick the scene: {:?}", err);
 
-                return PlayStateResult::Pop;
+                        return PlayStateResult::Pop;
+                    },
+                }
             }
 
             // Maintain global state.
             global_state.maintain(clock.get_last_delta().as_secs_f32());
 
+            // Recompute dependents just in case some input modified the camera
+            self.scene
+                .camera_mut()
+                .compute_dependents(&*self.client.borrow().state().terrain());
             // Extract HUD events ensuring the client borrow gets dropped.
             let mut hud_events = self.hud.maintain(
                 &self.client.borrow(),
@@ -553,6 +614,13 @@ impl PlayState for SessionState {
                         global_state.settings.graphics.fov = new_fov;
                         global_state.settings.save_to_file_warn();
                         self.scene.camera_mut().set_fov_deg(new_fov);
+                        self.scene
+                            .camera_mut()
+                            .compute_dependents(&*self.client.borrow().state().terrain());
+                    },
+                    HudEvent::ChangeGamma(new_gamma) => {
+                        global_state.settings.graphics.gamma = new_gamma;
+                        global_state.settings.save_to_file_warn();
                     },
                     HudEvent::ChangeAaMode(new_aa_mode) => {
                         // Do this first so if it crashes the setting isn't saved :)
@@ -593,6 +661,7 @@ impl PlayState for SessionState {
                         )
                         .unwrap();
                         localized_strings.log_missing_entries();
+                        self.hud.update_language(localized_strings.clone());
                     },
                     HudEvent::ToggleFullscreen => {
                         global_state
@@ -607,12 +676,26 @@ impl PlayState for SessionState {
                 }
             }
 
-            // Maintain the scene.
-            self.scene.maintain(
-                global_state.window.renderer_mut(),
-                &mut global_state.audio,
-                &self.client.borrow(),
-            );
+            // Runs if either in a multiplayer server or the singleplayer server is unpaused
+            if global_state.singleplayer.is_none()
+                || !global_state.singleplayer.as_ref().unwrap().is_paused()
+            {
+                let client = self.client.borrow();
+                let scene_data = SceneData {
+                    state: client.state(),
+                    player_entity: client.entity(),
+                    loaded_distance: client.loaded_distance(),
+                    view_distance: client.view_distance().unwrap_or(1),
+                    tick: client.get_tick(),
+                    thread_pool: client.thread_pool(),
+                };
+                self.scene.maintain(
+                    global_state.window.renderer_mut(),
+                    &mut global_state.audio,
+                    &scene_data,
+                    global_state.settings.graphics.gamma,
+                );
+            }
 
             // Render the session.
             self.render(global_state.window.renderer_mut());
@@ -634,6 +717,13 @@ impl PlayState for SessionState {
             current_client_state = self.client.borrow().get_client_state();
         }
 
+        if let ClientState::Registered = current_client_state {
+            return PlayStateResult::Switch(Box::new(CharSelectionState::new(
+                global_state,
+                self.client.clone(),
+            )));
+        }
+
         PlayStateResult::Pop
     }
 
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index 87822b87b0..78431b2dd1 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -5,8 +5,9 @@ use crate::{
     ui::ScaleMode,
     window::KeyMouse,
 };
-use directories::ProjectDirs;
+use directories::{ProjectDirs, UserDirs};
 use glutin::{MouseButton, VirtualKeyCode};
+use hashbrown::{HashMap, HashSet};
 use log::warn;
 use serde_derive::{Deserialize, Serialize};
 use std::{fs, io::prelude::*, path::PathBuf};
@@ -104,6 +105,225 @@ impl Default for ControlSettings {
     }
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(default)]
+pub struct GamepadSettings {
+    pub game_buttons: con_settings::GameButtons,
+    pub menu_buttons: con_settings::MenuButtons,
+    pub game_axis: con_settings::GameAxis,
+    pub menu_axis: con_settings::MenuAxis,
+    pub game_analog_buttons: con_settings::GameAnalogButton,
+    pub menu_analog_buttons: con_settings::MenuAnalogButton,
+    pub pan_sensitivity: u32,
+    pub pan_invert_y: bool,
+    pub axis_deadzones: HashMap<crate::controller::Axis, f32>,
+    pub button_deadzones: HashMap<crate::controller::AnalogButton, f32>,
+    pub mouse_emulation_sensitivity: u32,
+    pub inverted_axes: Vec<crate::controller::Axis>,
+}
+
+impl Default for GamepadSettings {
+    fn default() -> Self {
+        Self {
+            game_buttons: con_settings::GameButtons::default(),
+            menu_buttons: con_settings::MenuButtons::default(),
+            game_axis: con_settings::GameAxis::default(),
+            menu_axis: con_settings::MenuAxis::default(),
+            game_analog_buttons: con_settings::GameAnalogButton::default(),
+            menu_analog_buttons: con_settings::MenuAnalogButton::default(),
+            pan_sensitivity: 10,
+            pan_invert_y: false,
+            axis_deadzones: HashMap::new(),
+            button_deadzones: HashMap::new(),
+            mouse_emulation_sensitivity: 12,
+            inverted_axes: Vec::new(),
+        }
+    }
+}
+
+pub mod con_settings {
+    use crate::controller::*;
+    use gilrs::{Axis as GilAxis, Button as GilButton};
+    use serde_derive::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameButtons {
+        pub primary: Button,
+        pub secondary: Button,
+        pub toggle_cursor: Button,
+        pub escape: Button,
+        pub enter: Button,
+        pub command: Button,
+        pub move_forward: Button,
+        pub move_left: Button,
+        pub move_back: Button,
+        pub move_right: Button,
+        pub jump: Button,
+        pub sit: Button,
+        pub glide: Button,
+        pub climb: Button,
+        pub climb_down: Button,
+        pub wall_leap: Button,
+        pub mount: Button,
+        pub map: Button,
+        pub bag: Button,
+        pub quest_log: Button,
+        pub character_window: Button,
+        pub social: Button,
+        pub spellbook: Button,
+        pub settings: Button,
+        pub help: Button,
+        pub toggle_interface: Button,
+        pub toggle_debug: Button,
+        pub fullscreen: Button,
+        pub screenshot: Button,
+        pub toggle_ingame_ui: Button,
+        pub roll: Button,
+        pub respawn: Button,
+        pub interact: Button,
+        pub toggle_wield: Button,
+        pub charge: Button,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuButtons {
+        pub up: Button,
+        pub down: Button,
+        pub left: Button,
+        pub right: Button,
+        pub scroll_up: Button,
+        pub scroll_down: Button,
+        pub scroll_left: Button,
+        pub scroll_right: Button,
+        pub home: Button,
+        pub end: Button,
+        pub apply: Button,
+        pub back: Button,
+        pub exit: Button,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameAxis {
+        pub movement_x: Axis,
+        pub movement_y: Axis,
+        pub camera_x: Axis,
+        pub camera_y: Axis,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuAxis {
+        pub move_x: Axis,
+        pub move_y: Axis,
+        pub scroll_x: Axis,
+        pub scroll_y: Axis,
+    }
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct GameAnalogButton {}
+
+    #[derive(Clone, Debug, Serialize, Deserialize)]
+    #[serde(default)]
+    pub struct MenuAnalogButton {}
+
+    impl Default for GameButtons {
+        fn default() -> Self {
+            // binding to unknown = getting skipped from processing
+            Self {
+                primary: Button::Simple(GilButton::RightTrigger2),
+                secondary: Button::Simple(GilButton::LeftTrigger2),
+                toggle_cursor: Button::Simple(GilButton::Select),
+                escape: Button::Simple(GilButton::Mode),
+                enter: Button::Simple(GilButton::Unknown),
+                command: Button::Simple(GilButton::Unknown),
+                move_forward: Button::Simple(GilButton::Unknown),
+                move_left: Button::Simple(GilButton::Unknown),
+                move_back: Button::Simple(GilButton::Unknown),
+                move_right: Button::Simple(GilButton::Unknown),
+                jump: Button::Simple(GilButton::South),
+                sit: Button::Simple(GilButton::West),
+                glide: Button::Simple(GilButton::LeftTrigger),
+                climb: Button::Simple(GilButton::South),
+                climb_down: Button::Simple(GilButton::Unknown),
+                wall_leap: Button::Simple(GilButton::Unknown),
+                mount: Button::Simple(GilButton::North),
+                map: Button::Simple(GilButton::DPadRight),
+                bag: Button::Simple(GilButton::DPadDown),
+                quest_log: Button::Simple(GilButton::Unknown),
+                character_window: Button::Simple(GilButton::Unknown),
+                social: Button::Simple(GilButton::Unknown),
+                spellbook: Button::Simple(GilButton::Unknown),
+                settings: Button::Simple(GilButton::Unknown),
+                help: Button::Simple(GilButton::Unknown),
+                toggle_interface: Button::Simple(GilButton::Unknown),
+                toggle_debug: Button::Simple(GilButton::Unknown),
+                fullscreen: Button::Simple(GilButton::Unknown),
+                screenshot: Button::Simple(GilButton::DPadUp),
+                toggle_ingame_ui: Button::Simple(GilButton::Unknown),
+                roll: Button::Simple(GilButton::RightTrigger),
+                respawn: Button::Simple(GilButton::RightTrigger2),
+                interact: Button::Simple(GilButton::LeftTrigger2),
+                toggle_wield: Button::Simple(GilButton::DPadLeft),
+                charge: Button::Simple(GilButton::Unknown),
+            }
+        }
+    }
+
+    impl Default for MenuButtons {
+        fn default() -> Self {
+            Self {
+                up: Button::Simple(GilButton::Unknown),
+                down: Button::Simple(GilButton::Unknown),
+                left: Button::Simple(GilButton::Unknown),
+                right: Button::Simple(GilButton::Unknown),
+                scroll_up: Button::Simple(GilButton::Unknown),
+                scroll_down: Button::Simple(GilButton::Unknown),
+                scroll_left: Button::Simple(GilButton::Unknown),
+                scroll_right: Button::Simple(GilButton::Unknown),
+                home: Button::Simple(GilButton::DPadUp),
+                end: Button::Simple(GilButton::DPadDown),
+                apply: Button::Simple(GilButton::South),
+                back: Button::Simple(GilButton::East),
+                exit: Button::Simple(GilButton::Mode),
+            }
+        }
+    }
+
+    impl Default for GameAxis {
+        fn default() -> Self {
+            Self {
+                movement_x: Axis::Simple(GilAxis::LeftStickX),
+                movement_y: Axis::Simple(GilAxis::LeftStickY),
+                camera_x: Axis::Simple(GilAxis::RightStickX),
+                camera_y: Axis::Simple(GilAxis::RightStickY),
+            }
+        }
+    }
+
+    impl Default for MenuAxis {
+        fn default() -> Self {
+            Self {
+                move_x: Axis::Simple(GilAxis::RightStickX),
+                move_y: Axis::Simple(GilAxis::RightStickY),
+                scroll_x: Axis::Simple(GilAxis::LeftStickX),
+                scroll_y: Axis::Simple(GilAxis::LeftStickY),
+            }
+        }
+    }
+
+    impl Default for GameAnalogButton {
+        fn default() -> Self { Self {} }
+    }
+
+    impl Default for MenuAnalogButton {
+        fn default() -> Self { Self {} }
+    }
+}
+
 /// `GameplaySettings` contains sensitivity and gameplay options.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
@@ -157,6 +377,7 @@ pub struct NetworkingSettings {
     pub password: String,
     pub servers: Vec<String>,
     pub default_server: usize,
+    pub trusted_auth_servers: HashSet<String>,
 }
 
 impl Default for NetworkingSettings {
@@ -166,6 +387,10 @@ impl Default for NetworkingSettings {
             password: String::default(),
             servers: vec!["server.veloren.net".to_string()],
             default_server: 0,
+            trusted_auth_servers: ["https://auth.veloren.net"]
+                .iter()
+                .map(|s| s.to_string())
+                .collect(),
         }
     }
 }
@@ -177,10 +402,28 @@ pub struct Log {
     // Whether to create a log file or not.
     // Default is to create one.
     pub log_to_file: bool,
+    // The path on which the logs will be stored
+    pub logs_path: PathBuf,
 }
 
 impl Default for Log {
-    fn default() -> Self { Self { log_to_file: true } }
+    fn default() -> Self {
+        let proj_dirs = ProjectDirs::from("net", "veloren", "voxygen")
+            .expect("System's $HOME directory path not found!");
+
+        // Chooses a path to store the logs by the following order:
+        //  - The VOXYGEN_LOGS environment variable
+        //  - The ProjectsDirs data local directory
+        // This only selects if there isn't already an entry in the settings file
+        let logs_path = std::env::var_os("VOXYGEN_LOGS")
+            .map(PathBuf::from)
+            .unwrap_or(proj_dirs.data_local_dir().join("logs"));
+
+        Self {
+            log_to_file: true,
+            logs_path,
+        }
+    }
 }
 
 /// `GraphicsSettings` contains settings related to framerate and in-game
@@ -191,6 +434,7 @@ pub struct GraphicsSettings {
     pub view_distance: u32,
     pub max_fps: u32,
     pub fov: u16,
+    pub gamma: f32,
     pub aa_mode: AaMode,
     pub cloud_mode: CloudMode,
     pub fluid_mode: FluidMode,
@@ -204,6 +448,7 @@ impl Default for GraphicsSettings {
             view_distance: 10,
             max_fps: 60,
             fov: 50,
+            gamma: 1.0,
             aa_mode: AaMode::Fxaa,
             cloud_mode: CloudMode::Regular,
             fluid_mode: FluidMode::Shiny,
@@ -221,6 +466,7 @@ pub struct AudioSettings {
     pub master_volume: f32,
     pub music_volume: f32,
     pub sfx_volume: f32,
+    pub max_sfx_channels: usize,
 
     /// Audio Device that Voxygen will use to play audio.
     pub audio_device: Option<String>,
@@ -233,6 +479,7 @@ impl Default for AudioSettings {
             master_volume: 1.0,
             music_volume: 0.4,
             sfx_volume: 0.6,
+            max_sfx_channels: 10,
             audio_device: None,
             audio_on: true,
         }
@@ -269,10 +516,27 @@ pub struct Settings {
     // TODO: Remove at a later date, for dev testing
     pub logon_commands: Vec<String>,
     pub language: LanguageSettings,
+    pub screenshots_path: PathBuf,
+    pub controller: GamepadSettings,
 }
 
 impl Default for Settings {
     fn default() -> Self {
+        let user_dirs = UserDirs::new().expect("System's $HOME directory path not found!");
+
+        // Chooses a path to store the screenshots by the following order:
+        //  - The VOXYGEN_SCREENSHOT environment variable
+        //  - The user's picture directory
+        //  - The executable's directory
+        // This only selects if there isn't already an entry in the settings file
+        let screenshots_path = std::env::var_os("VOXYGEN_SCREENSHOT")
+            .map(PathBuf::from)
+            .or(user_dirs.picture_dir().map(|dir| dir.join("veloren")))
+            .or(std::env::current_exe()
+                .ok()
+                .and_then(|dir| dir.parent().map(|val| PathBuf::from(val))))
+            .expect("Couldn't choose a place to store the screenshots");
+
         Settings {
             controls: ControlSettings::default(),
             gameplay: GameplaySettings::default(),
@@ -284,6 +548,8 @@ impl Default for Settings {
             send_logon_commands: false,
             logon_commands: Vec::new(),
             language: LanguageSettings::default(),
+            screenshots_path,
+            controller: GamepadSettings::default(),
         }
     }
 }
diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs
index a1b3cec031..a5e9e5a87d 100644
--- a/voxygen/src/singleplayer.rs
+++ b/voxygen/src/singleplayer.rs
@@ -4,6 +4,10 @@ use crossbeam::channel::{unbounded, Receiver, Sender, TryRecvError};
 use log::info;
 use server::{Event, Input, Server, ServerSettings};
 use std::{
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
     thread::{self, JoinHandle},
     time::Duration,
 };
@@ -19,6 +23,8 @@ enum Msg {
 pub struct Singleplayer {
     _server_thread: JoinHandle<()>,
     sender: Sender<Msg>,
+    // Wether the server is stopped or not
+    paused: Arc<AtomicBool>,
 }
 
 impl Singleplayer {
@@ -31,6 +37,9 @@ impl Singleplayer {
         let thread_pool = client.map(|c| c.thread_pool().clone());
         let settings2 = settings.clone();
 
+        let paused = Arc::new(AtomicBool::new(false));
+        let paused1 = paused.clone();
+
         let thread = thread::spawn(move || {
             let server = Server::new(settings2).expect("Failed to create server instance!");
 
@@ -39,17 +48,25 @@ impl Singleplayer {
                 None => server,
             };
 
-            run_server(server, receiver);
+            run_server(server, receiver, paused1);
         });
 
         (
             Singleplayer {
                 _server_thread: thread,
                 sender,
+                paused,
             },
             settings,
         )
     }
+
+    /// Returns wether or not the server is paused
+    pub fn is_paused(&self) -> bool { self.paused.load(Ordering::SeqCst) }
+
+    /// Pauses if true is passed and unpauses if false (Does nothing if in that
+    /// state already)
+    pub fn pause(&self, state: bool) { self.paused.store(state, Ordering::SeqCst); }
 }
 
 impl Drop for Singleplayer {
@@ -59,13 +76,34 @@ impl Drop for Singleplayer {
     }
 }
 
-fn run_server(mut server: Server, rec: Receiver<Msg>) {
+fn run_server(mut server: Server, rec: Receiver<Msg>, paused: Arc<AtomicBool>) {
     info!("Starting server-cli...");
 
     // Set up an fps clock
     let mut clock = Clock::start();
 
     loop {
+        // Check any event such as stopping and pausing
+        match rec.try_recv() {
+            Ok(msg) => match msg {
+                Msg::Stop => break,
+            },
+            Err(err) => match err {
+                TryRecvError::Empty => (),
+                TryRecvError::Disconnected => break,
+            },
+        }
+
+        // Wait for the next tick.
+        clock.tick(Duration::from_millis(1000 / TPS));
+
+        // Skip updating the server if it's paused
+        if paused.load(Ordering::SeqCst) && server.number_of_players() < 2 {
+            continue;
+        } else if server.number_of_players() > 1 {
+            paused.store(false, Ordering::SeqCst);
+        }
+
         let events = server
             .tick(Input::default(), clock.get_last_delta())
             .expect("Failed to tick server!");
@@ -80,16 +118,5 @@ fn run_server(mut server: Server, rec: Receiver<Msg>) {
 
         // Clean up the server after a tick.
         server.cleanup();
-
-        match rec.try_recv() {
-            Ok(_msg) => break,
-            Err(err) => match err {
-                TryRecvError::Empty => (),
-                TryRecvError::Disconnected => break,
-            },
-        }
-
-        // Wait for the next tick.
-        clock.tick(Duration::from_millis(1000 / TPS));
     }
 }
diff --git a/voxygen/src/ui/font_ids.rs b/voxygen/src/ui/font_ids.rs
deleted file mode 100644
index d6c8a92643..0000000000
--- a/voxygen/src/ui/font_ids.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-/// This macro will automatically load all specified assets, get the
-/// corresponding FontIds and create a struct with all of them.
-///
-/// Example usage:
-/// ```
-/// font_ids! {
-///     pub struct Fonts {
-///         font1: "filename1",
-///         font2: "filename2",
-///     }
-/// }
-/// ```
-#[macro_export]
-macro_rules! font_ids {
-    ($($v:vis struct $Ids:ident { $( $name:ident: $specifier:expr $(,)? )* })*) => {
-        $(
-            $v struct $Ids {
-                    $( $v $name: conrod_core::text::font::Id, )*
-            }
-
-            impl $Ids {
-                pub fn load(ui: &mut crate::ui::Ui) -> Result<Self, common::assets::Error> {
-                    Ok(Self {
-                        $( $name: ui.new_font(common::assets::load($specifier)?), )*
-                    })
-                }
-            }
-        )*
-    };
-}
diff --git a/voxygen/src/ui/fonts.rs b/voxygen/src/ui/fonts.rs
new file mode 100644
index 0000000000..c42b9abf3a
--- /dev/null
+++ b/voxygen/src/ui/fonts.rs
@@ -0,0 +1,40 @@
+use crate::i18n::{Font, VoxygenFonts};
+
+pub struct ConrodVoxygenFont {
+    metadata: Font,
+    pub conrod_id: conrod_core::text::font::Id,
+}
+
+impl ConrodVoxygenFont {
+    pub fn new(font: &Font, ui: &mut crate::ui::Ui) -> ConrodVoxygenFont {
+        return Self {
+            metadata: font.clone(),
+            conrod_id: ui.new_font(common::assets::load_expect(&font.asset_key)),
+        };
+    }
+
+    /// Scale input size to final UI size
+    pub fn scale(&self, value: u32) -> u32 { self.metadata.scale(value) }
+}
+
+macro_rules! conrod_fonts {
+    ($([ $( $name:ident$(,)? )* ])*) => {
+        $(
+            pub struct ConrodVoxygenFonts {
+                $(pub $name: ConrodVoxygenFont,)*
+            }
+
+            impl ConrodVoxygenFonts {
+                pub fn load(voxygen_fonts: &VoxygenFonts, ui: &mut crate::ui::Ui) -> Result<Self, common::assets::Error> {
+                    Ok(Self {
+                        $( $name: ConrodVoxygenFont::new(voxygen_fonts.get(stringify!($name)).unwrap(), ui),)*
+                    })
+                }
+            }
+        )*
+    };
+}
+
+conrod_fonts! {
+    [opensans, metamorph, alkhemi, cyri, wizard]
+}
diff --git a/voxygen/src/ui/img_ids.rs b/voxygen/src/ui/img_ids.rs
index f3cfc0f65f..ea5a8ac294 100644
--- a/voxygen/src/ui/img_ids.rs
+++ b/voxygen/src/ui/img_ids.rs
@@ -114,7 +114,12 @@ pub struct Rotations {
 /// corresponding ImgIds and create a struct with all of them.
 ///
 /// Example usage:
-/// ```
+/// ```ignore
+/// use veloren_voxygen::{
+///     image_ids,
+///     ui::img_ids::{BlankGraphic, ImageGraphic, VoxelGraphic},
+/// };
+///
 /// image_ids! {
 ///     pub struct Imgs {
 ///         <VoxelGraphic>
diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs
index a384c77078..a1e18915f6 100644
--- a/voxygen/src/ui/mod.rs
+++ b/voxygen/src/ui/mod.rs
@@ -6,7 +6,7 @@ mod widgets;
 #[macro_use]
 pub mod img_ids;
 #[macro_use]
-mod font_ids;
+pub mod fonts;
 
 pub use event::Event;
 pub use graphic::{Graphic, SampleStrat, Transform};
@@ -96,7 +96,7 @@ impl assets::Asset for Font {
 }
 
 pub struct Ui {
-    ui: conrod_core::Ui,
+    pub ui: conrod_core::Ui,
     image_map: Map<(graphic::Id, Rotation)>,
     cache: Cache,
     // Draw commands for the next render
@@ -634,8 +634,8 @@ impl Ui {
                     mesh.push_quad(create_ui_quad(
                         gl_aabr(rect),
                         Aabr {
-                            min: Vec2::new(0.0, 0.0),
-                            max: Vec2::new(0.0, 0.0),
+                            min: Vec2::zero(),
+                            max: Vec2::zero(),
                         },
                         color,
                         UiMode::Geometry,
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 1b43c15787..f052ec73a2 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1,15 +1,17 @@
 use crate::{
+    controller::*,
     render::{Renderer, WinColorFmt, WinDepthFmt},
     settings::Settings,
     ui, Error,
 };
+use gilrs::{EventType, Gilrs};
 use hashbrown::HashMap;
 use log::{error, warn};
 use serde_derive::{Deserialize, Serialize};
 use std::fmt;
 use vek::*;
 
-/// Represents a key that the game recognises after keyboard mapping.
+/// Represents a key that the game recognises after input mapping.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub enum GameInput {
     Primary,
@@ -49,6 +51,40 @@ pub enum GameInput {
     Charge,
 }
 
+/// Represents a key that the game menus recognise after input mapping
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum MenuInput {
+    Up,
+    Down,
+    Left,
+    Right,
+    ScrollUp,
+    ScrollDown,
+    ScrollLeft,
+    ScrollRight,
+    Home,
+    End,
+    Apply,
+    Back,
+    Exit,
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub enum AnalogMenuInput {
+    MoveX(f32),
+    MoveY(f32),
+    ScrollX(f32),
+    ScrollY(f32),
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub enum AnalogGameInput {
+    MovementX(f32),
+    MovementY(f32),
+    CameraX(f32),
+    CameraY(f32),
+}
+
 /// Represents an incoming event from the window.
 #[derive(Clone)]
 pub enum Event {
@@ -76,6 +112,13 @@ pub enum Event {
     SettingsChanged,
     /// The window is (un)focused
     Focused(bool),
+    /// A key that the game recognises for menu navigation has been pressed or
+    /// released
+    MenuInput(MenuInput, bool),
+    /// Update of the analog inputs recognized by the menus
+    AnalogMenuInput(AnalogMenuInput),
+    /// Update of the analog inputs recognized by the game
+    AnalogGameInput(AnalogGameInput),
 }
 
 pub type MouseButton = winit::MouseButton;
@@ -277,6 +320,10 @@ pub struct Window {
     keypress_map: HashMap<GameInput, glutin::ElementState>,
     supplement_events: Vec<Event>,
     focused: bool,
+    gilrs: Option<Gilrs>,
+    controller_settings: ControllerSettings,
+    cursor_position: winit::dpi::LogicalPosition,
+    mouse_emulation_vec: Vec2<f32>,
 }
 
 impl Window {
@@ -414,6 +461,30 @@ impl Window {
 
         let keypress_map = HashMap::new();
 
+        let gilrs = match Gilrs::new() {
+            Ok(gilrs) => Some(gilrs),
+            Err(gilrs::Error::NotImplemented(_dummy)) => {
+                warn!("Controller input is unsupported on this platform.");
+                None
+            },
+            Err(gilrs::Error::InvalidAxisToBtn) => {
+                error!(
+                    "Invalid AxisToBtn controller mapping. Falling back to no controller support."
+                );
+                None
+            },
+            Err(gilrs::Error::Other(err)) => {
+                error!(
+                    "Platform-specific error when creating a Gilrs instance: `{}`. Falling back \
+                     to no controller support.",
+                    err
+                );
+                None
+            },
+        };
+
+        let controller_settings = ControllerSettings::from(&settings.controller);
+
         let mut this = Self {
             events_loop,
             renderer: Renderer::new(
@@ -437,6 +508,10 @@ impl Window {
             keypress_map,
             supplement_events: vec![],
             focused: true,
+            gilrs,
+            controller_settings,
+            cursor_position: winit::dpi::LogicalPosition::new(0.0, 0.0),
+            mouse_emulation_vec: Vec2::zero(),
         };
 
         this.fullscreen(settings.graphics.fullscreen);
@@ -477,6 +552,7 @@ impl Window {
         };
         let mut toggle_fullscreen = false;
         let mut take_screenshot = false;
+        let mut cursor_position = None;
 
         self.events_loop.poll_events(|event| {
             // Get events for ui.
@@ -556,6 +632,9 @@ impl Window {
                         *focused = state;
                         events.push(Event::Focused(state));
                     },
+                    glutin::WindowEvent::CursorMoved { position, .. } => {
+                        cursor_position = Some(position);
+                    },
                     _ => {},
                 },
                 glutin::Event::DeviceEvent { event, .. } => match event {
@@ -593,17 +672,229 @@ impl Window {
             }
         });
 
+        if let Some(pos) = cursor_position {
+            self.cursor_position = pos;
+        }
+
         if take_screenshot {
-            self.take_screenshot();
+            self.take_screenshot(&settings);
         }
 
         if toggle_fullscreen {
             self.toggle_fullscreen(settings);
         }
 
+        if let Some(gilrs) = &mut self.gilrs {
+            while let Some(event) = gilrs.next_event() {
+                fn handle_buttons(
+                    settings: &ControllerSettings,
+                    events: &mut Vec<Event>,
+                    button: &Button,
+                    is_pressed: bool,
+                ) {
+                    if let Some(evs) = settings.game_button_map.get(button) {
+                        for ev in evs {
+                            events.push(Event::InputUpdate(*ev, is_pressed));
+                        }
+                    }
+                    if let Some(evs) = settings.menu_button_map.get(button) {
+                        for ev in evs {
+                            events.push(Event::MenuInput(*ev, is_pressed));
+                        }
+                    }
+                }
+
+                match event.event {
+                    EventType::ButtonPressed(button, code)
+                    | EventType::ButtonRepeated(button, code) => {
+                        handle_buttons(
+                            &self.controller_settings,
+                            &mut events,
+                            &Button::from((button, code)),
+                            true,
+                        );
+                    },
+                    EventType::ButtonReleased(button, code) => {
+                        handle_buttons(
+                            &self.controller_settings,
+                            &mut events,
+                            &Button::from((button, code)),
+                            false,
+                        );
+                    },
+                    EventType::ButtonChanged(button, _value, code) => {
+                        if let Some(actions) = self
+                            .controller_settings
+                            .game_analog_button_map
+                            .get(&AnalogButton::from((button, code)))
+                        {
+                            for action in actions {
+                                match *action {}
+                            }
+                        }
+                        if let Some(actions) = self
+                            .controller_settings
+                            .menu_analog_button_map
+                            .get(&AnalogButton::from((button, code)))
+                        {
+                            for action in actions {
+                                match *action {}
+                            }
+                        }
+                    },
+
+                    EventType::AxisChanged(axis, value, code) => {
+                        let value = match self
+                            .controller_settings
+                            .inverted_axes
+                            .contains(&Axis::from((axis, code)))
+                        {
+                            true => value * -1.0,
+                            false => value,
+                        };
+
+                        let value = self
+                            .controller_settings
+                            .apply_axis_deadzone(&Axis::from((axis, code)), value);
+
+                        if self.cursor_grabbed {
+                            if let Some(actions) = self
+                                .controller_settings
+                                .game_axis_map
+                                .get(&Axis::from((axis, code)))
+                            {
+                                for action in actions {
+                                    match *action {
+                                        AxisGameAction::MovementX => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::MovementX(value),
+                                            ));
+                                        },
+                                        AxisGameAction::MovementY => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::MovementY(value),
+                                            ));
+                                        },
+                                        AxisGameAction::CameraX => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::CameraX(
+                                                    value
+                                                        * self.controller_settings.pan_sensitivity
+                                                            as f32
+                                                        / 100.0,
+                                                ),
+                                            ));
+                                        },
+                                        AxisGameAction::CameraY => {
+                                            events.push(Event::AnalogGameInput(
+                                                AnalogGameInput::CameraY(
+                                                    value
+                                                        * self.controller_settings.pan_sensitivity
+                                                            as f32
+                                                        / 100.0,
+                                                ),
+                                            ));
+                                        },
+                                    }
+                                }
+                            }
+                        } else if let Some(actions) = self
+                            .controller_settings
+                            .menu_axis_map
+                            .get(&Axis::from((axis, code)))
+                        {
+                            // TODO: possibly add sensitivity settings when this is used
+                            for action in actions {
+                                match *action {
+                                    AxisMenuAction::MoveX => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::MoveX(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::MoveY => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::MoveY(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::ScrollX => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::ScrollX(value),
+                                        ));
+                                    },
+                                    AxisMenuAction::ScrollY => {
+                                        events.push(Event::AnalogMenuInput(
+                                            AnalogMenuInput::ScrollY(value),
+                                        ));
+                                    },
+                                }
+                            }
+                        }
+                    },
+                    EventType::Connected => {},
+                    EventType::Disconnected => {},
+                    EventType::Dropped => {},
+                }
+            }
+        }
+
+        // Mouse emulation for the menus, to be removed when a proper menu navigation
+        // system is available
+        if !self.cursor_grabbed {
+            events = events
+                .into_iter()
+                .filter_map(|event| match event {
+                    Event::AnalogMenuInput(input) => match input {
+                        AnalogMenuInput::MoveX(d) => {
+                            self.mouse_emulation_vec.x = d;
+                            None
+                        },
+                        AnalogMenuInput::MoveY(d) => {
+                            // This just has to be inverted for some reason
+                            self.mouse_emulation_vec.y = d * -1.0;
+                            None
+                        },
+                        _ => {
+                            let event = Event::AnalogMenuInput(input);
+                            Some(event)
+                        },
+                    },
+                    Event::MenuInput(input, state) => match input {
+                        MenuInput::Apply => Some(match state {
+                            true => Event::Ui(ui::Event(conrod_core::event::Input::Press(
+                                conrod_core::input::Button::Mouse(
+                                    conrod_core::input::state::mouse::Button::Left,
+                                ),
+                            ))),
+                            false => Event::Ui(ui::Event(conrod_core::event::Input::Release(
+                                conrod_core::input::Button::Mouse(
+                                    conrod_core::input::state::mouse::Button::Left,
+                                ),
+                            ))),
+                        }),
+                        _ => Some(event),
+                    },
+                    _ => Some(event),
+                })
+                .collect();
+            let sensitivity = self.controller_settings.mouse_emulation_sensitivity;
+            if self.mouse_emulation_vec != Vec2::zero() {
+                self.offset_cursor(self.mouse_emulation_vec * sensitivity as f32)
+                    .unwrap_or(());
+            }
+        }
         events
     }
 
+    /// Moves cursor by an offset
+    pub fn offset_cursor(&self, d: Vec2<f32>) -> Result<(), String> {
+        self.window
+            .window()
+            .set_cursor_position(winit::dpi::LogicalPosition::new(
+                d.x as f64 + self.cursor_position.x,
+                d.y as f64 + self.cursor_position.y,
+            ))
+    }
+
     pub fn swap_buffers(&self) -> Result<(), Error> {
         self.window
             .swap_buffers()
@@ -659,15 +950,16 @@ impl Window {
 
     pub fn send_supplement_event(&mut self, event: Event) { self.supplement_events.push(event) }
 
-    pub fn take_screenshot(&mut self) {
+    pub fn take_screenshot(&mut self, settings: &Settings) {
         match self.renderer.create_screenshot() {
             Ok(img) => {
+                let mut path = settings.screenshots_path.clone();
+
                 std::thread::spawn(move || {
-                    use std::{path::PathBuf, time::SystemTime};
+                    use std::time::SystemTime;
                     // Check if folder exists and create it if it does not
-                    let mut path = PathBuf::from("./screenshots");
                     if !path.exists() {
-                        if let Err(err) = std::fs::create_dir(&path) {
+                        if let Err(err) = std::fs::create_dir_all(&path) {
                             warn!("Couldn't create folder for screenshot: {:?}", err);
                         }
                     }
diff --git a/voxygen/tests/check_i18n_files.rs b/voxygen/tests/check_i18n_files.rs
new file mode 100644
index 0000000000..2efe365826
--- /dev/null
+++ b/voxygen/tests/check_i18n_files.rs
@@ -0,0 +1,250 @@
+use git2::Repository;
+use ron::de::from_bytes;
+use std::{
+    collections::{HashMap, HashSet},
+    fs,
+    path::{Path, PathBuf},
+};
+use veloren_voxygen::i18n::VoxygenLocalization;
+
+/// List localization files as a PathBuf vector
+fn i18n_files(i18n_dir: &Path) -> Vec<PathBuf> {
+    fs::read_dir(i18n_dir)
+        .unwrap()
+        .map(|res| res.map(|e| e.path()).unwrap())
+        .filter(|e| match e.extension() {
+            Some(ext) => ext == "ron",
+            None => false,
+        })
+        .collect()
+}
+
+#[derive(Debug, PartialEq)]
+enum LocalizationState {
+    UpToDate,
+    NotFound,
+    Outdated,
+    Unknown,
+    Unused,
+}
+
+#[derive(Debug)]
+struct LocalizationEntryState {
+    pub key_line: Option<usize>,
+    pub chuck_line_range: Option<(usize, usize)>,
+    pub commit_id: Option<git2::Oid>,
+    pub state: LocalizationState,
+}
+
+impl LocalizationEntryState {
+    pub fn new() -> LocalizationEntryState {
+        LocalizationEntryState {
+            key_line: None,
+            chuck_line_range: None,
+            commit_id: None,
+            state: LocalizationState::Unknown,
+        }
+    }
+}
+
+/// Returns the Git blob associated with the given reference and path
+fn read_file_from_path<'a>(
+    repo: &'a git2::Repository,
+    reference: &git2::Reference,
+    path: &std::path::Path,
+) -> git2::Blob<'a> {
+    let tree = reference
+        .peel_to_tree()
+        .expect("Impossible to peel HEAD to a tree object");
+    tree.get_path(path)
+        .expect(&format!(
+            "Impossible to find the file {:?} in reference {:?}",
+            path,
+            reference.name()
+        ))
+        .to_object(&repo)
+        .unwrap()
+        .peel_to_blob()
+        .expect("Impossible to fetch the Git object")
+}
+
+fn generate_key_version<'a>(
+    repo: &'a git2::Repository,
+    localization: &VoxygenLocalization,
+    path: &std::path::Path,
+    file_blob: &git2::Blob,
+) -> HashMap<String, LocalizationEntryState> {
+    let mut keys: HashMap<String, LocalizationEntryState> = localization
+        .string_map
+        .keys()
+        .map(|k| (k.to_owned(), LocalizationEntryState::new()))
+        .collect();
+    let mut to_process: HashSet<&String> = localization.string_map.keys().map(|k| k).collect();
+    let mut line_nb = 0;
+
+    // Find key start lines
+    for line in std::str::from_utf8(file_blob.content())
+        .expect("UTF-8 file")
+        .split('\n')
+    {
+        line_nb += 1;
+
+        let mut found_key = None;
+
+        for key in to_process.iter() {
+            if line.contains(key.as_str()) {
+                found_key = Some(key.to_owned());
+                break;
+            }
+        }
+
+        if let Some(key) = found_key {
+            keys.get_mut(key).unwrap().key_line = Some(line_nb);
+            to_process.remove(&key);
+        };
+    }
+
+    // Find commit for each keys
+    repo.blame_file(path, None)
+        .expect("Impossible to generate the Git blame")
+        .iter()
+        .for_each(|e: git2::BlameHunk| {
+            for state in keys.values_mut() {
+                let line = state.key_line.unwrap();
+
+                if line >= e.final_start_line() && line < e.final_start_line() + e.lines_in_hunk() {
+                    state.chuck_line_range = Some((
+                        e.final_start_line(),
+                        e.final_start_line() + e.lines_in_hunk(),
+                    ));
+                    state.commit_id = match state.commit_id {
+                        Some(existing_commit) => {
+                            match repo.graph_descendant_of(e.final_commit_id(), existing_commit) {
+                                Ok(true) => Some(e.final_commit_id()),
+                                Ok(false) => Some(existing_commit),
+                                Err(err) => panic!(err),
+                            }
+                        },
+                        None => Some(e.final_commit_id()),
+                    };
+                }
+            }
+        });
+
+    keys
+}
+
+#[test]
+#[ignore]
+fn test_all_localizations<'a>() {
+    // Generate paths
+    let i18n_asset_path = Path::new("assets/voxygen/i18n/");
+    let en_i18n_path = i18n_asset_path.join("en.ron");
+    let root_dir = std::env::current_dir()
+        .map(|p| p.parent().expect("").to_owned())
+        .unwrap();
+    let i18n_path = root_dir.join(i18n_asset_path);
+
+    if !root_dir.join(&en_i18n_path).is_file() {
+        panic!("Reference language file not found {:?}", &en_i18n_path)
+    }
+
+    // Initialize Git objects
+    let repo = Repository::discover(&root_dir).expect(&format!(
+        "Failed to open the Git repository at {:?}",
+        &root_dir
+    ));
+    let head_ref = repo.head().expect("Impossible to get the HEAD reference");
+
+    // Read HEAD for the reference language file
+    let i18n_en_blob = read_file_from_path(&repo, &head_ref, &en_i18n_path);
+    let loc: VoxygenLocalization =
+        from_bytes(i18n_en_blob.content()).expect("Expect to parse the RON file");
+    let i18n_references: HashMap<String, LocalizationEntryState> =
+        generate_key_version(&repo, &loc, &en_i18n_path, &i18n_en_blob);
+
+    // Compare to other reference files
+    let i18n_files = i18n_files(&i18n_path);
+    for file in i18n_files {
+        let relfile = file.strip_prefix(&root_dir).unwrap();
+        let mut uptodate_entries = 0;
+        if relfile == en_i18n_path {
+            continue;
+        }
+        println!("{:?}", relfile);
+
+        // Find the localization entry state
+        let current_blob = read_file_from_path(&repo, &head_ref, &relfile);
+        let current_loc: VoxygenLocalization =
+            from_bytes(current_blob.content()).expect("Expect to parse the RON file");
+        let mut current_i18n = generate_key_version(&repo, &current_loc, &relfile, &current_blob);
+        for (ref_key, ref_state) in i18n_references.iter() {
+            match current_i18n.get_mut(ref_key) {
+                Some(state) => {
+                    let commit_id = state.commit_id.unwrap();
+                    let ref_commit_id = ref_state.commit_id.unwrap();
+                    if commit_id != ref_commit_id
+                        && !repo
+                            .graph_descendant_of(commit_id, ref_commit_id)
+                            .unwrap_or(false)
+                    {
+                        state.state = LocalizationState::Outdated;
+                    } else {
+                        state.state = LocalizationState::UpToDate;
+                    }
+                },
+                None => {
+                    current_i18n.insert(ref_key.to_owned(), LocalizationEntryState {
+                        key_line: None,
+                        chuck_line_range: None,
+                        commit_id: None,
+                        state: LocalizationState::NotFound,
+                    });
+                },
+            }
+        }
+
+        let ref_keys: HashSet<&String> = i18n_references.keys().collect();
+        for (_, state) in current_i18n
+            .iter_mut()
+            .filter(|&(k, _)| !ref_keys.contains(k))
+        {
+            state.state = LocalizationState::Unused;
+        }
+
+        // Display
+        println!(
+            "{:10}  {:60}{:40} {:40}",
+            "State",
+            "Key name",
+            relfile.to_str().unwrap(),
+            en_i18n_path.to_str().unwrap()
+        );
+
+        let mut sorted_keys: Vec<&String> = current_i18n.keys().collect();
+        sorted_keys.sort();
+        for key in sorted_keys {
+            let state = current_i18n.get(key).unwrap();
+            if state.state != LocalizationState::UpToDate {
+                println!(
+                    "[{:9}] {:60}{:40} {:40}",
+                    format!("{:?}", state.state),
+                    key,
+                    state
+                        .commit_id
+                        .map(|s| format!("{}", s))
+                        .unwrap_or("None".to_string()),
+                    i18n_references
+                        .get(key)
+                        .map(|s| s.commit_id)
+                        .flatten()
+                        .map(|s| format!("{}", s))
+                        .unwrap_or("None".to_string()),
+                );
+            } else {
+                uptodate_entries += 1;
+            }
+        }
+        println!("{} entries are up-to-date\n", uptodate_entries);
+    }
+}
diff --git a/world/Cargo.toml b/world/Cargo.toml
index 2e4ac28265..096c988928 100644
--- a/world/Cargo.toml
+++ b/world/Cargo.toml
@@ -29,5 +29,5 @@ serde_derive = "1.0.102"
 ron = "0.5.1"
 
 [dev-dependencies]
-minifb = { git = "https://github.com/emoon/rust_minifb.git" }
 pretty_env_logger = "0.3.0"
+minifb = "0.14.0"