diff --git a/sublime-text-3/User/.gitignore b/sublime-text-3/User/.gitignore
index 725ae77..fa5e4cd 100644
--- a/sublime-text-3/User/.gitignore
+++ b/sublime-text-3/User/.gitignore
@@ -1,3 +1,4 @@
 *
-*.sublime-settingsb
+!*.sublime-settings
+!*.sublime-keymap
 !.gitignore
diff --git a/sublime-text-3/User/Default (Linux).sublime-keymap b/sublime-text-3/User/Default (Linux).sublime-keymap
new file mode 100644
index 0000000..d0ae974
--- /dev/null
+++ b/sublime-text-3/User/Default (Linux).sublime-keymap	
@@ -0,0 +1,9 @@
+[
+    { "keys": ["ctrl+shift+d"], "command": "toggle_side_bar" },
+
+    { "keys": ["ctrl+pagedown"], "command": "next_view_in_stack" },
+    { "keys": ["ctrl+pageup"], "command": "prev_view_in_stack" },
+
+    { "keys": ["ctrl+tab"], "command": "next_view" },
+    { "keys": ["ctrl+shift+tab"], "command": "prev_view" },
+]
diff --git a/sublime-text-3/User/Package Control.sublime-settings b/sublime-text-3/User/Package Control.sublime-settings
index c71cda6..7559aa1 100644
--- a/sublime-text-3/User/Package Control.sublime-settings	
+++ b/sublime-text-3/User/Package Control.sublime-settings	
@@ -2,9 +2,12 @@
 	"installed_packages":
 	[
 		"Git",
+		"GitGutter",
 		"SideBarEnhancements",
+		"SublimeCodeIntel",
 		"SublimeHideTabs",
-		"Theme - Soda"
+		"Theme - Soda",
+		"VintageousOrigami"
 	],
 	"repositories":
 	[
diff --git a/sublime-text-3/User/Preferences.sublime-settings b/sublime-text-3/User/Preferences.sublime-settings
index 765a8ad..009a4bc 100644
--- a/sublime-text-3/User/Preferences.sublime-settings
+++ b/sublime-text-3/User/Preferences.sublime-settings
@@ -121,7 +121,7 @@
 	"move_to_limit_on_up_down": false,
 	"open_files_in_new_window": true,
 	"overlay_scroll_bars": "system",
-	"preview_on_click": true,
+	"preview_on_click": true, //This annoyes me, but I should keep it as is
 	"remember_open_files": false,
 	"rulers":
 	[
@@ -146,6 +146,6 @@
 	"trim_trailing_white_space_on_save": false,
 	"use_simple_full_screen": false,
 	"use_tab_stops": true,
-	"word_wrap": "auto",
+	"word_wrap": false,
 	"wrap_width": 0
 }
diff --git a/sublime-text-3/User/Side Bar.sublime-settings b/sublime-text-3/User/Side Bar.sublime-settings
index 542090f..aa3ffe4 100644
--- a/sublime-text-3/User/Side Bar.sublime-settings	
+++ b/sublime-text-3/User/Side Bar.sublime-settings	
@@ -1,3 +1,15 @@
 {
-	"version": "2012.06.06.1611.2"
+	"version": "2012.06.06.1611.2",
+
+    "disabled_menuitem_open_run":           true,
+    "disabled_menuitem_open_in_browser":    true,
+    "disabled_menuitem_open_in_new_window": false,
+    "disabled_menuitem_find_in_project":    false,
+    "disabled_menuitem_copy_name":          false,
+    "disabled_menuitem_copy_path":          false,
+    "disabled_menuitem_copy_dir_path":      true,
+    "disabled_menuitem_paste_in_parent":    false,
+    "disabled_menuitem_empty":              true,
+
+    "expand_sidebar_on_startup":            true,
 }