diff --git a/Gemfile b/Gemfile
index 3bf8e931..672b0027 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ gem 'email_address'
 gem 'exception_notification'
 gem 'font-awesome-rails'
 gem 'friendly_id'
-gem 'haml-rails'
+gem 'hamlit-rails'
 gem 'jekyll'
 gem 'jquery-rails'
 gem 'mini_magick'
@@ -78,6 +78,7 @@ group :development do
   gem 'capistrano-rails'
   gem 'capistrano-rbenv'
   gem 'ed25519'
+  gem 'haml-lint', require: false
   gem 'letter_opener'
   gem 'rbnacl', '< 5.0'
   gem 'rubocop-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 872f4c9e..bef6cfc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,7 +122,6 @@ GEM
       netaddr (~> 2.0)
       simpleidn
     erubi (1.8.0)
-    erubis (2.7.0)
     eventmachine (1.2.7)
     exception_notification (4.3.0)
       actionmailer (>= 4.0, < 6)
@@ -145,17 +144,23 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    haml-rails (1.0.0)
+    haml-lint (0.999.999)
+      haml_lint
+    haml_lint (0.32.0)
+      haml (>= 4.0, < 5.2)
+      rainbow
+      rake (>= 10, < 13)
+      rubocop (>= 0.50.0)
+      sysexits (~> 1.1)
+    hamlit (2.9.3)
+      temple (>= 0.8.0)
+      thor
+      tilt
+    hamlit-rails (0.2.3)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 4.0.6, < 6.0)
-      html2haml (>= 1.0.1)
+      hamlit (>= 1.2.0)
       railties (>= 4.0.1)
-    html2haml (2.2.0)
-      erubis (~> 2.7.0)
-      haml (>= 4.0, < 6)
-      nokogiri (>= 1.6.0)
-      ruby_parser (~> 3.5)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -290,8 +295,6 @@ GEM
       i18n
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    ruby_parser (3.13.1)
-      sexp_processor (~> 4.9)
     rubyzip (1.2.2)
     rugged (0.28.2)
     safe_yaml (1.0.5)
@@ -318,7 +321,6 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    sexp_processor (4.12.0)
     simpleidn (0.1.1)
       unf (~> 0.1.4)
     spring (2.0.2)
@@ -337,6 +339,7 @@ GEM
     sshkit (1.18.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    sysexits (1.2.0)
     temple (0.8.1)
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -398,7 +401,8 @@ DEPENDENCIES
   factory_bot_rails
   font-awesome-rails
   friendly_id
-  haml-rails
+  haml-lint
+  hamlit-rails
   jbuilder (~> 2.5)
   jekyll
   jquery-rails