diff --git a/UI/ControllerInput/WheelData/Commonality/commonality_layout.tres b/UI/ControllerInput/WheelData/Commonality/commonality_layout.tres
new file mode 100644
index 0000000..e575bb3
--- /dev/null
+++ b/UI/ControllerInput/WheelData/Commonality/commonality_layout.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="ControllerInputWheelDataPack" load_steps=4 format=3 uid="uid://clfqsqcsr4hns"]
+
+[ext_resource type="Resource" uid="uid://oiupgjqy1f8s" path="res://addons/Bugbot/UI/ControllerInput/WheelData/Commonality/commonality_lowercase_alphanumeric.tres" id="1_e5eci"]
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data_pack.gd" id="2_bjg14"]
+[ext_resource type="Resource" uid="uid://n6dppjyu3tve" path="res://addons/Bugbot/UI/ControllerInput/WheelData/Commonality/commonality_uppercase_alphanumeric.tres" id="3_41wqm"]
+
+[resource]
+script = ExtResource("2_bjg14")
+lowercase = ExtResource("1_e5eci")
+uppercase = ExtResource("3_41wqm")
diff --git a/UI/ControllerInput/WheelData/Commonality/commonality_lowercase_alphanumeric.tres b/UI/ControllerInput/WheelData/Commonality/commonality_lowercase_alphanumeric.tres
new file mode 100644
index 0000000..dc877f3
--- /dev/null
+++ b/UI/ControllerInput/WheelData/Commonality/commonality_lowercase_alphanumeric.tres
@@ -0,0 +1,7 @@
+[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://oiupgjqy1f8s"]
+
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_lm2db"]
+
+[resource]
+script = ExtResource("1_lm2db")
+characters = Array[PackedStringArray]([PackedStringArray("e", "s", "r", "n", "a", "i"), PackedStringArray("t", "o", "c", "u", "d", "l"), PackedStringArray("f", "v", "w", ".", "\'", "k"), PackedStringArray("2", "4", "6", "8", "0", "="), PackedStringArray("\\", "/", "]", "␣", "[", "`"), PackedStringArray("1", "-", "9", "7", "5", "3"), PackedStringArray("z", "x", ";", ",", "j", "q"), PackedStringArray("p", "m", "h", "y", "b", "g")])
diff --git a/UI/ControllerInput/WheelData/Commonality/commonality_uppercase_alphanumeric.tres b/UI/ControllerInput/WheelData/Commonality/commonality_uppercase_alphanumeric.tres
new file mode 100644
index 0000000..cb51cdb
--- /dev/null
+++ b/UI/ControllerInput/WheelData/Commonality/commonality_uppercase_alphanumeric.tres
@@ -0,0 +1,7 @@
+[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://n6dppjyu3tve"]
+
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_fr6ap"]
+
+[resource]
+script = ExtResource("1_fr6ap")
+characters = Array[PackedStringArray]([PackedStringArray("E", "S", "R", "N", "A", "I"), PackedStringArray("T", "O", "C", "U", "D", "L"), PackedStringArray("F", "V", "W", ">", "\"", "K"), PackedStringArray("@", "$", "^", "*", ")", "+"), PackedStringArray("|", "?", "}", "␣", "{", "~"), PackedStringArray("!", "_", "(", "&", "%", "#"), PackedStringArray("Z", "X", ":", "<", "J", "Q"), PackedStringArray("P", "M", "H", "Y", "B", "G")])
diff --git a/UI/ControllerInput/WheelData/QWERTY/qwerty_layout.tres b/UI/ControllerInput/WheelData/QWERTY/qwerty_layout.tres
new file mode 100644
index 0000000..eb2dd51
--- /dev/null
+++ b/UI/ControllerInput/WheelData/QWERTY/qwerty_layout.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="ControllerInputWheelDataPack" load_steps=4 format=3 uid="uid://0umpm8nid67x"]
+
+[ext_resource type="Resource" uid="uid://kq6jlrhwiq6y" path="res://addons/Bugbot/UI/ControllerInput/WheelData/QWERTY/qwerty_lowercase_alphanumeric.tres" id="1_gbr44"]
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data_pack.gd" id="2_q50tk"]
+[ext_resource type="Resource" uid="uid://3u1fdhl02un7" path="res://addons/Bugbot/UI/ControllerInput/WheelData/QWERTY/qwerty_uppercase_alphanumeric.tres" id="3_0ae2w"]
+
+[resource]
+script = ExtResource("2_q50tk")
+lowercase = ExtResource("1_gbr44")
+uppercase = ExtResource("3_0ae2w")
diff --git a/UI/ControllerInput/WheelData/qwerty_lowercase_alphanumeric.tres b/UI/ControllerInput/WheelData/QWERTY/qwerty_lowercase_alphanumeric.tres
similarity index 82%
rename from UI/ControllerInput/WheelData/qwerty_lowercase_alphanumeric.tres
rename to UI/ControllerInput/WheelData/QWERTY/qwerty_lowercase_alphanumeric.tres
index 3c9e437..8b45ad7 100644
--- a/UI/ControllerInput/WheelData/qwerty_lowercase_alphanumeric.tres
+++ b/UI/ControllerInput/WheelData/QWERTY/qwerty_lowercase_alphanumeric.tres
@@ -1,7 +1,7 @@
-[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://oiupgjqy1f8s"]
+[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://kq6jlrhwiq6y"]
 
-[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_lbkw6"]
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_k52d6"]
 
 [resource]
-script = ExtResource("1_lbkw6")
+script = ExtResource("1_k52d6")
 characters = Array[PackedStringArray]([PackedStringArray("6", "7", "u", "y", "t", "5"), PackedStringArray("9", "0", "-", "o", "i", "8"), PackedStringArray("=", "\'", "\\", "]", "[", "p"), PackedStringArray(";", "/", ".", ",", "k", "l"), PackedStringArray("h", "j", "m", "␣", "n", "g"), PackedStringArray("s", "d", "f", "b", "v", "c"), PackedStringArray("`", "w", "q", "a", "x", "z"), PackedStringArray("3", "4", "r", "e", "1", "2")])
diff --git a/UI/ControllerInput/WheelData/qwerty_uppercase_alphanumeric.tres b/UI/ControllerInput/WheelData/QWERTY/qwerty_uppercase_alphanumeric.tres
similarity index 82%
rename from UI/ControllerInput/WheelData/qwerty_uppercase_alphanumeric.tres
rename to UI/ControllerInput/WheelData/QWERTY/qwerty_uppercase_alphanumeric.tres
index 363e588..a588e5b 100644
--- a/UI/ControllerInput/WheelData/qwerty_uppercase_alphanumeric.tres
+++ b/UI/ControllerInput/WheelData/QWERTY/qwerty_uppercase_alphanumeric.tres
@@ -1,7 +1,7 @@
-[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://bi8wyvfejil2l"]
+[gd_resource type="Resource" script_class="ControllerInputWheelData" load_steps=2 format=3 uid="uid://3u1fdhl02un7"]
 
-[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_px0r8"]
+[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data.gd" id="1_hm8pa"]
 
 [resource]
-script = ExtResource("1_px0r8")
+script = ExtResource("1_hm8pa")
 characters = Array[PackedStringArray]([PackedStringArray("^", "&", "U", "Y", "T", "%"), PackedStringArray("(", ")", "_", "O", "I", "*"), PackedStringArray("+", "\"", "|", "}", "{", "P"), PackedStringArray(":", "?", ">", "<", "K", "L"), PackedStringArray("H", "J", "M", "␣", "N", "G"), PackedStringArray("S", "D", "F", "B", "V", "C"), PackedStringArray("~", "W", "Q", "A", "X", "Z"), PackedStringArray("#", "$", "R", "E", "!", "@")])
diff --git a/UI/ControllerInput/WheelData/qwerty_layout.tres b/UI/ControllerInput/WheelData/qwerty_layout.tres
deleted file mode 100644
index 44bfece..0000000
--- a/UI/ControllerInput/WheelData/qwerty_layout.tres
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="ControllerInputWheelDataPack" load_steps=4 format=3 uid="uid://clfqsqcsr4hns"]
-
-[ext_resource type="Resource" uid="uid://oiupgjqy1f8s" path="res://addons/Bugbot/UI/ControllerInput/WheelData/qwerty_lowercase_alphanumeric.tres" id="1_04qmu"]
-[ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/wheel_data_pack.gd" id="1_ux2y7"]
-[ext_resource type="Resource" uid="uid://bi8wyvfejil2l" path="res://addons/Bugbot/UI/ControllerInput/WheelData/qwerty_uppercase_alphanumeric.tres" id="3_80dkp"]
-
-[resource]
-script = ExtResource("1_ux2y7")
-lowercase = ExtResource("1_04qmu")
-uppercase = ExtResource("3_80dkp")
diff --git a/UI/ControllerInput/controller_input_select_wheel.tscn b/UI/ControllerInput/controller_input_select_wheel.tscn
index e30672d..14ce200 100644
--- a/UI/ControllerInput/controller_input_select_wheel.tscn
+++ b/UI/ControllerInput/controller_input_select_wheel.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://addons/Bugbot/UI/ControllerInput/controller_input_select_wheel.gd" id="1_4y52p"]
 [ext_resource type="Theme" uid="uid://bc7mjpjex4ovr" path="res://addons/Bugbot/UI/ControllerInput/select_wheel_theme.theme" id="1_5fmnc"]
-[ext_resource type="Resource" uid="uid://clfqsqcsr4hns" path="res://addons/Bugbot/UI/ControllerInput/WheelData/qwerty_layout.tres" id="3_fpjxt"]
+[ext_resource type="Resource" uid="uid://clfqsqcsr4hns" path="res://addons/Bugbot/UI/ControllerInput/WheelData/Commonality/commonality_layout.tres" id="3_sxu08"]
 [ext_resource type="Material" uid="uid://bnh0d5o2riay8" path="res://addons/Bugbot/UI/ControllerInput/circle_backing.material" id="5_bebuy"]
 
 [sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_lmyr0"]
@@ -69,7 +69,7 @@ pivot_offset = Vector2(640, 360)
 focus_mode = 2
 theme = ExtResource("1_5fmnc")
 script = ExtResource("1_4y52p")
-wheel_data_pack = ExtResource("3_fpjxt")
+wheel_data_pack = ExtResource("3_sxu08")
 unselected_radius = 0.9
 selected_radius = 1.0
 unselected_scale = Vector2(0.65, 0.65)