diff --git a/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/2.79/SCRIPTS/PRESETS/KEYCONFIG/O_97_2_O_2_79_O.PY b/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/2.79/SCRIPTS/PRESETS/KEYCONFIG/O_97_2_O_2_79_O.PY
index 71100864..277549d9 100644
--- a/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/2.79/SCRIPTS/PRESETS/KEYCONFIG/O_97_2_O_2_79_O.PY
+++ b/◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯ⵙ◯ᗩIᗝI⚭◯⚪◯⚭IᗝIᗩ◯/◯✤ᴥᗩ◯ⵙ◯ᗩᴥ✤◯/◯ᗱᗴᴥᗩᗯ✤⏀Ⓞᔓᔕ◯ⵙ◯ᔓᔕⓄ⏀✤ᗯᗩᴥᗱᗴ◯/◯ᗝⵈ◯ⵙ◯ⵈᗝ◯/◯ᴥᗱᗴᗝИNᗱᗴᙁ⚭◯ⵙ◯⚭ᙁᗱᗴИNᗝᗱᗴᴥ◯/◯ИNⓄꖴ✤ᗩᴥᑎᕤᕦꖴ⏀ИNⓄᑐᑕ◯ⵙᑐᑕⓄИN⏀ꖴᕤᕦᑎᴥᗩ✤ꖴⓄИN◯/2.79/SCRIPTS/PRESETS/KEYCONFIG/O_97_2_O_2_79_O.PY
@@ -13,31 +13,6 @@ def kmi_props_setattr(kmi_props, attr, value):
 wm = bpy.context.window_manager
 kc = wm.keyconfigs.new(os.path.splitext(os.path.basename(__file__))[0])
 
-# Map View2D
-km = kc.keymaps.new('View2D', space_type='EMPTY', region_type='WINDOW', modal=False)
-
-kmi = km.keymap_items.new('view2d.scroller_activate', 'LEFTMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.scroller_activate', 'MIDDLEMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('view2d.pan', 'TRACKPADPAN', 'ANY')
-kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS', ctrl=True)
-kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
-kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS', shift=True)
-kmi = km.keymap_items.new('view2d.ndof', 'NDOF_MOTION', 'ANY')
-kmi = km.keymap_items.new('view2d.zoom_out', 'WHEELOUTMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.zoom_in', 'WHEELINMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.zoom_out', 'NUMPAD_MINUS', 'PRESS')
-kmi = km.keymap_items.new('view2d.zoom_in', 'NUMPAD_PLUS', 'PRESS')
-kmi = km.keymap_items.new('view2d.zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
-kmi = km.keymap_items.new('view2d.smoothview', 'TIMER1', 'ANY', any=True)
-kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view2d.zoom_border', 'B', 'PRESS', shift=True)
-
 # Map View2D Buttons List
 km = kc.keymaps.new('View2D Buttons List', space_type='EMPTY', region_type='WINDOW', modal=False)
 
@@ -51,7 +26,7 @@ kmi = km.keymap_items.new('view2d.scroll_down', 'PAGE_DOWN', 'PRESS')
 kmi_props_setattr(kmi.properties, 'page', True)
 kmi = km.keymap_items.new('view2d.scroll_up', 'PAGE_UP', 'PRESS')
 kmi_props_setattr(kmi.properties, 'page', True)
-kmi = km.keymap_items.new('view2d.zoom', 'MIDDLEMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('view2d.zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('view2d.zoom_out', 'NUMPAD_MINUS', 'PRESS')
 kmi = km.keymap_items.new('view2d.zoom_in', 'NUMPAD_PLUS', 'PRESS')
@@ -74,6 +49,12 @@ kmi = km.keymap_items.new('object.origin_set', 'C', 'PRESS', shift=True, ctrl=Tr
 # Map 3D View
 km = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
 
+kmi = km.keymap_items.new('wm.call_menu', 'Q', 'PRESS', shift=True)
+kmi_props_setattr(kmi.properties, 'name', 'VIEW3D_MT_master_material')
+kmi = km.keymap_items.new('wm.call_menu', 'Q', 'PRESS', shift=True)
+kmi_props_setattr(kmi.properties, 'name', 'VIEW3D_MT_master_material')
+kmi = km.keymap_items.new('wm.call_menu', 'Q', 'PRESS', shift=True)
+kmi_props_setattr(kmi.properties, 'name', 'VIEW3D_MT_master_material')
 kmi = km.keymap_items.new('wm.call_menu', 'Q', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'name', 'VIEW3D_MT_master_material')
 kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
@@ -89,8 +70,7 @@ kmi_props_setattr(kmi.properties, 'release_confirm', True)
 kmi_props_setattr(kmi.properties, 'use_accurate', False)
 kmi_props_setattr(kmi.properties, 'use_planar_constraint', False)
 kmi = km.keymap_items.new('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
-kmi = km.keymap_items.new('view3d.rotate', 'MIDDLEMOUSE', 'PRESS', alt=True)
-kmi = km.keymap_items.new('view3d.move', 'MIDDLEMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view3d.move', 'MIDDLEMOUSE', 'ANY', ctrl=True)
 kmi = km.keymap_items.new('view3d.dolly', 'MIDDLEMOUSE', 'PRESS', shift=True, alt=True)
 kmi = km.keymap_items.new('view3d.view_selected', 'NUMPAD_PERIOD', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'use_all_regions', True)
@@ -100,9 +80,7 @@ kmi = km.keymap_items.new('view3d.view_lock_to_active', 'NUMPAD_PERIOD', 'PRESS'
 kmi = km.keymap_items.new('view3d.view_lock_clear', 'NUMPAD_PERIOD', 'PRESS', alt=True)
 kmi = km.keymap_items.new('view3d.navigate', 'F', 'PRESS', shift=True)
 kmi = km.keymap_items.new('view3d.smoothview', 'TIMER1', 'ANY', any=True)
-kmi = km.keymap_items.new('view3d.rotate', 'MIDDLEMOUSE', 'ANY')
 kmi = km.keymap_items.new('view3d.move', 'MIDDLEMOUSE', 'ANY', ctrl=True)
-kmi = km.keymap_items.new('view3d.zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('view3d.zoom', 'NUMPAD_PLUS', 'PRESS')
 kmi_props_setattr(kmi.properties, 'delta', 1)
 kmi = km.keymap_items.new('view3d.zoom', 'NUMPAD_MINUS', 'PRESS')
@@ -158,14 +136,6 @@ kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
 kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'BOTTOM')
-kmi = km.keymap_items.new('view3d.view_pan', 'NUMPAD_2', 'PRESS', ctrl=True)
-kmi_props_setattr(kmi.properties, 'type', 'PANDOWN')
-kmi = km.keymap_items.new('view3d.view_pan', 'NUMPAD_4', 'PRESS', ctrl=True)
-kmi_props_setattr(kmi.properties, 'type', 'PANLEFT')
-kmi = km.keymap_items.new('view3d.view_pan', 'NUMPAD_6', 'PRESS', ctrl=True)
-kmi_props_setattr(kmi.properties, 'type', 'PANRIGHT')
-kmi = km.keymap_items.new('view3d.view_pan', 'NUMPAD_8', 'PRESS', ctrl=True)
-kmi_props_setattr(kmi.properties, 'type', 'PANUP')
 kmi = km.keymap_items.new('view3d.view_roll', 'NUMPAD_4', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
 kmi = km.keymap_items.new('view3d.view_roll', 'NUMPAD_6', 'PRESS', shift=True)
@@ -383,7 +353,6 @@ kmi = km.keymap_items.new('image.view_all', 'HOME', 'PRESS')
 kmi = km.keymap_items.new('image.view_all', 'HOME', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'fit_view', True)
 kmi = km.keymap_items.new('image.view_selected', 'NUMPAD_PERIOD', 'PRESS')
-kmi = km.keymap_items.new('image.view_pan', 'MIDDLEMOUSE', 'PRESS')
 kmi = km.keymap_items.new('image.view_pan', 'MIDDLEMOUSE', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('image.view_pan', 'TRACKPADPAN', 'ANY')
 kmi = km.keymap_items.new('image.view_all', 'NDOF_BUTTON_FIT', 'PRESS')
@@ -392,7 +361,7 @@ kmi = km.keymap_items.new('image.view_zoom_in', 'WHEELINMOUSE', 'PRESS')
 kmi = km.keymap_items.new('image.view_zoom_out', 'WHEELOUTMOUSE', 'PRESS')
 kmi = km.keymap_items.new('image.view_zoom_in', 'NUMPAD_PLUS', 'PRESS')
 kmi = km.keymap_items.new('image.view_zoom_out', 'NUMPAD_MINUS', 'PRESS')
-kmi = km.keymap_items.new('image.view_zoom', 'MIDDLEMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('image.view_zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('image.view_zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('image.view_zoom_border', 'B', 'PRESS', shift=True)
 kmi = km.keymap_items.new('image.view_zoom_ratio', 'NUMPAD_8', 'PRESS', ctrl=True)
@@ -463,10 +432,9 @@ kmi = km.keymap_items.new('image.clear_render_border', 'B', 'PRESS', ctrl=True,
 # Map Clip Editor
 km = kc.keymaps.new('Clip Editor', space_type='CLIP_EDITOR', region_type='WINDOW', modal=False)
 
-kmi = km.keymap_items.new('clip.view_pan', 'MIDDLEMOUSE', 'PRESS')
 kmi = km.keymap_items.new('clip.view_pan', 'MIDDLEMOUSE', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('clip.view_pan', 'TRACKPADPAN', 'ANY')
-kmi = km.keymap_items.new('clip.view_zoom', 'MIDDLEMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('clip.view_zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('clip.view_zoom', 'MIDDLEMOUSE', 'ANY', shift=True)
 kmi = km.keymap_items.new('clip.view_zoom_in', 'WHEELINMOUSE', 'PRESS')
 kmi = km.keymap_items.new('clip.view_zoom_out', 'WHEELOUTMOUSE', 'PRESS')
@@ -583,3 +551,26 @@ kmi_props_setattr(kmi.properties, 'value', 'INDIVIDUAL_ORIGINS')
 kmi = km.keymap_items.new('clip.copy_tracks', 'C', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('clip.paste_tracks', 'V', 'PRESS', ctrl=True)
 
+# Map View2D
+km = kc.keymaps.new('View2D', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('view2d.scroller_activate', 'LEFTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroller_activate', 'MIDDLEMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view2d.pan', 'MIDDLEMOUSE', 'ANY')
+kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view2d.ndof', 'NDOF_MOTION', 'ANY')
+kmi = km.keymap_items.new('view2d.zoom_out', 'WHEELOUTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_in', 'WHEELINMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_out', 'NUMPAD_MINUS', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_in', 'NUMPAD_PLUS', 'PRESS')
+kmi = km.keymap_items.new('view2d.smoothview', 'TIMER1', 'ANY', any=True)
+kmi = km.keymap_items.new('view2d.scroll_down', 'WHEELDOWNMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_up', 'WHEELUPMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_right', 'WHEELDOWNMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.scroll_left', 'WHEELUPMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view2d.zoom_border', 'B', 'PRESS', shift=True)
+