diff --git a/voxygen/anim/src/character/idle.rs b/voxygen/anim/src/character/idle.rs
index cbece0d42b..51f700b35a 100644
--- a/voxygen/anim/src/character/idle.rs
+++ b/voxygen/anim/src/character/idle.rs
@@ -123,9 +123,9 @@ impl Animation for IdleAnimation {
         match hands {
             (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.position = Vec3::new(4.0, -6.0, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs
index 7bf3948940..a95b2560be 100644
--- a/voxygen/anim/src/character/jump.rs
+++ b/voxygen/anim/src/character/jump.rs
@@ -221,9 +221,9 @@ impl Animation for JumpAnimation {
         match hands {
             (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.position = Vec3::new(4.0, -6.0, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/run.rs b/voxygen/anim/src/character/run.rs
index 8558f09130..96d1c9cada 100644
--- a/voxygen/anim/src/character/run.rs
+++ b/voxygen/anim/src/character/run.rs
@@ -288,9 +288,9 @@ impl Animation for RunAnimation {
         match hands {
             (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.position = Vec3::new(4.0, -6.0, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 242f365de4..c45776b1df 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -131,9 +131,9 @@ impl Animation for StandAnimation {
         match hands {
             (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.position = Vec3::new(4.0, -6.0, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/swim.rs b/voxygen/anim/src/character/swim.rs
index a2323110b7..f0af9cee52 100644
--- a/voxygen/anim/src/character/swim.rs
+++ b/voxygen/anim/src/character/swim.rs
@@ -251,9 +251,9 @@ impl Animation for SwimAnimation {
         match hands {
             (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.position = Vec3::new(4.0, -6.0, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 0a1e935f54..c4d50dba35 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -39,7 +39,7 @@ use common::{
     vol::RectRasterableVol,
 };
 use common_base::span;
-use common_state::State;
+use common_sys::state::State;
 use core::{
     borrow::Borrow,
     convert::TryFrom,
@@ -793,7 +793,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::character::StandAnimation::update_skeleton(
@@ -1421,7 +1421,7 @@ impl FigureMgr {
                             skeleton_attr,
                         ),
                         CharacterState::Wielding { .. } => {
-                            if physics.in_liquid().is_some() {
+                            if physics.in_liquid.is_some() {
                                 anim::character::SwimWieldAnimation::update_skeleton(
                                     &target_base,
                                     (
@@ -1581,7 +1581,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -1783,7 +1783,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > 0.25, // Moving
-                        physics.in_liquid().is_some(),      // In water
+                        physics.in_liquid.is_some(),        // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -2110,7 +2110,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => {
@@ -2469,7 +2469,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::bird_medium::IdleAnimation::update_skeleton(
@@ -2579,7 +2579,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Idle
                         (_, false, _) => anim::fish_medium::IdleAnimation::update_skeleton(
@@ -2668,7 +2668,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Idle
                         (true, false, false) => anim::biped_small::IdleAnimation::update_skeleton(
@@ -3013,7 +3013,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::dragon::IdleAnimation::update_skeleton(
@@ -3108,7 +3108,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::theropod::IdleAnimation::update_skeleton(
@@ -3297,7 +3297,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::bird_small::IdleAnimation::update_skeleton(
@@ -3388,7 +3388,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Idle
                         (_, false, _) => anim::fish_small::IdleAnimation::update_skeleton(
@@ -3477,7 +3477,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Running
                         (true, true, false) => anim::biped_large::RunAnimation::update_skeleton(
@@ -3998,7 +3998,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::golem::IdleAnimation::update_skeleton(
@@ -4184,7 +4184,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::object::IdleAnimation::update_skeleton(
@@ -4313,7 +4313,7 @@ impl FigureMgr {
                     let target_base = match (
                         physics.on_ground,
                         rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving
-                        physics.in_liquid().is_some(),                      // In water
+                        physics.in_liquid.is_some(),                        // In water
                     ) {
                         // Standing
                         (true, false, false) => anim::ship::IdleAnimation::update_skeleton(