diff --git a/Cask b/Cask
index bfe40a660..c37819b77 100644
--- a/Cask
+++ b/Cask
@@ -175,7 +175,6 @@
 ;; CSS -- modules/module-css.el
 (depends-on "less-css-mode")
 (depends-on "sass-mode")
-(depends-on "scss-mode")
 (depends-on "stylus-mode")
 
 ;; Data -- modules/module-data.el
diff --git a/modules/module-css.el b/modules/module-css.el
index 3dd2e0788..f762e771e 100644
--- a/modules/module-css.el
+++ b/modules/module-css.el
@@ -14,48 +14,39 @@
       (:map* (css-mode-map scss-mode-map less-css-mode-map)
         :localleader :nv ";" 'doom/append-semicolon))
 
+;; css & scss
 (use-package css-mode
-  :mode "\\.css$"
+  :mode (("\\.css$"  . css-mode)
+         ("\\.scss$" . scss-mode))
   :init
   (add-hook! css-mode
     '(yas-minor-mode-on flycheck-mode rainbow-mode highlight-numbers-mode
       doom|counsel-css-imenu-setup))
   :config
   (def-company-backend! css-mode (css yasnippet))
-  (push '("css" "scss" "sass" "less" "styl") projectile-other-file-alist))
+  (push '("css" "scss" "sass" "less" "styl") projectile-other-file-alist)
+
+  (def-builder! scss-mode doom/scss-build)
+  (def-company-backend! scss-mode (css yasnippet))
+  (def-docset! scss-mode "sass,bourbon,compass,neat,css")
+  (push '("scss" "css") projectile-other-file-alist))
+
+(use-package sass-mode
+  :mode "\\.sass$"
+  :config
+  (setq sass-command-options '("--style compressed"))
+  (def-builder! sass-mode doom/sass-build)
+  (def-company-backend! sass-mode (css yasnippet))
+  (push '("sass" "css") projectile-other-file-alist))
+
+(use-package less-css-mode
+  :mode "\\.less$"
+  :config (push '("less" "css") projectile-other-file-alist))
 
 (use-package stylus-mode
   :mode "\\.styl$"
   :init (add-hook! stylus-mode '(yas-minor-mode-on flycheck-mode))
   :config (push '("styl" "css") projectile-other-file-alist))
 
-(use-package less-css-mode
-  :mode "\\.less$"
-  :config (push '("less" "css") projectile-other-file-alist))
-
-
-;;
-;; Sass
-;;
-
-(setq scss-sass-options '("--style" "compressed"))
-
-(use-package sass-mode
-  :mode "\\.sass$"
-  :config
-  (def-builder! sass-mode doom/sass-build)
-  (def-company-backend! sass-mode (css yasnippet))
-  (push '("sass" "css") projectile-other-file-alist))
-
-(use-package scss-mode
-  :mode "\\.scss$"
-  :config
-  (def-builder! scss-mode doom/scss-build)
-  (def-company-backend! scss-mode (css yasnippet))
-  (def-docset! scss-mode "sass,bourbon,compass,neat,css")
-  (push '("scss" "css") projectile-other-file-alist)
-  (setq scss-compile-at-save nil))
-
-
 (provide 'module-css)
 ;;; module-css.el ends here