--- a/default.cfg	Sun Jan 22 16:13:02 2017 -0800
+++ b/default.cfg	Sun Jan 22 16:23:59 2017 -0800
@@ -42,14 +42,15 @@
 				}
 			}
 			buttons {
-				0 gamepads.1.a
-				1 gamepads.1.b
-				2 gamepads.1.c
-				3 gamepads.1.x
-				4 gamepads.1.y
-				5 gamepads.1.z
-				6 gamepads.1.mode
-				7 gamepads.1.start
+				a gamepads.1.a
+				b gamepads.1.b
+				rightshoulder gamepads.1.c
+				x gamepads.1.x
+				y gamepads.1.y
+				leftshoulder gamepads.1.z
+				back gamepads.1.mode
+				start gamepads.1.start
+				guide ui.exit
 			}
 		}
 		1 {
@@ -62,14 +63,16 @@
 				}
 			}
 			buttons {
-				0 gamepads.2.a
-				1 gamepads.2.b
-				2 gamepads.2.c
-				3 gamepads.2.x
-				4 gamepads.2.y
-				5 gamepads.2.z
-				6 gamepads.2.mode
-				7 gamepads.2.start
+				#this is exactly the same mapping as above, but with PS4 style names
+				cross gamepads.2.a
+				circle gamepads.2.b
+				r1 gamepads.2.c
+				square gamepads.2.x
+				triangle gamepads.2.y
+				l1 gamepads.2.z
+				share gamepads.2.mode
+				options gamepads.2.start
+				guide ui.exit
 			}
 		}
 	}