diff --git a/examples/audio_playback/src/main.rs b/examples/audio_playback/src/main.rs
index 812ae57..e6bb38a 100644
--- a/examples/audio_playback/src/main.rs
+++ b/examples/audio_playback/src/main.rs
@@ -1,8 +1,6 @@
-use std::f64::consts::PI;
 use std::path::Path;
 
 use anyhow::Result;
-use sdl2::keyboard::Scancode;
 
 use libretrogd::audio::*;
 use libretrogd::graphics::*;
@@ -73,8 +71,11 @@ fn main() -> Result<()> {
 
     while is_running {
         system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false;
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });
 
diff --git a/examples/balls/src/main.rs b/examples/balls/src/main.rs
index 74fed48..53990de 100644
--- a/examples/balls/src/main.rs
+++ b/examples/balls/src/main.rs
@@ -1,7 +1,6 @@
 use std::path::Path;
 
 use anyhow::Result;
-use sdl2::keyboard::Scancode;
 
 use libretrogd::*;
 use libretrogd::graphics::*;
@@ -64,8 +63,11 @@ fn main() -> Result<()> {
 
     while is_running {
         system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false;
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });
 
diff --git a/examples/balls_v2/src/main.rs b/examples/balls_v2/src/main.rs
index fd8d703..f18b7a0 100644
--- a/examples/balls_v2/src/main.rs
+++ b/examples/balls_v2/src/main.rs
@@ -24,8 +24,11 @@ fn main() -> Result<()> {
 
     while is_running && !states.is_empty() {
         game.context.system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false;
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });
 
diff --git a/examples/balls_v2/src/states.rs b/examples/balls_v2/src/states.rs
index 34106bc..5066b67 100644
--- a/examples/balls_v2/src/states.rs
+++ b/examples/balls_v2/src/states.rs
@@ -1,5 +1,3 @@
-use sdl2::keyboard::Scancode;
-
 use libretrogd::entities::*;
 use libretrogd::events::*;
 use libretrogd::graphics::*;
diff --git a/examples/slimed/src/main.rs b/examples/slimed/src/main.rs
index 4f098ac..809c6e2 100644
--- a/examples/slimed/src/main.rs
+++ b/examples/slimed/src/main.rs
@@ -165,8 +165,11 @@ fn main() -> Result<()> {
 
     while is_running && !states.is_empty() {
         game.core.system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });
 
diff --git a/examples/slimed/src/states.rs b/examples/slimed/src/states.rs
index 1ea6cb1..1afca5f 100644
--- a/examples/slimed/src/states.rs
+++ b/examples/slimed/src/states.rs
@@ -1,11 +1,9 @@
 use std::path::Path;
 
-use sdl2::keyboard::Scancode;
-
 use libretrogd::entities::*;
 use libretrogd::graphics::*;
-use libretrogd::math::Vector2;
 use libretrogd::states::*;
+use libretrogd::system::*;
 
 use crate::entities::*;
 use crate::Game;
diff --git a/examples/template_complicated/src/main.rs b/examples/template_complicated/src/main.rs
index 0011f7b..9531a5f 100644
--- a/examples/template_complicated/src/main.rs
+++ b/examples/template_complicated/src/main.rs
@@ -1,5 +1,4 @@
 use anyhow::Result;
-use sdl2::keyboard::Scancode;
 
 use libretrogd::{SCREEN_HEIGHT, SCREEN_WIDTH};
 use libretrogd::entities::*;
@@ -195,8 +194,11 @@ fn main() -> Result<()> {
 
     while is_running && !states.is_empty() {
         game.core.system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false;
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });
 
diff --git a/examples/template_minimal/src/main.rs b/examples/template_minimal/src/main.rs
index fb7b8be..7df61d1 100644
--- a/examples/template_minimal/src/main.rs
+++ b/examples/template_minimal/src/main.rs
@@ -1,5 +1,4 @@
 use anyhow::Result;
-use sdl2::keyboard::Scancode;
 
 use libretrogd::{SCREEN_BOTTOM, SCREEN_RIGHT};
 use libretrogd::graphics::*;
@@ -17,8 +16,11 @@ fn main() -> Result<()> {
 
     while is_running {
         system.do_events_with(|event| {
-            if let sdl2::event::Event::Quit { .. } = event {
-                is_running = false;
+            match event {
+                SystemEvent::Quit => {
+                    is_running = false;
+                },
+                _ => {}
             }
         });