diff --git a/dinput/STK7039RG.cfg b/dinput/STK7039RG.cfg
new file mode 100644
index 000000000..44a2eccaa
--- /dev/null
+++ b/dinput/STK7039RG.cfg
@@ -0,0 +1,60 @@
+# STK7039RG and similar gamepads
+# http://www.saitake.com/product/28.html
+# Firmware v0.37
+# This is for connected via cable profile
+
+input_driver = "dinput"
+input_device = "Gamepad"
+input_vendor_id = "121"
+input_product_id = "6172"
+input_b_btn = "1"
+input_y_btn = "4"
+input_select_btn = "10"
+input_start_btn = "11"
+input_up_btn = "h0up"
+input_down_btn = "h0down"
+input_left_btn = "h0left"
+input_right_btn = "h0right"
+input_a_btn = "0"
+input_x_btn = "3"
+input_l_btn = "6"
+input_r_btn = "7"
+input_l2_btn = "8"
+input_r2_btn = "9"
+input_l3_btn = "13"
+input_r3_btn = "14"
+input_l_x_plus_axis = "+0"
+input_l_x_minus_axis = "-0"
+input_l_y_plus_axis = "+1"
+input_l_y_minus_axis = "-1"
+input_r_x_plus_axis = "+2"
+input_r_x_minus_axis = "-2"
+input_r_y_plus_axis = "+5"
+input_r_y_minus_axis = "-5"
+
+input_up_btn_label = "D-Pad Up"
+input_down_btn_label = "D-Pad Down"
+input_left_btn_label = "D-Pad Left"
+input_right_btn_label = "D-Pad Right"
+input_select_btn_label = "Back"
+input_start_btn_label = "Start"
+input_b_btn_label = "A"
+input_y_btn_label = "X"
+input_a_btn_label = "B"
+input_x_btn_label = "Y"
+input_l_btn_label = "Left Bumper"
+input_r_btn_label = "Right Bumper"
+input_l2_axis_label = "Left Trigger"
+input_r2_axis_label = "Right Trigger"
+input_l3_btn_label = "Left Thumb"
+input_r3_btn_label = "Right Thumb"
+input_l_x_plus_axis_label = "Left Analog X+"
+input_l_x_minus_axis_label = "Left Analog X-"
+input_l_y_plus_axis_label = "Left Analog Y+"
+input_l_y_minus_axis_label = "Left Analog Y-"
+input_r_x_plus_axis_label = "Right Analog X+"
+input_r_x_minus_axis_label = "Right Analog X-"
+input_r_y_plus_axis_label = "Right Analog Y+"
+input_r_y_minus_axis_label = "Right Analog Y-"
+input_menu_toggle_btn_label = "Guide"
+
diff --git a/udev/8BitDo 8BitDo Lite 2.cfg b/udev/8BitDo_8BitDo_Lite_2.cfg
similarity index 53%
rename from udev/8BitDo 8BitDo Lite 2.cfg
rename to udev/8BitDo_8BitDo_Lite_2.cfg
index 446536443..656856398 100644
--- a/udev/8BitDo 8BitDo Lite 2.cfg	
+++ b/udev/8BitDo_8BitDo_Lite_2.cfg
@@ -32,3 +32,23 @@ input_r_x_plus_axis = "+2"
 input_r_x_minus_axis = "-2"
 input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
+
+input_b_btn_label = "B"
+input_start_btn_label = "Start"
+input_up_btn_label = "Dpad Up"
+input_down_btn_label = "Dpad Down"
+input_left_btn_label = "Dpad Left"
+input_right_btn_label = "Dpad Right"
+input_a_btn_label = "A"
+input_l_btn_label = "L"
+input_r_btn_label = "R"
+input_r2_btn_label= "R2"
+input_l2_btn_label = "L2"
+input_l_x_plus_axis_label = "Joystick Right"
+input_l_x_minus_axis_label = "Joystick Left"
+input_l_y_plus_axis_label = "Joystick Down"
+input_l_y_minus_axis_label = "Joystick Up"
+input_r_x_plus_btn_label = "C Right"
+input_r_x_minus_btn_label = "C Left"
+input_r_y_plus_btn_label = "C Down"
+input_r_y_minus_btn_label = "C Up"
diff --git a/udev/8BitDo Ultimate 3mode Xbox.cfg b/udev/8BitDo_Ultimate_3mode_Xbox.cfg
similarity index 54%
rename from udev/8BitDo Ultimate 3mode Xbox.cfg
rename to udev/8BitDo_Ultimate_3mode_Xbox.cfg
index 99321f150..9f6645641 100644
--- a/udev/8BitDo Ultimate 3mode Xbox.cfg	
+++ b/udev/8BitDo_Ultimate_3mode_Xbox.cfg
@@ -31,3 +31,23 @@ input_r_x_plus_axis = "+2"
 input_r_x_minus_axis = "-2"
 input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
+
+input_b_btn_label = "B"
+input_start_btn_label = "Start"
+input_up_btn_label = "Dpad Up"
+input_down_btn_label = "Dpad Down"
+input_left_btn_label = "Dpad Left"
+input_right_btn_label = "Dpad Right"
+input_a_btn_label = "A"
+input_l_btn_label = "L"
+input_r_btn_label = "R"
+input_r2_btn_label= "R2"
+input_l2_btn_label = "L2"
+input_l_x_plus_axis_label = "Joystick Right"
+input_l_x_minus_axis_label = "Joystick Left"
+input_l_y_plus_axis_label = "Joystick Down"
+input_l_y_minus_axis_label = "Joystick Up"
+input_r_x_plus_btn_label = "C Right"
+input_r_x_minus_btn_label = "C Left"
+input_r_y_plus_btn_label = "C Down"
+input_r_y_minus_btn_label = "C Up"
diff --git a/udev/Xbox Wireless Controller.cfg b/udev/Xbox_Wireless_Controller.cfg
similarity index 100%
rename from udev/Xbox Wireless Controller.cfg
rename to udev/Xbox_Wireless_Controller.cfg
diff --git a/udev/ZhiXu Gamepad.cfg b/udev/ZhiXu_Gamepad.cfg
similarity index 100%
rename from udev/ZhiXu Gamepad.cfg
rename to udev/ZhiXu_Gamepad.cfg
diff --git a/xinput/Dispositivo de entrada compatible con Bluetooth XINPUT.cfg b/xinput/Dispositivo de entrada compatible con Bluetooth XINPUT.cfg
new file mode 100644
index 000000000..d7f6495fb
--- /dev/null
+++ b/xinput/Dispositivo de entrada compatible con Bluetooth XINPUT.cfg	
@@ -0,0 +1,58 @@
+# Bluetooth XINPUT Compatible Device (Windows Spanish)
+# Windows uses a localized version of device name
+
+input_driver = "xinput"
+input_device = "Dispositivo de entrada compatible con Bluetooth XINPUT"
+input_vendor_id = "1118"
+input_product_id = "736"
+input_b_btn = "1"
+input_y_btn = "3"
+input_select_btn = "7"
+input_start_btn = "6"
+input_up_btn = "h0up"
+input_down_btn = "h0down"
+input_left_btn = "h0left"
+input_right_btn = "h0right"
+input_a_btn = "0"
+input_x_btn = "2"
+input_l_btn = "4"
+input_r_btn = "5"
+input_l2_axis = "+4"
+input_r2_axis = "+5"
+input_l3_btn = "8"
+input_r3_btn = "9"
+input_l_x_plus_axis = "+0"
+input_l_x_minus_axis = "-0"
+input_l_y_plus_axis = "-1"
+input_l_y_minus_axis = "+1"
+input_r_x_plus_axis = "+2"
+input_r_x_minus_axis = "-2"
+input_r_y_plus_axis = "-3"
+input_r_y_minus_axis = "+3"
+
+input_up_btn_label = "D-Pad Up"
+input_down_btn_label = "D-Pad Down"
+input_left_btn_label = "D-Pad Left"
+input_right_btn_label = "D-Pad Right"
+input_select_btn_label = "Back"
+input_start_btn_label = "Start"
+input_b_btn_label = "A"
+input_y_btn_label = "X"
+input_a_btn_label = "B"
+input_x_btn_label = "Y"
+input_l_btn_label = "Left Bumper"
+input_r_btn_label = "Right Bumper"
+input_l2_axis_label = "Left Trigger"
+input_r2_axis_label = "Right Trigger"
+input_l3_btn_label = "Left Thumb"
+input_r3_btn_label = "Right Thumb"
+input_l_x_plus_axis_label = "Left Analog X+"
+input_l_x_minus_axis_label = "Left Analog X-"
+input_l_y_plus_axis_label = "Left Analog Y+"
+input_l_y_minus_axis_label = "Left Analog Y-"
+input_r_x_plus_axis_label = "Right Analog X+"
+input_r_x_minus_axis_label = "Right Analog X-"
+input_r_y_plus_axis_label = "Right Analog Y+"
+input_r_y_minus_axis_label = "Right Analog Y-"
+input_menu_toggle_btn_label = "Guide"
+