diff --git a/usbcontroller.cpp b/usbcontroller.cpp
index d304e71..926a1c4 100644
--- a/usbcontroller.cpp
+++ b/usbcontroller.cpp
@@ -105,23 +105,29 @@ void usbController::run()
             connect(gamepad, &QGamepad::axisRightYChanged, this, [](double value) {
                 qInfo(logUsbControl()) << "Right Y" << value;
             });
-            connect(gamepad, &QGamepad::buttonAChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonAChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button A" << pressed;
+                this->buttonState(5, pressed);
             });
-            connect(gamepad, &QGamepad::buttonBChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonBChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button B" << pressed;
+                this->buttonState(4, pressed);
             });
-            connect(gamepad, &QGamepad::buttonXChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonXChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button X" << pressed;
+                this->buttonState(3, pressed);
             });
-            connect(gamepad, &QGamepad::buttonYChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonYChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button Y" << pressed;
+                this->buttonState(2, pressed);
             });
-            connect(gamepad, &QGamepad::buttonL1Changed, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonL1Changed, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button L1" << pressed;
+                this->buttonState(6, pressed);
             });
-            connect(gamepad, &QGamepad::buttonR1Changed, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonR1Changed, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button R1" << pressed;
+                this->buttonState(7, pressed);
             });
             connect(gamepad, &QGamepad::buttonL2Changed, this, [](double value) {
                 qInfo(logUsbControl()) << "Button L2: " << value;
@@ -129,13 +135,15 @@ void usbController::run()
             connect(gamepad, &QGamepad::buttonR2Changed, this, [](double value) {
                 qInfo(logUsbControl()) << "Button R2: " << value;
             });
-            connect(gamepad, &QGamepad::buttonSelectChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonSelectChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button Select" << pressed;
+                this->buttonState(0, pressed);
             });
-            connect(gamepad, &QGamepad::buttonStartChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonStartChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button Start" << pressed;
+                this->buttonState(1, pressed);
             });
-            connect(gamepad, &QGamepad::buttonGuideChanged, this, [](bool pressed) {
+            connect(gamepad, &QGamepad::buttonGuideChanged, this, [this](bool pressed) {
                 qInfo(logUsbControl()) << "Button Guide" << pressed;
             });
 
diff --git a/wfmain.cpp b/wfmain.cpp
index 2361a10..5e20c69 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2146,16 +2146,14 @@ void wfmain::loadSettings()
         usbButtons.append(BUTTON(2, 14, QRect(280, 195, 25, 80), Qt::red, &usbCommands[0], &usbCommands[0]));
 
         // Xbox Gamepad
-        usbButtons.append(BUTTON(4, 0, QRect(302, 160, 40, 40), Qt::red, &usbCommands[0], &usbCommands[0]));
-        usbButtons.append(BUTTON(4, 1, QRect(265,245, 33, 33), Qt::red, &usbCommands[0], &usbCommands[0]));
-        usbButtons.append(BUTTON(4, 2, QRect(261, 316, 33, 33), Qt::red, &usbCommands[0], &usbCommands[0]));
-        usbButtons.append(BUTTON(4, 3, QRect(224, 280, 33, 33), Qt::red, &usbCommands[0], &usbCommands[0]));
-        usbButtons.append(BUTTON(4, 4, QRect(300, 280, 33, 33), Qt::red, &usbCommands[0], &usbCommands[0]));
-        //usbButtons.append(BUTTON(4, 5, QRect(91, 105, 40, 30), Qt::red, &usbCommands[0], &usbCommands[0]));
-        //usbButtons.append(BUTTON(4, 6, QRect(144, 93, 40, 30), Qt::red, &usbCommands[0], &usbCommands[0]));
-        //usbButtons.append(BUTTON(4, 7, QRect(204, 99, 40, 30), Qt::red, &usbCommands[0], &usbCommands[0]));
-        //usbButtons.append(BUTTON(4, 8, QRect(253, 124, 40, 30), Qt::red, &usbCommands[0], &usbCommands[0]));
-        //usbButtons.append(BUTTON(4, 9, QRect(50, 270, 70, 55), Qt::red, &usbCommands[0], &usbCommands[0]));
+        usbButtons.append(BUTTON(4, 0, QRect(302, 160, 40, 40), Qt::red, &usbCommands[0], &usbCommands[0])); // select
+        usbButtons.append(BUTTON(4, 1, QRect(412,163, 40, 40), Qt::red, &usbCommands[0], &usbCommands[0])); // start
+        usbButtons.append(BUTTON(4, 2, QRect(534, 104, 53, 53), Qt::red, &usbCommands[0], &usbCommands[0])); //y
+        usbButtons.append(BUTTON(4, 3, QRect(485, 152, 53, 53), Qt::red, &usbCommands[0], &usbCommands[0])); //x
+        usbButtons.append(BUTTON(4, 4, QRect(590, 152, 53, 53), Qt::red, &usbCommands[0], &usbCommands[0])); //b
+        usbButtons.append(BUTTON(4, 5, QRect(534, 202, 53, 53), Qt::red, &usbCommands[0], &usbCommands[0])); //a
+        usbButtons.append(BUTTON(4, 6, QRect(123, 40, 70, 45), Qt::red, &usbCommands[0], &usbCommands[0])); //L1
+        usbButtons.append(BUTTON(4, 7, QRect(562, 40, 70, 45), Qt::red, &usbCommands[0], &usbCommands[0])); // R1
         //usbButtons.append(BUTTON(4, 10, QRect(210, 270, 70, 55), Qt::red, &usbCommands[0], &usbCommands[0]));
         //usbButtons.append(BUTTON(4, 11, QRect(50, 335, 70, 55), Qt::red, &usbCommands[0], &usbCommands[0]));
         //usbButtons.append(BUTTON(4, 12, QRect(210, 335, 70, 55), Qt::red, &usbCommands[0], &usbCommands[0]));