diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el
index 90d196a..0019d7c 100644
--- a/modules/languages/siren-css.el
+++ b/modules/languages/siren-css.el
@@ -6,6 +6,8 @@
 
 ;;; Code:
 
+(require 'siren-company)
+(require 'siren-lsp)
 (require 'siren-rainbow)
 
 (use-package css-mode
diff --git a/modules/languages/siren-dart.el b/modules/languages/siren-dart.el
index 6c340bf..486e05e 100644
--- a/modules/languages/siren-dart.el
+++ b/modules/languages/siren-dart.el
@@ -6,11 +6,14 @@
 
 ;;; Code:
 
+(require 'siren-company)
 (require 'siren-folding)
+(require 'siren-highlight-symbol)
+(require 'siren-lsp)
 (require 'siren-projectile)
 
 (use-package dart-mode
-  :mode "\\.dart"
+  :mode "\\.dart\\'"
   :interpreter "dart"
 
   :hook
diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index f2c3932..fd594ae 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -9,6 +9,7 @@
 (require 'siren-company)
 (require 'siren-flycheck)
 (require 'siren-folding)
+(require 'siren-highlight-symbol)
 (require 'siren-lsp)
 (require 'siren-projectile)
 
diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el
index e7b759a..1f5a7ee 100644
--- a/modules/languages/siren-js.el
+++ b/modules/languages/siren-js.el
@@ -6,7 +6,9 @@
 
 ;;; Code:
 
+(require 'siren-company)
 (require 'siren-folding)
+(require 'siren-lsp)
 (require 'siren-prettier-js)
 
 (use-package js-mode
diff --git a/modules/languages/siren-json.el b/modules/languages/siren-json.el
index 2deeea9..96e8423 100644
--- a/modules/languages/siren-json.el
+++ b/modules/languages/siren-json.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
-(require 'siren-eslintd-fix)
+(require 'siren-flycheck)
 (require 'siren-folding)
+(require 'siren-js)
 
 (use-package json-mode
   :mode "\\.json\\'"
-  :requires (flycheck highlight-indentation hideshowvis)
 
   :bind (:map json-mode-map
               ("C-j" . newline-and-indent)
diff --git a/modules/languages/siren-php.el b/modules/languages/siren-php.el
index 38edeb9..0e1dd96 100644
--- a/modules/languages/siren-php.el
+++ b/modules/languages/siren-php.el
@@ -6,6 +6,7 @@
 
 ;;; Code:
 
+(require 'siren-company)
 (require 'siren-folding)
 (require 'siren-rainbow)
 
diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el
index ff6f626..dd7985b 100644
--- a/modules/languages/siren-rust.el
+++ b/modules/languages/siren-rust.el
@@ -6,6 +6,7 @@
 
 ;;; Code:
 
+(require 'siren-company)
 (require 'siren-folding)
 (require 'siren-lsp)
 
@@ -24,7 +25,7 @@
     (setq rust-format-on-save t)
 
     (company-mode +1)
-    (lsp-mode)
+    (lsp)
     (siren-folding)
     (subword-mode +1)))
 
diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el
index ad04739..e529d7c 100644
--- a/modules/languages/siren-typescript.el
+++ b/modules/languages/siren-typescript.el
@@ -9,6 +9,7 @@
 (require 'siren-company)
 (require 'siren-flycheck)
 (require 'siren-folding)
+(require 'siren-lsp)
 (require 'siren-prettier-js)
 (require 'siren-web-mode)
 
diff --git a/modules/linting/siren-eslintd-fix.el b/modules/linting/siren-eslintd-fix.el
deleted file mode 100644
index 9913a72..0000000
--- a/modules/linting/siren-eslintd-fix.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; siren-eslintd-fix.el --- jimeh's Emacs Siren: eslintd-fix configuration.
-
-;;; Commentary:
-
-;; Basic configuration for eslintd-fix.
-
-;;; Code:
-
-(use-package eslintd-fix
-  :defer t)
-
-(provide 'siren-eslintd-fix)
-;;; siren-eslintd-fix.el ends here