diff --git a/snesmax/controller_8Bitdo_NES30_PRO.yaml b/snesmax/controller_8Bitdo_NES30_PRO.yaml
new file mode 100644
index 00000000..53cfdfff
--- /dev/null
+++ b/snesmax/controller_8Bitdo_NES30_PRO.yaml
@@ -0,0 +1,21 @@
+---
+File_hdr:
+  Tag: AppleWin Controller Button Remapping
+  Version: 1
+
+Unit:
+    HID: VID_2DC8&PID_9001
+    Description: 8Bitdo NES30 PRO        # Description to be used in AppleWin's GUI
+    1: A       # A
+    2: B       # B
+    3: ""
+    4: X       # X
+    5: Y       # Y
+    6: ""
+    7: LB      # L2
+    8: RB      # R2
+    9: LB      # L1
+    10: RB     # R1
+    11: SELECT # SELECT
+    12: START  # START
+...
diff --git a/snesmax/controller_Logitech_F310_Dmode.yaml b/snesmax/controller_Logitech_F310_Dmode.yaml
new file mode 100644
index 00000000..8f7c9aa8
--- /dev/null
+++ b/snesmax/controller_Logitech_F310_Dmode.yaml
@@ -0,0 +1,19 @@
+---
+File_hdr:
+  Tag: AppleWin Controller Button Remapping
+  Version: 1
+
+Unit:
+    HID: VID_046D&PID_C216
+    Description: Logitech F310        # Description to be used in AppleWin's GUI
+    1: Y       # X
+    2: B       # A
+    3: A       # B
+    4: X       # Y
+    5: LB      # LB
+    6: RB      # RB
+    7: LB      # LT
+    8: RB      # RT
+    9: SELECT  # BACK
+    10: START  # START
+...
diff --git a/snesmax/controller_Logitech_F310.yaml b/snesmax/controller_Logitech_F310_Xmode.yaml
similarity index 100%
rename from snesmax/controller_Logitech_F310.yaml
rename to snesmax/controller_Logitech_F310_Xmode.yaml
diff --git a/snesmax/controller_Mayflash_MF105.yaml b/snesmax/controller_Mayflash_MF105.yaml
new file mode 100644
index 00000000..ef068972
--- /dev/null
+++ b/snesmax/controller_Mayflash_MF105.yaml
@@ -0,0 +1,19 @@
+---
+File_hdr:
+  Tag: AppleWin Controller Button Remapping
+  Version: 1
+
+Unit:
+    HID: VID_20D6&PID_A710
+    Description: Mayflash MF105        # Description to be used in AppleWin's GUI
+    1: X       # X
+    2: A       # A
+    3: B       # B
+    4: Y       # Y
+    5: LB      # L
+    6: RB      # R
+    7: ""
+    8: ""
+    9: SELECT  # SELECT
+    10: START  # START
+...