diff --git a/bakara/src/bakara.h b/bakara/src/bakara.h
index 2237927..74662fb 100644
--- a/bakara/src/bakara.h
+++ b/bakara/src/bakara.h
@@ -7,6 +7,6 @@
 #include <bakara/events/key_event.h>
 #include <bakara/events/window_event.h>
 #include <bakara/events/app_event.h>
-#include <bakara/core/key_codes.h>
+#include <bakara/core/io_codes.h>
 
 #include <bakara/core/entry.h>
\ No newline at end of file
diff --git a/bakara/src/bakara/core/key_codes.h b/bakara/src/bakara/core/io_codes.h
similarity index 78%
rename from bakara/src/bakara/core/key_codes.h
rename to bakara/src/bakara/core/io_codes.h
index f5993e5..ee3e7be 100644
--- a/bakara/src/bakara/core/key_codes.h
+++ b/bakara/src/bakara/core/io_codes.h
@@ -138,4 +138,40 @@ namespace Bk {
 			Menu                = 348
 		};
 	}
+	
+	namespace Controller {
+		enum class Button
+		{
+										// analog input	button values
+										//		PS		|		XBOX
+ 			BTN_DOWN = 0,				//	X			|	A
+ 			BTN_LEFT = 1,				//	Square		|	X
+ 			BTN_UP = 2,					//	Triangle	|	Y	
+ 			BTN_RIGHT = 3,				//	Circle		|	B
+ 			SHOULDER_LEFT = 4,			//	L1			|	LB
+ 			SHOULDER_RIGHT = 5,			//	R1			|	RB
+ 			TRIGGER_LEFT = 6,			    //	L2			|	LT
+ 			TRIGGER_RIGHT = 7,			//	R2			|	RT
+ 			SELECT = 8,					//	Share		|	Address
+ 			START = 9,					//	Options		|	Menu
+ 			LEFT_STICK = 10,				//	L3			|	LS
+ 			RIGHT_STICK = 11,			    //	R3			|	RS
+ 			HOME = 12,					//	Home		|	Home
+ 			CLICK = 13,					//	Touch pad	|	n/a
+ 			DPAD_UP = 14,				    //	Dpad up		|	Dpad up
+ 			DPAD_RIGHT = 15,				//	Dpad right	|	Dpad right
+ 			DPAD_DOWN = 16,				//	Dpad down	|	Dpad down
+ 			DPAD_LEFT = 17,				//	Dpad left	|	Dpad left
+		};
+
+		enum class Joystick
+		{
+			AXES_LEFT_STICK_X = 0,
+ 			AXES_LEFT_STICK_Y = 1,
+ 			AXES_RIGHT_STICK_X = 2,
+ 			AXES_LEFT_TRIGGER = 3,
+ 			AXES_RIGHT_TRIGGER = 4,
+ 			AXES_RIGHT_STICK_Y = 5,
+		};
+	}
 }
\ No newline at end of file
diff --git a/bakara/src/bakara/events/key_event.h b/bakara/src/bakara/events/key_event.h
index 996956d..b88ddf6 100644
--- a/bakara/src/bakara/events/key_event.h
+++ b/bakara/src/bakara/events/key_event.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <bakara/core/key_codes.h>
+#include <bakara/core/io_codes.h>
 #include "event.h"
 
 namespace Bk {