diff --git a/mappings/cordlessrumblepad2 b/mappings/cordlessrumblepad2
deleted file mode 100644
index 3cd667bd..00000000
--- a/mappings/cordlessrumblepad2
+++ /dev/null
@@ -1,30 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = -1
-reverse_x = false
-reverse_y = true
-abs_rx = 2
-abs_ry = 5
-abs_rz = -1
-reverse_rx = false
-reverse_ry = true
-abs_dpad_x = 16
-abs_dpad_y = 17
-reverse_dpad_x = false
-reverse_dpad_y = false
-btn_east = 306
-btn_south = 305
-btn_north = 307
-btn_west = 304
-btn_select = 312
-btn_start = 313
-btn_thumbl = 314
-btn_thumbr = 315
-btn_tl = 308
-btn_tr = 309
-btn_tl2 = 310
-btn_tr2 = 311
-btn_dpad_up = -1
-btn_dpad_down = -1
-btn_dpad_left = -1
-btn_dpad_right = -1
diff --git a/mappings/default.conf b/mappings/default.conf
deleted file mode 100644
index 33946e48..00000000
--- a/mappings/default.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = 2
-abs_rx = 3
-abs_ry = 4
-abs_rz = 5
-abs_deadzone = 0
-abs_dpad_y = 16
-abs_dpad_x = 17
-reverse_x = false
-reverse_y = true
-reverse_rx = false
-reverse_ry = true
-reverse_dpad_y = false
-reverse_dpad_x = false
-btn_south = 304
-btn_east = 305
-btn_north = 307
-btn_west = 308
-btn_select = 314
-btn_start = 315
-btn_mode = 316
-btn_thumbl = 317
-btn_thumbr = 318
-btn_tl = 310
-btn_tr = 311
-btn_tl2 = 312
-btn_tr2 = 313
-btn_dpad_up = 544
-btn_dpad_down = 545
-btn_dpad_left = 546
-btn_dpad_right = 547
diff --git a/mappings/dualshock3.conf b/mappings/dualshock3.conf
deleted file mode 100644
index 01e9b192..00000000
--- a/mappings/dualshock3.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = 50
-abs_rx = 2
-abs_ry = 5
-abs_rz = 51
-abs_deadzone = 0
-abs_dpad_x = -1
-abs_dpad_y = -1
-reverse_x = false
-reverse_y = true
-reverse_rx = false
-reverse_ry = true
-reverse_dpad_x = false
-reverse_dpad_y = false
-btn_west = 303
-btn_south = 302
-btn_north = 300
-btn_east = 301
-btn_select = 288
-btn_start = 291
-btn_mode = 704
-btn_thumbl = 289
-btn_thumbr = 290
-btn_tl = 298
-btn_tr = 299
-btn_tl2 = 296
-btn_tr2 = 297
-btn_dpad_up = 292
-btn_dpad_down = 294
-btn_dpad_left = 295
-btn_dpad_right = 293
diff --git a/mappings/dualshock4.conf b/mappings/dualshock4.conf
deleted file mode 100644
index 195e7f69..00000000
--- a/mappings/dualshock4.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = 3
-abs_rx = 2
-abs_ry = 5
-abs_rz = 4
-abs_deadzone = 0
-abs_dpad_x = 16
-abs_dpad_y = 17
-reverse_x = false
-reverse_y = true
-reverse_rx = false
-reverse_ry = true
-reverse_dpad_x = false
-reverse_dpad_y = false
-btn_west = 304
-btn_south = 305
-btn_north = 307
-btn_east = 306
-btn_select = 312
-btn_start = 313
-btn_mode = 316
-btn_thumbl = 314
-btn_thumbr = 315
-btn_tl = 308
-btn_tr = 309
-btn_tl2 = 310
-btn_tr2 = 311
-btn_dpad_up = -1
-btn_dpad_down = -1
-btn_dpad_left = -1
-btn_dpad_right = -1
diff --git a/mappings/pstv.conf b/mappings/pstv.conf
new file mode 100644
index 00000000..70ccaacf
--- /dev/null
+++ b/mappings/pstv.conf
@@ -0,0 +1,57 @@
+# 600..603 is NW, NE, SW, SE areas of back touchscreen
+# axis is 0,1 left 2,3 right
+# everything else is ordinary key codes
+
+# left stick x axis
+abs_x = 400000
+# y axis
+abs_y = 400001
+# right stick x axis
+abs_rx = 400002
+# y axis
+abs_ry = 400003
+
+# cross
+btn_south = 304000
+# circle
+btn_east = 302000
+# triangle
+btn_north = 301000
+# square
+btn_west = 308000
+# select
+btn_select = 300001
+# start
+btn_start = 300008
+# dpad
+btn_dpad_up = 300010
+btn_dpad_down = 300040
+btn_dpad_left = 300080
+btn_dpad_right = 300020
+# LB
+btn_thumbl = 300400
+# RB
+btn_thumbr = 300800
+
+# LT
+btn_tl = 400004
+# RT
+btn_tr = 400005
+# LS
+btn_tl2 = 300002
+# RS
+btn_tr2 = 300004
+
+# not used
+btn_mode = -1
+abs_rz = -1
+abs_z = -1
+abs_deadzone = 0
+abs_dpad_y = -1
+abs_dpad_x = -1
+reverse_x = false
+reverse_y = false
+reverse_rx = false
+reverse_ry = false
+reverse_dpad_y = false
+reverse_dpad_x = false
diff --git a/mappings/rumblepad2.conf b/mappings/rumblepad2.conf
deleted file mode 100644
index 3c93388b..00000000
--- a/mappings/rumblepad2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = -1
-reverse_x = false
-reverse_y = true
-abs_rx = 2
-abs_ry = 5
-abs_rz = -1
-reverse_rx = false
-reverse_ry = true
-abs_dpad_x = 16
-abs_dpad_y = 17
-reverse_dpad_x = false
-reverse_dpad_y = false
-btn_north = 291
-btn_east = 290
-btn_south = 289
-btn_west = 288
-btn_select = 297
-btn_start = 296
-btn_mode = 0
-btn_thumbl = 298
-btn_thumbr = 299
-btn_tl = 292
-btn_tr = 293
-btn_tl2 = 294
-btn_tr2 = 295
-btn_dpad_up = -1
-btn_dpad_down = -1
-btn_dpad_left = -1
-btn_dpad_right = -1
diff --git a/mappings/vita.conf b/mappings/vita.conf
index 3bc95ec8..662478ed 100644
--- a/mappings/vita.conf
+++ b/mappings/vita.conf
@@ -29,9 +29,9 @@ btn_dpad_down = 300040
 btn_dpad_left = 300080
 btn_dpad_right = 300020
 # LB
-btn_thumbl = 300100
+btn_thumbl = 300400
 # RB
-btn_thumbr = 300200
+btn_thumbr = 300800
 
 # LT
 btn_tl = 500001
diff --git a/mappings/xbox360.conf b/mappings/xbox360.conf
deleted file mode 100644
index d62423ab..00000000
--- a/mappings/xbox360.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-abs_x = 0
-abs_y = 1
-abs_z = 10
-abs_rx = 3
-abs_ry = 4
-abs_rz = 9
-abs_deadzone = 0
-abs_dpad_x = 17
-abs_dpad_y = 16
-reverse_x = false
-reverse_y = true
-reverse_rx = false
-reverse_ry = true
-reverse_dpad_x = false
-reverse_dpad_y = false
-btn_east = 305
-btn_south = 304
-btn_north = 308
-btn_west = 307
-btn_select = 314
-btn_start = 315
-btn_mode = 316
-btn_thumbl = 317
-btn_thumbr = 318
-btn_tl = 310
-btn_tr = 311
-btn_tl2 = 312
-btn_tr2 = 313
-btn_dpad_up = -1
-btn_dpad_down = -1
-btn_dpad_left = -1
-btn_dpad_right = -1