diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp
index 75686487..006ecd79 100644
--- a/Adventures in Lestoria/AdventuresInLestoria.cpp	
+++ b/Adventures in Lestoria/AdventuresInLestoria.cpp	
@@ -2382,9 +2382,9 @@ void AiL::InitializeDefaultKeybinds(){
 	KEY_CONFIRM.AddKeybind({MOUSE,Mouse::LEFT});
 	KEY_CONFIRM.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::FACE_R)});
 	KEY_CONFIRM.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::START)});
+	KEY_CONFIRM.AddKeybind({KEY,Z});
 	KEY_CONFIRM.AddKeybind({KEY,SPACE});
 	KEY_CONFIRM.AddKeybind({KEY,ENTER});
-	KEY_CONFIRM.AddKeybind({KEY,Z});
 	KEY_BACK.AddKeybind({KEY,X});
 	KEY_BACK.AddKeybind({KEY,SHIFT});
 	KEY_BACK.AddKeybind({KEY,ESCAPE});
@@ -2395,13 +2395,13 @@ void AiL::InitializeDefaultKeybinds(){
 	KEY_SCROLLUP.AddKeybind({KEY,Q});
 	KEY_SCROLLUP.AddKeybind({KEY,PGUP});
 	KEY_SCROLLUP.AddKeybind({KEY,NP8});
-	KEY_SCROLLUP.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::L2)});
 	KEY_SCROLLUP.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::L1)});
+	KEY_SCROLLUP.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::L2)});
 	KEY_SCROLLDOWN.AddKeybind({KEY,E});
 	KEY_SCROLLDOWN.AddKeybind({KEY,PGDN});
 	KEY_SCROLLDOWN.AddKeybind({KEY,NP2});
-	KEY_SCROLLDOWN.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::R2)});
 	KEY_SCROLLDOWN.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::R1)});
+	KEY_SCROLLDOWN.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::R2)});
 
 	KEY_START.AddKeybind({KEY,RETURN});
 	KEY_START.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::START)});
diff --git a/Adventures in Lestoria/assets/config/gfx/themes.txt b/Adventures in Lestoria/assets/config/gfx/themes.txt
index 59cc4d9e..42a38114 100644
--- a/Adventures in Lestoria/assets/config/gfx/themes.txt	
+++ b/Adventures in Lestoria/assets/config/gfx/themes.txt	
@@ -13,6 +13,12 @@ ThemeGlobal
 
 	# How far the mouse has to move before mouse mode becomes active from keyboard/controller input mode.
 	MouseActivationDistance = 8
+
+	# The back color of input keys.
+	InputButtonBackCol = 15,8,47,255
+
+	# The text color of input keys.
+	InputButtonTextCol = 175,199,191
 }
 
 Themes
diff --git a/Adventures in Lestoria/assets/themes/button_analogstick_horz.png b/Adventures in Lestoria/assets/themes/button_analogstick_horz.png
new file mode 100644
index 00000000..c6a88cc4
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_analogstick_horz.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_analogstick_vert.png b/Adventures in Lestoria/assets/themes/button_analogstick_vert.png
new file mode 100644
index 00000000..fa202d52
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_analogstick_vert.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_d.png b/Adventures in Lestoria/assets/themes/button_d.png
new file mode 100644
index 00000000..4652f8eb
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_d.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_l.png b/Adventures in Lestoria/assets/themes/button_l.png
new file mode 100644
index 00000000..dbae50da
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_l.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_l1.png b/Adventures in Lestoria/assets/themes/button_l1.png
new file mode 100644
index 00000000..c897e95c
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_l1.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_l2.png b/Adventures in Lestoria/assets/themes/button_l2.png
new file mode 100644
index 00000000..48492116
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_l2.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_r.png b/Adventures in Lestoria/assets/themes/button_r.png
new file mode 100644
index 00000000..e0866428
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_r.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_r1.png b/Adventures in Lestoria/assets/themes/button_r1.png
new file mode 100644
index 00000000..4e55f458
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_r1.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_r2.png b/Adventures in Lestoria/assets/themes/button_r2.png
new file mode 100644
index 00000000..10f685c8
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_r2.png differ
diff --git a/Adventures in Lestoria/assets/themes/button_u.png b/Adventures in Lestoria/assets/themes/button_u.png
new file mode 100644
index 00000000..2260e66f
Binary files /dev/null and b/Adventures in Lestoria/assets/themes/button_u.png differ