diff --git a/Gemfile b/Gemfile
index cc500dd3b..653a433c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "devise", "~> 4.6.0"
 gem "devise-async", "~> 1.0.0"
 gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10"
 gem "foundation-rails", "~> 6.4.3.0"
-gem "foundation_rails_helper", "~> 2.0.0"
+gem "foundation_rails_helper", "~> 3.0.0"
 gem "globalize", "~> 5.2.0"
 gem "globalize-accessors", "~> 0.2.1"
 gem "graphiql-rails", "~> 1.4.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index dec178646..4c44713f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,11 +227,11 @@ GEM
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
-    foundation_rails_helper (2.0.0)
-      actionpack (>= 4.1)
-      activemodel (>= 4.1)
-      activesupport (>= 4.1)
-      railties (>= 4.1)
+    foundation_rails_helper (3.0.0)
+      actionpack (>= 4.1, < 6.0)
+      activemodel (>= 4.1, < 6.0)
+      activesupport (>= 4.1, < 6.0)
+      railties (>= 4.1, < 6.0)
       tzinfo (~> 1.2, >= 1.2.2)
     geocoder (1.4.5)
     globalid (0.4.2)
@@ -313,7 +313,7 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    loofah (2.2.3)
+    loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -329,7 +329,7 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.13)
       tomlrb
@@ -391,7 +391,7 @@ GEM
     public_suffix (4.0.1)
     puma (4.1.1)
       nio4r (~> 2.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (5.0.1)
@@ -417,7 +417,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
@@ -430,7 +430,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.2)
+    rake (12.3.3)
     recipient_interceptor (0.2.0)
       mail
     redcarpet (3.4.0)
@@ -612,7 +612,7 @@ DEPENDENCIES
   factory_bot_rails (~> 4.8.2)
   faker (~> 1.8.7)
   foundation-rails (~> 6.4.3.0)
-  foundation_rails_helper (~> 2.0.0)
+  foundation_rails_helper (~> 3.0.0)
   globalize (~> 5.2.0)
   globalize-accessors (~> 0.2.1)
   graphiql-rails (~> 1.4.1)
diff --git a/spec/features/admin/budget_groups_spec.rb b/spec/features/admin/budget_groups_spec.rb
index 1dd314e1f..2f155327e 100644
--- a/spec/features/admin/budget_groups_spec.rb
+++ b/spec/features/admin/budget_groups_spec.rb
@@ -154,7 +154,7 @@ describe "Admin budget groups" do
       click_button "Create new group"
 
       expect(page).not_to have_content "Group created successfully!"
-      expect(page).to have_css("label.error", text: "Group name")
+      expect(page).to have_css(".is-invalid-label", text: "Group name")
       expect(page).to have_content "can't be blank"
     end
 
@@ -229,8 +229,8 @@ describe "Admin budget groups" do
       click_button "Save group"
 
       expect(page).not_to have_content "Group updated successfully"
-      expect(page).to have_css("label.error", text: "Group name")
-      expect(page).to have_css("small.error", text: "has already been taken")
+      expect(page).to have_css(".is-invalid-label", text: "Group name")
+      expect(page).to have_css("small.form-error", text: "has already been taken")
     end
 
   end
diff --git a/spec/features/admin/budget_headings_spec.rb b/spec/features/admin/budget_headings_spec.rb
index 8548ce9bb..5fdab0eaf 100644
--- a/spec/features/admin/budget_headings_spec.rb
+++ b/spec/features/admin/budget_headings_spec.rb
@@ -166,7 +166,7 @@ describe "Admin budget headings" do
       click_button "Create new heading"
 
       expect(page).not_to have_content "Heading created successfully!"
-      expect(page).to have_css("label.error", text: "Heading name")
+      expect(page).to have_css(".is-invalid-label", text: "Heading name")
       expect(page).to have_content "can't be blank"
     end
 
@@ -175,7 +175,7 @@ describe "Admin budget headings" do
       click_button "Create new heading"
 
       expect(page).not_to have_content "Heading created successfully!"
-      expect(page).to have_css("label.error", text: "Amount")
+      expect(page).to have_css(".is-invalid-label", text: "Amount")
       expect(page).to have_content "can't be blank"
     end
 
@@ -272,8 +272,8 @@ describe "Admin budget headings" do
       click_button "Save heading"
 
       expect(page).not_to have_content "Heading updated successfully"
-      expect(page).to have_css("label.error", text: "Heading name")
-      expect(page).to have_css("small.error", text: "has already been taken")
+      expect(page).to have_css(".is-invalid-label", text: "Heading name")
+      expect(page).to have_css("small.form-error", text: "has already been taken")
     end
 
   end
diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb
index 3a88d7361..9efec72aa 100644
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -128,7 +128,7 @@ describe "Admin budgets" do
       click_button "Create Budget"
 
       expect(page).not_to have_content "New participatory budget created successfully!"
-      expect(page).to have_css("label.error", text: "Name")
+      expect(page).to have_css(".is-invalid-label", text: "Name")
     end
 
     scenario "Name should be unique" do
@@ -139,8 +139,8 @@ describe "Admin budgets" do
       click_button "Create Budget"
 
       expect(page).not_to have_content "New participatory budget created successfully!"
-      expect(page).to have_css("label.error", text: "Name")
-      expect(page).to have_css("small.error", text: "has already been taken")
+      expect(page).to have_css(".is-invalid-label", text: "Name")
+      expect(page).to have_css("small.form-error", text: "has already been taken")
     end
 
   end
diff --git a/spec/features/admin/translatable_spec.rb b/spec/features/admin/translatable_spec.rb
index 09e322193..01cae2991 100644
--- a/spec/features/admin/translatable_spec.rb
+++ b/spec/features/admin/translatable_spec.rb
@@ -136,7 +136,7 @@ describe "Admin edit translatable records" do
 
         select "Français", from: :select_language
 
-        expect(page).to have_field "Name", with: "", class: "error"
+        expect(page).to have_field "Name", with: "", class: "is-invalid-input"
       end
     end
 
@@ -177,7 +177,7 @@ describe "Admin edit translatable records" do
         select "Français", from: :select_language
         click_link class: "fullscreen-toggle"
 
-        expect(page).to have_field "Text", with: "", class: "error"
+        expect(page).to have_field "Text", with: "", class: "is-invalid-input"
       end
     end
   end
@@ -277,7 +277,7 @@ describe "Admin edit translatable records" do
 
         select "Español", from: :select_language
 
-        expect(page).to have_field "Title", with: "", class: "error"
+        expect(page).to have_field "Title", with: "", class: "is-invalid-input"
       end
     end
 
@@ -382,7 +382,7 @@ describe "Admin edit translatable records" do
       click_button "Save"
 
       expect(page).to have_css "#error_explanation"
-      expect(page).to have_field "Question", with: "", class: "error"
+      expect(page).to have_field "Question", with: "", class: "is-invalid-input"
       expect_to_have_language_selected "English"
       expect_not_to_have_language "Español"
 
diff --git a/spec/features/translatable_spec.rb b/spec/features/translatable_spec.rb
index e9cc6fe1f..710006f5b 100644
--- a/spec/features/translatable_spec.rb
+++ b/spec/features/translatable_spec.rb
@@ -90,7 +90,7 @@ describe "Public area translatable records" do
       click_button "Start a debate"
 
       expect(page).to have_css "#error_explanation"
-      expect(page).to have_field "Debate title", with: "", class: "error"
+      expect(page).to have_field "Debate title", with: "", class: "is-invalid-input"
     end
 
     scenario "Shows errors when submiting without any active translations" do
@@ -232,7 +232,7 @@ describe "Public area translatable records" do
 
           select "Español", from: :select_language
 
-          expect(page).to have_field "Proposal title", with: "", class: "error"
+          expect(page).to have_field "Proposal title", with: "", class: "is-invalid-input"
         end
       end
     end