diff --git a/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/⠀⠀⠀⠀ⵙ⠀ߦ⠀ⵙ⠀ᗩ⠀ⵙ⠀ᙏ⠀ⵙ⠀人⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀✻⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀✻⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀人⠀ⵙ⠀ᙏ⠀ⵙ⠀ᗩ⠀ⵙ⠀ߦ⠀ⵙ⠀⠀⠀⠀/⠀.PY b/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/⠀⠀⠀⠀ⵙ⠀ߦ⠀ⵙ⠀ᗩ⠀ⵙ⠀ᙏ⠀ⵙ⠀人⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀✻⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀✻⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀人⠀ⵙ⠀ᙏ⠀ⵙ⠀ᗩ⠀ⵙ⠀ߦ⠀ⵙ⠀⠀⠀⠀/⠀.PY
index 0e294b5f..8afb3229 100644
--- a/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/⠀⠀⠀⠀ⵙ⠀ߦ⠀ⵙ⠀ᗩ⠀ⵙ⠀ᙏ⠀ⵙ⠀人⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀✻⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀✻⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀人⠀ⵙ⠀ᙏ⠀ⵙ⠀ᗩ⠀ⵙ⠀ߦ⠀ⵙ⠀⠀⠀⠀/⠀.PY
+++ b/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/⠀⠀⠀⠀ⵙ⠀ߦ⠀ⵙ⠀ᗩ⠀ⵙ⠀ᙏ⠀ⵙ⠀人⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀✻⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀⠀⠀⠀◯⠀⠀⠀⠀ⵙ⠀✻⠀ⵙ⠀ᗱᗴ⠀ⵙ⠀人⠀ⵙ⠀ᙏ⠀ⵙ⠀ᗩ⠀ⵙ⠀ߦ⠀ⵙ⠀⠀⠀⠀/⠀.PY
@@ -25,10 +25,9 @@ keyconfig_data = \
     ("view3d.localview_remove_from", {"type": 'NUMPAD_SLASH', "value": 'PRESS', "alt": True}, None),
     ("view3d.localview_remove_from", {"type": 'SLASH', "value": 'PRESS', "alt": True}, None),
     ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "alt": True}, None),
-    ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
     ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'ANY'}, None),
     ("view3d.rotate", {"type": 'TRACKPADPAN', "value": 'ANY', "shift": True}, None),
-    ("view3d.move", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
+    ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'ANY', "ctrl": True}, None),
     ("view3d.zoom",
      {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True},
      {"properties":
@@ -53,7 +52,7 @@ keyconfig_data = \
      ),
     ("view3d.smoothview", {"type": 'TIMER1', "value": 'ANY', "any": True}, None),
     ("view3d.zoom", {"type": 'TRACKPADZOOM', "value": 'ANY'}, None),
-    ("view3d.zoom", {"type": 'TRACKPADPAN', "value": 'ANY', "ctrl": True}, None),
+    ("view3d.zoom", {"type": 'MIDDLEMOUSE', "value": 'ANY', "shift": True}, None),
     ("view3d.zoom",
      {"type": 'NUMPAD_PLUS', "value": 'PRESS', "repeat": True},
      {"properties":