diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 61b21140..ab5e07ab 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -285,33 +285,33 @@ NEWSYM numjoy,    db 0   ; number of joysticks (1 = 1, 2 = 2)
 NEWSYM pl1contrl, db 1   ; player 1 device
 NEWSYM pl1keya,   dd 0
 NEWSYM pl1keyb,   dd 0
-NEWSYM pl1selk,   dd 54  ; 1SELECT = SHIFT
-NEWSYM pl1startk, dd 28  ; 1START = ENTER
-NEWSYM pl1upk,    dd 72  ; 1UP = up 
-NEWSYM pl1downk,  dd 80  ; 1DOWN = down 
-NEWSYM pl1leftk,  dd 75  ; 1LEFT = left 
-NEWSYM pl1rightk, dd 77  ; 1RIGHT = right 
-NEWSYM pl1Xk,     dd 82  ; 1X = INS
-NEWSYM pl1Ak,     dd 71  ; 1A = HOME
-NEWSYM pl1Lk,     dd 73  ; 1L = PAGE UP
-NEWSYM pl1Yk,     dd 83  ; 1Y = DELETE
-NEWSYM pl1Bk,     dd 79  ; 1B = END
-NEWSYM pl1Rk,     dd 81  ; 1R = PAGE DOWN
+NEWSYM pl1selk,   dd 54
+NEWSYM pl1startk, dd 28
+NEWSYM pl1upk,    dd 72
+NEWSYM pl1downk,  dd 80
+NEWSYM pl1leftk,  dd 75 
+NEWSYM pl1rightk, dd 77
+NEWSYM pl1Xk,     dd 31
+NEWSYM pl1Ak,     dd 45
+NEWSYM pl1Lk,     dd 32
+NEWSYM pl1Yk,     dd 30
+NEWSYM pl1Bk,     dd 44
+NEWSYM pl1Rk,     dd 46
 NEWSYM pl2contrl, db 0   ; player 2 device
 NEWSYM pl2keya,   dd 0
 NEWSYM pl2keyb,   dd 0
-NEWSYM pl2selk,   dd 56   ; 2SELECT = alt
-NEWSYM pl2startk, dd 29   ; 2START = ctrl
-NEWSYM pl2upk,    dd 37   ; 2UP = k
-NEWSYM pl2downk,  dd 50   ; 2DOWN = m
-NEWSYM pl2leftk,  dd 49   ; 2LEFT = n
-NEWSYM pl2rightk, dd 51   ; 2RIGHT = ,
-NEWSYM pl2Xk,     dd 31   ; 2X = S
-NEWSYM pl2Ak,     dd 32   ; 2A = D
-NEWSYM pl2Lk,     dd 33   ; 2L = F
-NEWSYM pl2Yk,     dd 44   ; 2Y = Z
-NEWSYM pl2Bk,     dd 45   ; 2B = X
-NEWSYM pl2Rk,     dd 46   ; 2R = C
+NEWSYM pl2selk,   dd 27
+NEWSYM pl2startk, dd 26
+NEWSYM pl2upk,    dd 199
+NEWSYM pl2downk,  dd 207
+NEWSYM pl2leftk,  dd 211
+NEWSYM pl2rightk, dd 209
+NEWSYM pl2Xk,     dd 24
+NEWSYM pl2Ak,     dd 25
+NEWSYM pl2Lk,     dd 23
+NEWSYM pl2Yk,     dd 37
+NEWSYM pl2Bk,     dd 38
+NEWSYM pl2Rk,     dd 36
 NEWSYM JoyStart,  db 0
 NEWSYM JoySelec,  db 0
 NEWSYM JoyBC,     db 1
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index 7989bb4f..4f157c8b 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -24,18 +24,6 @@ EXTSYM ccmdline
 EXTSYM FilenameStart
 EXTSYM spcon
 EXTSYM cfgsoundon
-EXTSYM pl1selk
-EXTSYM pl1startk
-EXTSYM pl1upk
-EXTSYM pl1downk
-EXTSYM pl1leftk
-EXTSYM pl1rightk
-EXTSYM pl1Xk
-EXTSYM pl1Ak
-EXTSYM pl1Lk
-EXTSYM pl1Yk
-EXTSYM pl1Bk
-EXTSYM pl1Rk
 EXTSYM cfgcvidmode
 EXTSYM pl1contrl,pl2contrl
 EXTSYM InitDir,InitDrive, SRAMDir, SRAMDrive
@@ -211,28 +199,6 @@ NEWSYM SystemInit
     mov byte[esi+12+256],0
 %endif
 
-    mov byte[pl1selk],54
-    mov byte[pl1startk],28  ; 1START = ENTER
-%ifdef __LINUX__
-    mov byte[pl1upk],90  ; 1UP = up 
-    mov byte[pl1downk],96  ; 1DOWN = down 
-    mov byte[pl1leftk],92  ; 1LEFT = left 
-    mov byte[pl1rightk],94  ; 1RIGHT = right 
-%else
-    mov byte[pl1upk],200  ; 1UP = up 
-    mov byte[pl1downk],208  ; 1DOWN = down 
-    mov byte[pl1leftk],203  ; 1LEFT = left 
-    mov byte[pl1rightk],205  ; 1RIGHT = right 
-%endif
-    mov byte[pl1Xk],31  ; 1X = INS
-    mov byte[pl1Ak],45  ; 1A = HOME
-    mov byte[pl1Lk],32  ; 1L = PAGE UP
-    mov byte[pl1Yk],30  ; 1Y = DELETE
-    mov byte[pl1Bk],44  ; 1B = END
-    mov byte[pl1Rk],46  ; 1R = PAGE DOWN
-    mov byte[pl1contrl],1
-    mov byte[pl2contrl],1
-
     mov byte[spcon],1
     mov byte[soundon],1
     mov byte[cfgsoundon],1
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index c65699c8..7ebd166c 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -24,18 +24,6 @@ EXTSYM ccmdline
 EXTSYM FilenameStart
 EXTSYM spcon
 EXTSYM cfgsoundon
-EXTSYM pl1selk
-EXTSYM pl1startk
-EXTSYM pl1upk
-EXTSYM pl1downk
-EXTSYM pl1leftk
-EXTSYM pl1rightk
-EXTSYM pl1Xk
-EXTSYM pl1Ak
-EXTSYM pl1Lk
-EXTSYM pl1Yk
-EXTSYM pl1Bk
-EXTSYM pl1Rk
 EXTSYM cfgcvidmode
 EXTSYM pl1contrl,pl2contrl
 EXTSYM InitDir,InitDrive
@@ -197,21 +185,6 @@ NEWSYM SystemInit
     mov byte[esi+11+256],'T'
     mov byte[esi+12+256],0
 
-    mov byte[pl1selk],54
-    mov byte[pl1startk],28  ; 1START = ENTER
-    mov byte[pl1upk],200  ; 1UP = up 
-    mov byte[pl1downk],208  ; 1DOWN = down 
-    mov byte[pl1leftk],203  ; 1LEFT = left 
-    mov byte[pl1rightk],205  ; 1RIGHT = right 
-    mov byte[pl1Xk],31  ; 1X = INS
-    mov byte[pl1Ak],45  ; 1A = HOME
-    mov byte[pl1Lk],32  ; 1L = PAGE UP
-    mov byte[pl1Yk],30  ; 1Y = DELETE
-    mov byte[pl1Bk],44  ; 1B = END
-    mov byte[pl1Rk],46  ; 1R = PAGE DOWN
-    mov byte[pl1contrl],1
-    mov byte[pl2contrl],1
-
     mov byte[spcon],1
     mov byte[soundon],1
     mov byte[cfgsoundon],1