diff --git a/Cargo.lock b/Cargo.lock
index 6155708ef3..b7635baa76 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -472,16 +472,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
-[[package]]
-name = "cgl"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
-dependencies = [
- "gleam",
- "libc",
-]
-
 [[package]]
 name = "cgl"
 version = "0.3.2"
@@ -548,21 +538,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "foreign-types",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.19.1"
@@ -683,7 +658,7 @@ dependencies = [
  "objc-foundation",
  "objc_id",
  "smithay-clipboard",
- "wayland-client 0.23.6",
+ "wayland-client",
  "x11-clipboard",
 ]
 
@@ -1569,12 +1544,11 @@ dependencies = [
 [[package]]
 name = "gfx_window_glutin"
 version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
+source = "git+https://github.com/Imberflur/gfx_window_glutin.git#6586513e6b22924e61d1106e426768ac4f1cb55d"
 dependencies = [
  "gfx_core",
  "gfx_device_gl",
- "glutin 0.21.2",
+ "glutin",
 ]
 
 [[package]]
@@ -1682,15 +1656,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "gleam"
-version = "0.6.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
-dependencies = [
- "gl_generator 0.13.1",
-]
-
 [[package]]
 name = "glib"
 version = "0.5.0"
@@ -1731,32 +1696,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "glutin"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
-dependencies = [
- "android_glue",
- "cgl 0.2.3",
- "cocoa 0.18.5",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "glutin_egl_sys",
- "glutin_emscripten_sys",
- "glutin_gles2_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "lazy_static",
- "libloading 0.5.2",
- "objc",
- "osmesa-sys",
- "parking_lot 0.9.0",
- "wayland-client 0.21.13",
- "winapi 0.3.8",
- "winit 0.19.5",
-]
-
 [[package]]
 name = "glutin"
 version = "0.22.1"
@@ -1764,8 +1703,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "639246c8838b02a83b9339bd87da3714e73e52ecfaa758e15d761eb77b2290b5"
 dependencies = [
  "android_glue",
- "cgl 0.3.2",
- "cocoa 0.19.1",
+ "cgl",
+ "cocoa",
  "core-foundation 0.6.4",
  "core-graphics 0.17.3",
  "glutin_egl_sys",
@@ -1779,9 +1718,9 @@ dependencies = [
  "objc",
  "osmesa-sys",
  "parking_lot 0.10.2",
- "wayland-client 0.23.6",
+ "wayland-client",
  "winapi 0.3.8",
- "winit 0.20.0",
+ "winit",
 ]
 
 [[package]]
@@ -2530,7 +2469,7 @@ name = "msgbox"
 version = "0.4.0"
 source = "git+https://github.com/bekker/msgbox-rs.git?rev=68fe39a#68fe39a60019b38a1569ae4e9ed796a0f0542673"
 dependencies = [
- "cocoa 0.19.1",
+ "cocoa",
  "gtk",
  "objc",
  "winapi 0.3.8",
@@ -3759,23 +3698,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
-dependencies = [
- "andrew",
- "bitflags",
- "dlib",
- "lazy_static",
- "memmap",
- "nix 0.14.1",
- "wayland-client 0.21.13",
- "wayland-commons 0.21.13",
- "wayland-protocols 0.21.13",
-]
-
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.6.6"
@@ -3788,8 +3710,8 @@ dependencies = [
  "lazy_static",
  "memmap",
  "nix 0.14.1",
- "wayland-client 0.23.6",
- "wayland-protocols 0.23.6",
+ "wayland-client",
+ "wayland-protocols",
 ]
 
 [[package]]
@@ -3799,7 +3721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1"
 dependencies = [
  "nix 0.14.1",
- "smithay-client-toolkit 0.6.6",
+ "smithay-client-toolkit",
 ]
 
 [[package]]
@@ -4604,7 +4526,7 @@ dependencies = [
  "gilrs",
  "git2",
  "glsl-include",
- "glutin 0.22.1",
+ "glutin",
  "guillotiere",
  "hashbrown",
  "image",
@@ -4629,7 +4551,7 @@ dependencies = [
  "veloren-server",
  "veloren-voxygen-anim",
  "veloren-world",
- "winit 0.20.0",
+ "winit",
  "winres",
 ]
 
@@ -4794,21 +4716,6 @@ version = "0.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd"
 
-[[package]]
-name = "wayland-client"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
-dependencies = [
- "bitflags",
- "downcast-rs",
- "libc",
- "nix 0.14.1",
- "wayland-commons 0.21.13",
- "wayland-scanner 0.21.13",
- "wayland-sys 0.21.13",
-]
-
 [[package]]
 name = "wayland-client"
 version = "0.23.6"
@@ -4821,19 +4728,9 @@ dependencies = [
  "libc",
  "mio",
  "nix 0.14.1",
- "wayland-commons 0.23.6",
- "wayland-scanner 0.23.6",
- "wayland-sys 0.23.6",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
-dependencies = [
- "nix 0.14.1",
- "wayland-sys 0.21.13",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -4843,20 +4740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
 dependencies = [
  "nix 0.14.1",
- "wayland-sys 0.23.6",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
-dependencies = [
- "bitflags",
- "wayland-client 0.21.13",
- "wayland-commons 0.21.13",
- "wayland-scanner 0.21.13",
- "wayland-sys 0.21.13",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -4866,20 +4750,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
 dependencies = [
  "bitflags",
- "wayland-client 0.23.6",
- "wayland-commons 0.23.6",
- "wayland-scanner 0.23.6",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "xml-rs",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
 ]
 
 [[package]]
@@ -4893,16 +4766,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "wayland-sys"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
-dependencies = [
- "dlib",
- "lazy_static",
-]
-
 [[package]]
 name = "wayland-sys"
 version = "0.23.6"
@@ -4985,31 +4848,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winit"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
-dependencies = [
- "android_glue",
- "backtrace",
- "bitflags",
- "cocoa 0.18.5",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "lazy_static",
- "libc",
- "log",
- "objc",
- "parking_lot 0.9.0",
- "percent-encoding 2.1.0",
- "raw-window-handle",
- "smithay-client-toolkit 0.4.6",
- "wayland-client 0.21.13",
- "winapi 0.3.8",
- "x11-dl",
-]
-
 [[package]]
 name = "winit"
 version = "0.20.0"
@@ -5018,7 +4856,7 @@ checksum = "3ba128780050481f453bec2a115b916dbc6ae79c303dee9bad8b9080bdccd4f5"
 dependencies = [
  "android_glue",
  "bitflags",
- "cocoa 0.19.1",
+ "cocoa",
  "core-foundation 0.6.4",
  "core-graphics 0.17.3",
  "core-video-sys",
@@ -5034,8 +4872,8 @@ dependencies = [
  "percent-encoding 2.1.0",
  "raw-window-handle",
  "serde",
- "smithay-client-toolkit 0.6.6",
- "wayland-client 0.23.6",
+ "smithay-client-toolkit",
+ "wayland-client",
  "winapi 0.3.8",
  "x11-dl",
 ]
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index 2e8e64ad7e..cc530f4513 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -25,7 +25,7 @@ anim = { package = "veloren-voxygen-anim", path = "src/anim", default-features =
 # Graphics
 gfx = "0.18.2"
 gfx_device_gl = { version = "0.16.2", optional = true }
-gfx_window_glutin = "0.31.0"
+gfx_window_glutin = {git = "https://github.com/Imberflur/gfx_window_glutin.git" } 
 glutin = "0.22.0-alpha3"
 winit = { version = "0.20.0-alpha4", features = ["serde"] }
 conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "hide_text" }
@@ -87,7 +87,7 @@ winres = "0.1"
 criterion = "0.3"
 git2 = "0.13"
 world = { package = "veloren-world", path = "../world" }
-gfx_window_glutin = { version = "0.31.0", features = ["headless"] }
+#gfx_window_glutin = { version = "0.31.0", features = ["headless"] }
 
 [[bench]]
 name = "meshing_benchmark"
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index e5f078253f..67bcf6f03c 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -508,7 +508,7 @@ impl Window {
             .with_vsync(false);
 
         let (window, device, factory, win_color_view, win_depth_view) =
-            gfx_window_glutin::init::<WinColorFmt, WinDepthFmt>(
+            gfx_window_glutin::init::<WinColorFmt, WinDepthFmt, ()>(
                 win_builder,
                 ctx_builder,
                 &events_loop,