diff --git a/Cask b/Cask
index 847f9d75d..df5affa4d 100644
--- a/Cask
+++ b/Cask
@@ -137,6 +137,7 @@
 (depends-on "emacs-eclim")
 (depends-on "groovy-mode")
 (depends-on "android-mode")
+(depends-on "scala-mode2" :git "https://github.com/hvesalai/scala-mode2")
 ;; C/C++
 (depends-on "cmake-mode")
 (depends-on "glsl-mode")
@@ -147,6 +148,7 @@
 (depends-on "go-mode")
 (depends-on "swift-mode")
 (depends-on "vimrc-mode")
+(depends-on "nand2tetris" :git "https://github.com/CestDiego/nand2tetris.el")
 
 ;; (depends-on "haxe-mode")
 ;; (depends-on "rust-mode")
diff --git a/modules/module-java.el b/modules/module-java.el
index 3a09747aa..35da34809 100644
--- a/modules/module-java.el
+++ b/modules/module-java.el
@@ -37,7 +37,10 @@
 
 (use-package groovy-mode
   :functions (is-groovy-mode)
-  :mode ("\\.gradle$" "\\.gvy$" "\\.groovy$"))
+  :mode "\\.\\(gradle\\|gvy\\|groovy\\)$")
+
+(use-package scala-mode2
+  :mode ("\\.\\(scala\\|sbt\\)$" . scala-mode))
 
 (provide 'module-java)
 ;;; module-java.el ends here