diff --git a/Cargo.lock b/Cargo.lock
index 293ea48..dad817b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,9 @@
 name = "super-matte-bros"
 version = "0.0.1"
 dependencies = [
- "sdl2 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2_image 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sdl2 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "bitflags"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bitflags"
 version = "0.7.0"
@@ -68,37 +62,26 @@ dependencies = [
 
 [[package]]
 name = "sdl2"
-version = "0.25.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2-sys 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sdl2-sys 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sdl2-sys"
-version = "0.25.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "sdl2_image"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sdl2-sys 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [metadata]
-"checksum bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72cd7314bd4ee024071241147222c706e80385a1605ac7d4cd2fcc339da2ae46"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
 "checksum libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c96061f0c8a2dc27482e394d82e23073569de41d73cd736672ccd3e5c7471bfd"
@@ -107,6 +90,5 @@ dependencies = [
 "checksum num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "287a1c9969a847055e1122ec0ea7a5c5d6f72aad97934e131c83d5c08ab4e45c"
 "checksum num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "51eab148f171aefad295f8cece636fc488b9b392ef544da31ea4b8ef6b9e9c39"
 "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5"
-"checksum sdl2 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e15a33054d1b982ca8eec453666757046af6f95e7dd09e2747d67ab0aeca1bd"
-"checksum sdl2-sys 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79698e1a87967badc92c3d559f5a73157a05a644f85cdada02de91d4639edc00"
-"checksum sdl2_image 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc3c5fffeeed080695bcdaf0788a08c9b5d8489a02c7de2a2f2f16d0f40cda2"
+"checksum sdl2 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55d39a8921d9cab08e229dccb574940c99b5819f872ff13335f7e087ffbbdf53"
+"checksum sdl2-sys 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)" = "37cfe343db4cd2159cab098096fff52e92d513c2a5b1ee06abbfd5db5323a64d"
diff --git a/Cargo.toml b/Cargo.toml
index 2cfde55..e54c933 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,9 +3,10 @@ name = "super-matte-bros"
 version = "0.0.1"
 authors = ["logaritmisk <anders.e.olsson@gmail.com>"]
 
-[dependencies]
-sdl2 = "0.25.0"
-sdl2_image = "0.25.0"
+[dependencies.sdl2]
+version = "0.27"
+default-features = false
+features = ["image"]
 
 [[bin]]
 name = "super-matte-bros"
diff --git a/src/component.rs b/src/component.rs
index 5f9ebd8..d6c4baf 100644
--- a/src/component.rs
+++ b/src/component.rs
@@ -3,10 +3,11 @@ use sdl2::render::Renderer;
 
 use game_object::GameObject;
 
+
 pub trait Updatable {
-    fn update(&self, &GameObject);
+    fn update(&self, object: &GameObject);
 }
 
 pub trait Renderable {
-    fn render(&self, &GameObject, f64, &mut Renderer, &Rect);
+    fn render(&self, object: &GameObject, f64, &mut Renderer, &Rect);
 }
diff --git a/src/main.rs b/src/main.rs
index 44de581..a5ec04c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,11 @@
 extern crate sdl2;
-extern crate sdl2_image;
 
 use std::path::Path;
 
-use sdl2_image::LoadTexture;
 use sdl2::rect::Rect;
 use sdl2::keyboard::Keycode;
 use sdl2::pixels::Color;
+use sdl2::image::LoadTexture;
 
 use tile::Layer;
 use camera::Camera;
@@ -56,7 +55,7 @@ fn main() {
     let sdl_context = sdl2::init().unwrap();
     let video_subsystem = sdl_context.video().unwrap();
 
-    let _ = sdl2_image::init(sdl2_image::INIT_PNG).unwrap();
+    let _ = sdl2::image::init(sdl2::image::INIT_PNG).unwrap();
 
     let window = video_subsystem.window("Super Matte Bros", SCREEN_WIDTH, SCREEN_HEIGHT).position_centered().build().unwrap();
     let mut renderer = window.renderer().software().build().unwrap();
@@ -171,7 +170,7 @@ fn main() {
 
     let mut event_pump = sdl_context.event_pump().unwrap();
 
-    'main : loop {
+    'main: loop {
         let current = timer.current_time();
         let elapsed = current - previous;