diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/a_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/a_button.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/a_button.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/a_button.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/b_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/b_button.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/b_button.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/b_button.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/back.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/back.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/back.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/back.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_down.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_down.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_down.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_left.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_left.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_left.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_right.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_right.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_right.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_up.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/dpad_up.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/dpad_up.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/guide.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/guide.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/guide.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/guide.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_bumper.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_bumper.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_bumper.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_bumper.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_down.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_down.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_down.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_left.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_left.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_left.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_press.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_press.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_press.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_press.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_right.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_right.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_right.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_up.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_stick_up.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_stick_up.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_trigger.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_trigger.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/left_trigger.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/left_trigger.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_bumper.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_bumper.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_bumper.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_bumper.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_down.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_down.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_down.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_left.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_left.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_left.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_press.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_press.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_press.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_press.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_right.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_right.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_right.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_up.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_stick_up.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_stick_up.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_trigger.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_trigger.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/right_trigger.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/right_trigger.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/start.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/start.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/start.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/start.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/touchpad.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/touchpad.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/touchpad.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/touchpad.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/x_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/x_button.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/x_button.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/x_button.png
diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/y_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/y_button.png
similarity index 100%
rename from src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox/y_button.png
rename to src/main/resources/assets/controlify/textures/gui/gamepad_buttons/xbox_one/y_button.png