diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
index f092083..f8efd5c 100644
--- a/Default (Linux).sublime-keymap	
+++ b/Default (Linux).sublime-keymap	
@@ -1,24 +1,4 @@
 [
-    { "keys": ["left"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["right"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": true, "extend": true, "visual": false }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["up"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["down"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": true, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
 
     { "keys": ["ctrl+left"], "command": "set_motion", "args": {
         "motion": "move",
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
index b973361..d6effff 100644
--- a/Default (OSX).sublime-keymap	
+++ b/Default (OSX).sublime-keymap	
@@ -28,27 +28,6 @@
         ]
     },
 
-    { "keys": ["left"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["right"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": true, "extend": true, "visual": false }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["up"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["down"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": true, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-
     { "keys": ["alt+left"], "command": "set_motion", "args": {
         "motion": "move",
         "motion_args": {"by": "stops", "word_begin": true, "punct_begin": true, "empty_line": true, "forward": false, "extend": true }},
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
index f092083..45670dc 100644
--- a/Default (Windows).sublime-keymap	
+++ b/Default (Windows).sublime-keymap	
@@ -1,25 +1,4 @@
 [
-    { "keys": ["left"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["right"], "command": "set_motion", "args": {
-        "motion": "vi_move_by_characters_in_line",
-        "motion_args": {"forward": true, "extend": true, "visual": false }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["up"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": false, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-    { "keys": ["down"], "command": "set_motion", "args": {
-        "motion": "move",
-        "motion_args": {"by": "lines", "forward": true, "extend": true }},
-        "context": [{"key": "setting.command_mode"}]
-    },
-
     { "keys": ["ctrl+left"], "command": "set_motion", "args": {
         "motion": "move",
         "motion_args": {"by": "stops", "word_begin": true, "punct_begin": true, "empty_line": true, "forward": false, "extend": true }},
diff --git a/Default.sublime-keymap b/Default.sublime-keymap
index 4711807..baf258d 100644
--- a/Default.sublime-keymap
+++ b/Default.sublime-keymap
@@ -1,4 +1,27 @@
 [
+	{ "keys": ["left"], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["right"], "command": "set_motion", "args": {
+		"motion": "vi_move_by_characters_in_line",
+		"motion_args": {"forward": true, "extend": true, "visual": false }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["up"], "command": "set_motion", "args": {
+		"linewise": true,
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": false, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+	{ "keys": ["down"], "command": "set_motion", "args": {
+		"linewise": true,
+		"motion": "move",
+		"motion_args": {"by": "lines", "forward": true, "extend": true }},
+		"context": [{"key": "setting.command_mode"}]
+	},
+
 	{ "keys": ["escape"], "command": "exit_insert_mode",
 		"context":
 		[