diff --git a/.config/karabiner/karabiner.json b/.config/karabiner/karabiner.json
index 4918014..91046dd 100644
--- a/.config/karabiner/karabiner.json
+++ b/.config/karabiner/karabiner.json
@@ -256,6 +256,14 @@
                         {
                             "from": { "consumer_key_code": "eject" },
                             "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }]
+                        },
+                        {
+                            "from": { "key_code": "right_command" },
+                            "to": [{ "key_code": "right_option" }]
+                        },
+                        {
+                            "from": { "key_code": "right_option" },
+                            "to": [{ "key_code": "right_command" }]
                         }
                     ]
                 },
@@ -395,13 +403,17 @@
                     "from": { "key_code": "caps_lock" },
                     "to": [{ "key_code": "escape" }]
                 },
+                {
+                    "from": { "key_code": "left_command" },
+                    "to": [{ "key_code": "right_command" }]
+                },
                 {
                     "from": { "key_code": "grave_accent_and_tilde" },
                     "to": [{ "key_code": "non_us_backslash" }]
                 },
                 {
-                    "from": { "key_code": "left_command" },
-                    "to": [{ "key_code": "right_command" }]
+                    "from": { "key_code": "non_us_backslash" },
+                    "to": [{ "key_code": "grave_accent_and_tilde" }]
                 }
             ],
             "virtual_hid_keyboard": {