diff --git a/sources/Component/Keyboard/KeyboardComponent.hpp b/sources/Component/Keyboard/KeyboardComponent.hpp
index bd0f2ab7..2ad2e6f2 100644
--- a/sources/Component/Keyboard/KeyboardComponent.hpp
+++ b/sources/Component/Keyboard/KeyboardComponent.hpp
@@ -23,9 +23,9 @@ namespace BBM
 			//! @brief pause key
 			Key keyPause = KEY_ESCAPE;
 			//! @brief move right key
-			Key keyRight = KEY_A;
+			Key keyRight = KEY_D;
 			//! @brief move left key
-			Key keyLeft = KEY_D;
+			Key keyLeft = KEY_A;
 			//! @brief move up key
 			Key keyUp = KEY_W;
 			//! @brief move down key
diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp
index 6a047352..591ce261 100644
--- a/sources/Runner/Runner.cpp
+++ b/sources/Runner/Runner.cpp
@@ -76,8 +76,8 @@ namespace BBM
 			.addComponent<Drawable3DComponent, RAY3D::Model>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png"))
 			.addComponent<ControllableComponent>()
 			.addComponent<AnimatorComponent>()
-			//.addComponent<KeyboardComponent>()
-			.addComponent<GamepadComponent>(0)
+			.addComponent<KeyboardComponent>()
+			//.addComponent<GamepadComponent>(0)
 			.addComponent<AnimationsComponent>(RAY::ModelAnimations("assets/player/player.iqm"), 3)
 			.addComponent<CollisionComponent>(BBM::Vector3f{0.25, 0, 0.25}, BBM::Vector3f{.75, 2, .75})
 			.addComponent<MovableComponent>()
diff --git a/sources/System/Keyboard/KeyboardSystem.cpp b/sources/System/Keyboard/KeyboardSystem.cpp
index 740b9e3a..0f2a0cef 100644
--- a/sources/System/Keyboard/KeyboardSystem.cpp
+++ b/sources/System/Keyboard/KeyboardSystem.cpp
@@ -31,9 +31,9 @@ namespace BBM
 			key.second = Keyboard::isPressed(key.first);
 		controllable.move = Vector2f();
 		if (Keyboard::isDown(keyboard.keyRight))
-			controllable.move.x += 1;
-		if (Keyboard::isDown(keyboard.keyLeft))
 			controllable.move.x -= 1;
+		if (Keyboard::isDown(keyboard.keyLeft))
+			controllable.move.x += 1;
 		if (Keyboard::isDown(keyboard.keyUp))
 			controllable.move.y += 1;
 		if (Keyboard::isDown(keyboard.keyDown))