--- a/examples/image/main.cpp	Wed Nov 28 21:18:00 2018 +0100
+++ b/examples/image/main.cpp	Wed Dec 05 22:24:44 2018 +0100
@@ -20,26 +20,27 @@
 #include <iostream>
 #include <thread>
 
+#include <malikania/client/image.hpp>
 #include <malikania/client/loader.hpp>
-#include <malikania/client/image.hpp>
+#include <malikania/client/painter.hpp>
 #include <malikania/client/window.hpp>
 #include <malikania/locator.hpp>
 
 using namespace std::chrono_literals;
 
-void draw(mlk::client::window& window, mlk::client::loader& loader)
+void draw(mlk::client::painter& painter, mlk::client::loader& loader)
 {
 	try {
 		auto image = loader.load_image("images/smiley.png");
 		auto x = (400 / 2) - (image.get_size().width / 2);
 		auto y = (400 / 2) - (image.get_size().height / 2);
 
-		window.clear();
-		image.draw(window, {
+		painter.clear();
+		image.draw(painter, {
 			static_cast<int>(x),
 			static_cast<int>(y)
 		});
-		window.present();
+		painter.present();
 
 		std::this_thread::sleep_for(3s);
 	} catch (const std::exception &ex) {
@@ -52,10 +53,11 @@
 {
 	try {
 		mlk::client::window window(400, 400);
+		mlk::client::painter painter(window);
 		mlk::directory_locator locator(CMAKE_CURRENT_SOURCE_DIR "/resources");
 		mlk::client::loader loader(locator);
 
-		draw(window, loader);
+		draw(painter, loader);
 	} catch (const std::exception& ex) {
 		std::cerr << ex.what() << std::endl;
 		return 1;