diff --git a/sublime/User/Default (Windows).sublime-keymap b/sublime/User/Default (Windows).sublime-keymap
index 15a543c..7c65fb4 100644
--- a/sublime/User/Default (Windows).sublime-keymap	
+++ b/sublime/User/Default (Windows).sublime-keymap	
@@ -1,6 +1,4 @@
 [
 	{ "keys": ["ctrl+d"], "command": "duplicate_line" },
-	{ "keys": ["ctrl+y"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} },
-	{ "keys": ["ctrl+alt+g"], "command": "run_build", "args": {"build_system": "Packages/User/GruntWatch.sublime-build"} },
-	{ "keys": ["ctrl+`"], "command": "show_panel", "args": {"panel": "output.exec"} }
+	{ "keys": ["ctrl+y"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Line.sublime-macro"} }
 ]
\ No newline at end of file
diff --git a/sublime/User/Emmet.sublime-settings b/sublime/User/Emmet.sublime-settings
new file mode 100644
index 0000000..2e9e369
--- /dev/null
+++ b/sublime/User/Emmet.sublime-settings
@@ -0,0 +1,3 @@
+{
+	"extensions_path": "../User/emmet"
+}
\ No newline at end of file
diff --git a/sublime/User/GruntWatch.sublime-build b/sublime/User/GruntWatch.sublime-build
deleted file mode 100644
index 2cf81f4..0000000
--- a/sublime/User/GruntWatch.sublime-build
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"cmd": ["$packages/User/grunt-watch.sh"],
-	"file_regex": "^>> Stylus: .*?: (.*?):([0-9]*)",
-	"shell": true
-}
diff --git a/sublime/User/Preferences.sublime-settings b/sublime/User/Preferences.sublime-settings
index 7e926f4..36ff8f4 100644
--- a/sublime/User/Preferences.sublime-settings
+++ b/sublime/User/Preferences.sublime-settings
@@ -12,7 +12,11 @@
 	"font_size": 14,
 	"hayaku_CSS_colors_case": "lowercase",
 	"hayaku_CSS_numbers_leading_zero": false,
-	"hayaku_CSS_whitespace_after_colon": "",
+	"hayaku_CSS_syntax_autoguess": [
+		"    selector {              ",
+		"        property:value;     ",
+		"        }                   "
+	],
 	"highlight_line": true,
 	"ignored_packages":
 	[
diff --git a/sublime/User/RunBuild.py b/sublime/User/RunBuild.py
deleted file mode 100644
index 03ac9bb..0000000
--- a/sublime/User/RunBuild.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Runs build system specified in `build_system` argument
-# Based on http://www.bit-101.com/blog/?p=3439
-
-import sublime_plugin
-
-
-class RunBuildCommand(sublime_plugin.WindowCommand):
-	def run(self, build_system):
-		self.window.run_command("set_build_system", {"file": build_system})
-		self.window.run_command("build")
-		self.window.run_command("set_build_system")  # Automatic
diff --git a/sublime/User/Stylus.sublime-settings b/sublime/User/Stylus.sublime-settings
index b489a28..6c84dce 100644
--- a/sublime/User/Stylus.sublime-settings
+++ b/sublime/User/Stylus.sublime-settings
@@ -1,8 +1,11 @@
 {
 	"disable_tab_abbreviations": true,
 
-	// Whitespaces
-	"hayaku_CSS_whitespace_block_end_before": "\n",
+	"hayaku_CSS_syntax_autoguess": [
+		"    selector {              ",
+		"        property:value;     ",
+		"    }                       "
+	],
 
 	// Syntax quirks
 	"hayaku_CSS_syntax_no_curly_braces": false,  // Don't print braces for code blocks
diff --git a/sublime/User/emmet/snippets.json b/sublime/User/emmet/snippets.json
new file mode 100644
index 0000000..b25c586
--- /dev/null
+++ b/sublime/User/emmet/snippets.json
@@ -0,0 +1,5 @@
+{
+	"html": {
+		"filters": "html, bem"
+	}
+}
\ No newline at end of file
diff --git a/sublime/User/grunt-watch.sh b/sublime/User/grunt-watch.sh
deleted file mode 100644
index 6b97a57..0000000
--- a/sublime/User/grunt-watch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Finds directory with `grunt.js` and runs `grunt watch`
-
-cd_to_project_root() {
-	dir=`pwd`
-	while [ "$dir" != "/" ]; do
-		if [ -f "$dir/grunt.js" ]; then
-			cd "$dir"
-			break
-		fi
-		dir=`dirname "$dir"`
-	done
-}
-
-cd_to_project_root
-
-grunt deploy --no-color --debug
-grunt watch --no-color --debug
\ No newline at end of file