* Fixed the wrong right modifier key assignments. I have no idea why they

were so messed up in the first place. * Please only change this in case your keymap now behaves differently than it does on other platforms. Switching to Control as the command key is not a reason to complain, at least. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29758 a95241bf-73f2-0310-859d-f6bbb57e9c96
2009-03-28 18:11:26 +00:00 · 2009-03-28 18:11:26 +00:00 · 2d1f2ca799
parent 4e78d3bc78
commit 2d1f2ca799
49 changed files with 134 additions and 134 deletions
--- a/src/data/etc/keymaps/Albanian.keymap
+++ b/src/data/etc/keymaps/Albanian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/American.keymap
+++ b/src/data/etc/keymaps/American.keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Arabic(102).keymap
+++ b/src/data/etc/keymaps/Arabic(102).keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Belgian.keymap
+++ b/src/data/etc/keymaps/Belgian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Brazilian(ABNT2).keymap
+++ b/src/data/etc/keymaps/Brazilian(ABNT2).keymap
@ -39,11 +39,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap
+++ b/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Byelorussian.keymap
+++ b/src/data/etc/keymaps/Byelorussian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Canadian-French.keymap
+++ b/src/data/etc/keymaps/Canadian-French.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Czech.keymap
+++ b/src/data/etc/keymaps/Czech.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Danish.keymap
+++ b/src/data/etc/keymaps/Danish.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Dutch.keymap
+++ b/src/data/etc/keymaps/Dutch.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Dvorak.keymap
+++ b/src/data/etc/keymaps/Dvorak.keymap
@ -42,9 +42,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Estonian.keymap
+++ b/src/data/etc/keymaps/Estonian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Faeroese.keymap
+++ b/src/data/etc/keymaps/Faeroese.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/French(Mac).keymap
+++ b/src/data/etc/keymaps/French(Mac).keymap
@ -48,7 +48,7 @@ RCommand = 0x67
 LControl = 0x5c
 RControl = 0x60
 LOption = 0x5d
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68

 #
--- a/src/data/etc/keymaps/French.keymap
+++ b/src/data/etc/keymaps/French.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/German.keymap
+++ b/src/data/etc/keymaps/German.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Greek.keymap
+++ b/src/data/etc/keymaps/Greek.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Hebrew.keymap
+++ b/src/data/etc/keymaps/Hebrew.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Hungarian.keymap
+++ b/src/data/etc/keymaps/Hungarian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/ISO-9995.keymap
+++ b/src/data/etc/keymaps/ISO-9995.keymap
@ -41,7 +41,7 @@ RCommand = 0x5f
 LControl = 0x5c
 RControl = 0x60
 LOption = 0x66
-ROption = 0x67
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Icelandic.keymap
+++ b/src/data/etc/keymaps/Icelandic.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Irish.keymap
+++ b/src/data/etc/keymaps/Irish.keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Italian.keymap
+++ b/src/data/etc/keymaps/Italian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Japanese.keymap
+++ b/src/data/etc/keymaps/Japanese.keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Latin-American.keymap
+++ b/src/data/etc/keymaps/Latin-American.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Lithuanian(Baltic).keymap
+++ b/src/data/etc/keymaps/Lithuanian(Baltic).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Macedonian.keymap
+++ b/src/data/etc/keymaps/Macedonian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Norwegian.keymap
+++ b/src/data/etc/keymaps/Norwegian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Polish(programmer's).keymap
+++ b/src/data/etc/keymaps/Polish(programmer's).keymap
@ -39,11 +39,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Polish.keymap
+++ b/src/data/etc/keymaps/Polish.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Portuguese.keymap
+++ b/src/data/etc/keymaps/Portuguese.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Romanian.keymap
+++ b/src/data/etc/keymaps/Romanian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Russian.keymap
+++ b/src/data/etc/keymaps/Russian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Serbian(Cyrillic).keymap
+++ b/src/data/etc/keymaps/Serbian(Cyrillic).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Serbian(Latin).keymap
+++ b/src/data/etc/keymaps/Serbian(Latin).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Slovak.keymap
+++ b/src/data/etc/keymaps/Slovak.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Slovene.keymap
+++ b/src/data/etc/keymaps/Slovene.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Spanish(Dvorak).keymap
+++ b/src/data/etc/keymaps/Spanish(Dvorak).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Spanish.keymap
+++ b/src/data/etc/keymaps/Spanish.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Svorak.keymap
+++ b/src/data/etc/keymaps/Svorak.keymap
@ -10,7 +10,7 @@ RCommand = 0x67
 LControl = 0x5c
 RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 LockSettings = ScrollLock
 Key 0x00 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
--- a/src/data/etc/keymaps/Swedish.keymap
+++ b/src/data/etc/keymaps/Swedish.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Swiss-French.keymap
+++ b/src/data/etc/keymaps/Swiss-French.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Swiss-German.keymap
+++ b/src/data/etc/keymaps/Swiss-German.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Turkish(type-F).keymap
+++ b/src/data/etc/keymaps/Turkish(type-F).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Turkish(type-Q).keymap
+++ b/src/data/etc/keymaps/Turkish(type-Q).keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/US-International.keymap
+++ b/src/data/etc/keymaps/US-International.keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/Ukrainian.keymap
+++ b/src/data/etc/keymaps/Ukrainian.keymap
@ -37,11 +37,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x60
+RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings
--- a/src/data/etc/keymaps/United-Kingdom.keymap
+++ b/src/data/etc/keymaps/United-Kingdom.keymap
@ -39,9 +39,9 @@ RShift = 0x56
 LCommand = 0x5d
 RCommand = 0x5f
 LControl = 0x5c
-RControl = 0x00
+RControl = 0x60
 LOption = 0x66
-ROption = 0x60
+ROption = 0x66
 Menu = 0x68
 #
 # Lock settings