diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el
index 73a260e..b29418b 100644
--- a/modules/languages/siren-ruby.el
+++ b/modules/languages/siren-ruby.el
@@ -96,6 +96,11 @@
   :config
   (unbind-key "C-c C-r" inf-ruby-minor-mode-map))
 
+(use-package rbenv
+  :defer t
+  :config
+  (global-rbenv-mode))
+
 (use-package realgud-byebug
   :commands realgud:byebug
   :after realgud)
diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el
index 17b9944..6269585 100644
--- a/modules/languages/siren-web-mode.el
+++ b/modules/languages/siren-web-mode.el
@@ -15,6 +15,7 @@
   :mode
   "\\.html\\'"
   "\\.html.erb\\'"
+  "\\.tpl\\'"
 
   :bind (:map web-mode-map
               ("C-j" . newline-and-indent)
@@ -28,6 +29,7 @@
   (web-mode-css-indent-offset 2)
   (web-mode-markup-indent-offset 2)
   (web-mode-sql-indent-offset 2)
+  (web-mode-engines-alist '(("go" . "\\.tpl\\'")))
 
   :init
   (defun siren-web-mode-setup ()
@@ -42,5 +44,9 @@
     (highlight-indentation-set-offset 2)
     (subword-mode +1)))
 
+(use-package web-beautify
+  :bind (:map web-mode-map
+              ("C-c C-f" . web-beautify-html)))
+
 (provide 'siren-web-mode)
 ;;; siren-web-mode.el ends here