diff --git a/public/json/neo2.json b/public/json/neo2.json
index e6b0d769c..a9bbbb5c5 100644
--- a/public/json/neo2.json
+++ b/public/json/neo2.json
@@ -6679,35 +6679,15 @@
         {
           "type": "basic",
           "from": {
-            "key_code": "left_shift",
-            "modifiers": {
-              "mandatory": [
-                "right_shift"
-              ],
-              "optional": [
-                "caps_lock"
-              ]
-            }
-          },
-          "to": [
-            {
-              "key_code": "caps_lock"
-            }
-          ],
-          "to_if_alone": [
-            {
-              "key_code": "left_shift"
-            }
-          ]
-        },
-        {
-          "type": "basic",
-          "from": {
-            "key_code": "right_shift",
+            "simultaneous": [
+              {
+                "key_code": "left_shift"
+              },
+              {
+                "key_code": "right_shift"
+              }
+            ],
             "modifiers": {
-              "mandatory": [
-                "left_shift"
-              ],
               "optional": [
                 "caps_lock"
               ]
@@ -6715,12 +6695,11 @@
           },
           "to": [
             {
-              "key_code": "caps_lock"
-            }
-          ],
-          "to_if_alone": [
+              "key_code": "caps_lock",
+              "hold_down_milliseconds": 200
+            },
             {
-              "key_code": "right_shift"
+              "key_code": "vk_none"
             }
           ]
         }
diff --git a/src/json/neo2.json.js b/src/json/neo2.json.js
index 8b8490c89..303a924af 100644
--- a/src/json/neo2.json.js
+++ b/src/json/neo2.json.js
@@ -230,15 +230,8 @@ function rules() {
       manipulators: [
         {
           type: 'basic',
-          from: { key_code: 'left_shift', modifiers: { mandatory: ['right_shift'], optional: ['caps_lock'] } },
-          to: [{ key_code: 'caps_lock' }],
-          to_if_alone: [{ key_code: 'left_shift' }]
-        },
-        {
-          type: 'basic',
-          from: { key_code: 'right_shift', modifiers: { mandatory: ['left_shift'], optional: ['caps_lock'] } },
-          to: [{ key_code: 'caps_lock' }],
-          to_if_alone: [{ key_code: 'right_shift' }]
+          from: { simultaneous: [{ key_code: 'left_shift' }, { key_code: 'right_shift' }], modifiers: { optional: ['caps_lock'] } },
+          to: [{ key_code: 'caps_lock', hold_down_milliseconds: 200 }, { key_code: 'vk_none' }]
         }
       ]
     },