diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7b394140d5..ec1a08947e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,21 +13,11 @@ Provide context for others to understand it. -->
 
 
 #### Release notes
-<!-- Write a line or two to be included in the release notes.
-Everything is worth mentioning, because you did it for a reason. -->
+<!-- Write a one liner description of the change to be included in the release notes.
+Every PR is worth mentioning, because you did it for a reason. -->
 
-
-
-<!-- Please assign one category to your PR and delete the others. 
-The categories are based on https://keepachangelog.com/en/1.0.0/. -->
-
-Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
-
-
-
-#### Discourse thread
-<!-- Is there a discussion about this in Discourse?
-Add the link or remove this section. -->
+<!-- Please select one for your PR and delete the other. -->
+Changelog Category: User facing changes | Technical changes
 
 
 
diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index a919e0dedc..dba500e10f 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -167,7 +167,6 @@ Layout/LineLength:
   - spec/features/admin/enterprises/index_spec.rb
   - spec/features/admin/enterprises_spec.rb
   - spec/features/admin/enterprise_user_spec.rb
-  - spec/features/admin/image_settings_spec.rb
   - spec/features/admin/multilingual_spec.rb
   - spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
   - spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -345,7 +344,6 @@ Metrics/AbcSize:
   - app/controllers/cart_controller.rb
   - app/controllers/discourse_sso_controller.rb
   - app/controllers/enterprises_controller.rb
-  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/overview_controller.rb
@@ -665,7 +663,6 @@ Metrics/MethodLength:
   - app/controllers/api/variants_controller.rb
   - app/controllers/cart_controller.rb
   - app/controllers/shop_controller.rb
-  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
@@ -814,42 +811,17 @@ Metrics/ModuleLength:
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/spree/order/checkout.rb
   - app/models/spree/payment/processing.rb
-  - engines/catalog/spec/services/catalog/product_import/products_reset_strategy_spec.rb
-  - engines/order_management/spec/services/order_management/order/updater_spec.rb
-  - engines/order_management/spec/services/order_management/stock/package_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
   - lib/open_food_network/column_preference_defaults.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/api/order_cycles_controller_spec.rb
   - spec/controllers/api/orders_controller_spec.rb
-  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
-  - spec/lib/open_food_network/address_finder_spec.rb
-  - spec/lib/open_food_network/customers_report_spec.rb
-  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
-  - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
   - spec/lib/open_food_network/order_cycle_permissions_spec.rb
-  - spec/lib/open_food_network/order_grouper_spec.rb
-  - spec/lib/open_food_network/packing_report_spec.rb
-  - spec/lib/open_food_network/permissions_spec.rb
-  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
-  - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
-  - spec/lib/open_food_network/tag_rule_applicator_spec.rb
-  - spec/lib/open_food_network/user_balance_calculator_spec.rb
-  - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
   - spec/models/spree/adjustment_spec.rb
   - spec/models/spree/credit_card_spec.rb
   - spec/models/spree/line_item_spec.rb
   - spec/models/spree/product_spec.rb
-  - spec/models/spree/shipping_method_spec.rb
   - spec/models/spree/variant_spec.rb
-  - spec/services/permissions/order_spec.rb
-  - spec/services/variant_units/option_value_namer_spec.rb
-  - spec/support/request/stripe_helper.rb
 
 Metrics/ParameterLists:
   Max: 5
diff --git a/.rubocop_specs.yml b/.rubocop_specs.yml
new file mode 100644
index 0000000000..8ea54cd55c
--- /dev/null
+++ b/.rubocop_specs.yml
@@ -0,0 +1,7 @@
+inherit_from:
+  - .rubocop.yml
+
+# This rubocop config file is only used for specs
+# Here we allow specs to be 300 lines long
+Metrics/ModuleLength:
+  Max: 300
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2c867c2ec1..93648258a3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -691,7 +691,6 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/base_controller.rb'
     - 'app/controllers/spree/admin/countries_controller.rb'
     - 'app/controllers/spree/admin/general_settings_controller.rb'
-    - 'app/controllers/spree/admin/image_settings_controller.rb'
     - 'app/controllers/spree/admin/images_controller.rb'
     - 'app/controllers/spree/admin/invoices_controller.rb'
     - 'app/controllers/spree/admin/mail_methods_controller.rb'
@@ -726,7 +725,6 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/user_passwords_controller.rb'
     - 'app/controllers/user_registrations_controller.rb'
     - 'app/helpers/admin/enterprises_helper.rb'
-    - 'app/helpers/admin/image_settings_helper.rb'
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/helpers/admin/orders_helper.rb'
     - 'app/helpers/admin/subscriptions_helper.rb'
@@ -1123,7 +1121,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/shops_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
-    - 'spec/controllers/spree/admin/image_settings_controller_spec.rb'
     - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
     - 'spec/controllers/spree/admin/mail_methods_controller_spec.rb'
     - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
@@ -1168,7 +1165,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/admin/configuration/content_spec.rb'
     - 'spec/features/admin/configuration/general_settings_spec.rb'
-    - 'spec/features/admin/configuration/image_settings_spec.rb'
     - 'spec/features/admin/configuration/mail_methods_spec.rb'
     - 'spec/features/admin/configuration/states_spec.rb'
     - 'spec/features/admin/configuration/tax_categories_spec.rb'
@@ -1184,7 +1180,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/features/admin/enterprises/index_spec.rb'
     - 'spec/features/admin/enterprises_spec.rb'
     - 'spec/features/admin/external_services_spec.rb'
-    - 'spec/features/admin/image_settings_spec.rb'
     - 'spec/features/admin/multilingual_spec.rb'
     - 'spec/features/admin/overview_spec.rb'
     - 'spec/features/admin/payment_method_spec.rb'
diff --git a/DOCKER.md b/DOCKER.md
deleted file mode 100644
index 15fa75df5a..0000000000
--- a/DOCKER.md
+++ /dev/null
@@ -1,65 +0,0 @@
-### Docker
-
-It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
-The objective is to spare configuration time, in order to help people testing the app and contribute to it.
-It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
-
-### Install Docker
-
-Please check the documentation here, https://docs.docker.com/install/ to install Docker.
-
-For Docker Compose, information are here: https://docs.docker.com/compose/install/.
-
-Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
-
-
-### Use Docker with Open Food Network
-
-Open a terminal with a shell.
-
-Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
-
-```sh
-$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
-```
-
-Otherwise, if you just want to get things running, clone from the OFN main repo:
-
-```sh
-$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
-```
-
-Go at the root of the app:
-
-```sh
-$ cd openfoodnetwork
-```
-
-Download the Docker images and build the containers:
-
-```sh
-$ docker-compose build
-```
-
-Setup the database and seed it with sample data:
-```sh
-$ docker-compose run web bundle exec rake db:reset
-$ docker-compose run web bundle exec rake db:test:prepare
-$ docker-compose run web bundle exec rake ofn:sample_data
-```
-
-Finally, run the app with all the required containers:
-
-```sh
-$ docker-compose up
-```
-
-The default admin user is 'ofn@example.com' with 'ofn123' password.
-Check the app in the browser at `http://localhost:3000`.
-
-You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
-
-You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).
-
-### Troubleshooting
-If you are using Windows and having issues related to the ruby-build not finding a definition for the ruby version, you may need to follow these commands [here](https://stackoverflow.com/questions/2517190/how-do-i-force-git-to-use-lf-instead-of-crlf-under-windows/33424884#33424884) to fix your local git config related to line breaks.
diff --git a/Dockerfile b/Dockerfile
index d45df4780a..d5fe7270ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,11 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
-# Install node
-RUN apt-get install -y nodejs
+# Install node & yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y nodejs yarn
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -43,5 +46,9 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
 
 # Copy code and install app dependencies
 COPY . /usr/src/app/
+
+# Install front-end dependencies
+RUN yarn install
+
 # Run bundler install in parallel with the amount of available CPUs
 RUN bundle install --jobs="$(nproc)"
diff --git a/Gemfile b/Gemfile
index 95db8c699a..38e15fb73e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.7.1'
+gem 'i18n-js', '~> 3.8.0'
 gem 'rails', '~> 4.0.13'
 gem 'rails-i18n', '~> 4.0'
 gem 'rails_safe_tasks', '~> 1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index adda24eddd..83e30d89dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.6)
+    activerecord-import (1.0.7)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -204,7 +204,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.41.0)
+    ddtrace (0.42.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -421,7 +421,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.7.1)
+    i18n-js (3.8.0)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -685,7 +685,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.9.2)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -754,7 +754,7 @@ DEPENDENCIES
   highline (= 1.6.18)
   httparty (~> 0.18)
   i18n (~> 0.6.11)
-  i18n-js (~> 3.7.1)
+  i18n-js (~> 3.8.0)
   immigrant
   jquery-migrate-rails
   jquery-rails (= 3.1.5)
diff --git a/app/assets/images/flag.svg b/app/assets/images/flag.svg
deleted file mode 100644
index bac244c981..0000000000
--- a/app/assets/images/flag.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="15 13 34 38.4" enable-background="new 15 13 34 38.4" xml:space="preserve">
-<g>
-	<polygon fill="#FFFFFF" points="15.5,13.5 48.5,13.5 48.5,50.7 31.6,45.5 15.5,50.7 	"/>
-	<path fill="#999999" d="M48,14v36l-16.4-5L16,50V14H48 M49,13h-1H16h-1v1v36v1.4l1.3-0.4l15.3-5l16.1,5l1.3,0.4V50V14V13L49,13z"/>
-</g>
-</svg>
diff --git a/app/assets/images/ofn-logo.png b/app/assets/images/ofn-logo.png
new file mode 100644
index 0000000000..6058b26a75
Binary files /dev/null and b/app/assets/images/ofn-logo.png differ
diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 212518b010..564c099ccd 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -27,14 +27,14 @@
 //= require lodash.underscore.js
 
 // spree
-//= require spree
+//= require admin/spree/spree
 //= require admin/spree/spree-select2
 //= require modernizr
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express
-//= require admin/handlebar_extensions
+//= require handlebars
 
 // OFN specific
 //= require_tree ../templates/admin
diff --git a/app/assets/javascripts/admin/spree/base.js.erb b/app/assets/javascripts/admin/spree/base.js.erb
index 1ddd4a8dd3..79a8dfb6f8 100644
--- a/app/assets/javascripts/admin/spree/base.js.erb
+++ b/app/assets/javascripts/admin/spree/base.js.erb
@@ -116,7 +116,8 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined') {
+  if (typeof Spree !== 'undefined' &&
+    typeof Spree.translations !== 'undefined') {
     handle_date_picker_fields = function(){
       $('.datepicker').datepicker({
         dateFormat: Spree.translations.date_picker,
diff --git a/app/assets/javascripts/admin/spree/image_settings.js.erb b/app/assets/javascripts/admin/spree/image_settings.js.erb
deleted file mode 100644
index d8c0b2a635..0000000000
--- a/app/assets/javascripts/admin/spree/image_settings.js.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-$(document).ready(function() {
-
-  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0) {
-    $('#s3_settings, #s3_headers').show();
-  }
-
-  // Toggle display of S3 settings based on value of use_s3 checkbox
-  $('input#preferences_use_s3[type="checkbox"]').click(function() {
-    $('#s3_settings, #s3_headers').toggle();
-  });
-
-  $(document).on('click', '.destroy_style', function(e) {
-    e.preventDefault();
-    $(this).parent().remove();
-  });
-
-  $(document).on('click', '.destroy_new_attachment_styles', function(e) {
-    e.preventDefault();
-    $(this).closest('.new_attachment_styles').remove();
-  });
-
-  $(document).on('click', '.destroy_new_s3_headers', function(e) {
-    e.preventDefault();
-    $(this).closest('.new_s3_headers').remove();
-  });
-
-  // Handle adding new styles
-  var styles_hash_index = 1;
-  $(document).on('click', '.add_new_style', function(e) {
-    e.preventDefault();
-    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
-  });
-
-  // Handle adding new headers
-  var headers_hash_index = 1;
-  $(document).on('click', '.add_header', function(e) {
-    e.preventDefault();
-    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
-  });
-
-  // Generates html for new paperclip styles form fields
-  generate_html_for_hash = function(hash_name, index) {
-    var html = '<div class="' + hash_name + ' row"><div class="field">';
-    html += '<div class="five columns">';
-    html += '<label for="' + hash_name + '_' + index + '_name">';
-    html += Spree.translations.name + '</label>';
-    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
-    html += '</div><div class="five columns">'
-    html += '<label for="' + hash_name + '_' + index + '_value">';
-    html += Spree.translations.value + '</label>';
-    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
-    html += '</div><div class="two columns">'
-    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
-    html += '</div></div></div>';
-
-    index += 1;
-    return html;
-  };
-});
diff --git a/app/assets/javascripts/admin/spree/spree.js.coffee b/app/assets/javascripts/admin/spree/spree.js.coffee
new file mode 100644
index 0000000000..c905ff48e7
--- /dev/null
+++ b/app/assets/javascripts/admin/spree/spree.js.coffee
@@ -0,0 +1,13 @@
+#= require jsuri
+
+class window.Spree
+  # Helper function to take a URL and add query parameters to it
+  @url: (uri, query) ->
+    if uri.path == undefined
+      uri = new Uri(uri)
+    if query
+      $.each query, (key, value) ->
+        uri.addQueryParam(key, value)
+    if Spree.api_key
+      uri.addQueryParam('token', Spree.api_key)
+    return uri
diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index fb8ac8d288..5a723fb8b1 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -1,6 +1,6 @@
 Darkswarm.controller "ProductNodeCtrl", ($scope, $modal, FilterSelectorsService) ->
   $scope.enterprise = $scope.product.supplier # For the modal, so it's consistent
+  $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
 
   $scope.triggerProductModal = ->
-    $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
     $modal.open(templateUrl: "product_modal.html", scope: $scope)
diff --git a/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee
new file mode 100644
index 0000000000..adc25f4ad7
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee
@@ -0,0 +1,39 @@
+Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
+  $scope.$watchGroup [
+    'variant.line_item.quantity',
+    'variant.line_item.max_quantity'
+  ], (new_value, old_value) ->
+    return if old_value[0] == null && new_value[0] == null
+    Cart.adjust($scope.variant.line_item)
+
+  $scope.add = (quantity) ->
+    item = $scope.variant.line_item
+    item.quantity += quantity
+    if $scope.variant.product.group_buy
+      if item.quantity < 1 || item.max_quantity < item.quantity
+        item.max_quantity = item.quantity
+
+  $scope.addMax = (quantity) ->
+    item = $scope.variant.line_item
+    item.max_quantity += quantity
+    if item.max_quantity < item.quantity
+      item.quantity = item.max_quantity
+
+  $scope.canAdd = (quantity) ->
+    wantedQuantity = $scope.variant.line_item.quantity + quantity
+    $scope.quantityValid(wantedQuantity)
+
+  $scope.canAddMax = (quantity) ->
+    variant = $scope.variant
+    wantedQuantity = variant.line_item.max_quantity + quantity
+    $scope.quantityValid(wantedQuantity) && variant.line_item.quantity > 0
+
+  $scope.quantityValid = (quantity) ->
+    variant = $scope.variant
+    minimum = 0
+    maximum = variant.on_demand && Infinity || variant.on_hand
+    quantity >= minimum && quantity <= maximum
+
+  $scope.addBulk = (quantity) ->
+    $scope.add(quantity)
+    $modal.open(templateUrl: "bulk_buy_modal.html", scope: $scope, windowClass: "product-bulk-modal")
diff --git a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
index 8b0beb17a5..1b4609ff4d 100644
--- a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
@@ -2,7 +2,7 @@ Darkswarm.directive "priceBreakdown", ($tooltip)->
   # We use the $tooltip service from Angular foundation to give us boilerplate
   # Subsequently we patch the scope, template and restrictions
   tooltip = $tooltip 'priceBreakdown', 'priceBreakdown', 'click'
-  tooltip.scope = 
+  tooltip.scope =
     variant: "="
   tooltip.templateUrl = "price_breakdown_button.html"
   tooltip.replace = true
@@ -15,6 +15,3 @@ Darkswarm.directive 'priceBreakdownPopup', ->
   replace: true
   templateUrl: 'price_breakdown.html'
   scope: false
-
-  link: (scope, elem, attrs) ->
-    scope.expanded = false unless scope.expanded?
diff --git a/app/assets/javascripts/darkswarm/directives/price_percentage.js.coffee b/app/assets/javascripts/darkswarm/directives/price_percentage.js.coffee
deleted file mode 100644
index 35140598c4..0000000000
--- a/app/assets/javascripts/darkswarm/directives/price_percentage.js.coffee
+++ /dev/null
@@ -1,10 +0,0 @@
-Darkswarm.directive "pricePercentage", ->
-  restrict: 'E'
-  replace: true
-  templateUrl: 'price_percentage.html'
-  scope:
-    percentage: '='
-
-  link: (scope, elem, attrs) ->
-    elem.find(".meter").css
-      width: "#{scope.percentage}%"
diff --git a/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee b/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
index 84615e3125..1872b55dfd 100644
--- a/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
@@ -4,10 +4,4 @@ Darkswarm.directive "shopVariant", ->
   templateUrl: 'shop_variant.html'
   scope:
     variant: '='
-  controller: ($scope, Cart) ->
-    $scope.$watchGroup [
-      'variant.line_item.quantity',
-      'variant.line_item.max_quantity'
-    ], (new_value, old_value) ->
-      return if old_value[0] == null && new_value[0] == null
-      Cart.adjust($scope.variant.line_item)
+  controller: 'ShopVariantCtrl'
diff --git a/app/assets/javascripts/darkswarm/services/variants.js.coffee b/app/assets/javascripts/darkswarm/services/variants.js.coffee
index a650db5cd7..f5ba1af757 100644
--- a/app/assets/javascripts/darkswarm/services/variants.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/variants.js.coffee
@@ -10,7 +10,6 @@ Darkswarm.factory 'Variants', ->
 
     extend: (variant)->
       variant.extended_name = @extendedVariantName(variant)
-      variant.base_price_percentage = Math.round(variant.price / variant.price_with_fees * 100)
       variant.line_item ||= @lineItemFor(variant) # line_item may have been initialised in Cart#constructor
       variant.line_item.total_price = variant.price_with_fees * variant.line_item.quantity
       variant
diff --git a/app/assets/javascripts/templates/bulk_buy_modal.html.haml b/app/assets/javascripts/templates/bulk_buy_modal.html.haml
new file mode 100644
index 0000000000..9625c1bd8f
--- /dev/null
+++ b/app/assets/javascripts/templates/bulk_buy_modal.html.haml
@@ -0,0 +1,37 @@
+.row
+  .columns.small-12
+    %h3{"ng-bind" => "::variant.extended_name"}
+
+.row.variant-bulk-buy-price-summary
+  .columns.small-6
+    .variant-unit {{ ::variant.unit_to_display }}
+  .columns.small-6
+    {{ variant.line_item.total_price | localizeCurrency }}
+
+.row
+  .columns.small-6
+    .variant-bulk-buy-quantity-label
+      {{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
+    %div
+      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
+        -# U+FF0D Fullwidth Hyphen-Minus
+        －
+      %span.bulk-buy.variant-quantity>
+        {{ variant.line_item.quantity }}
+      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
+        -# U+FF0B Fullwidth Plus Sign
+        ＋
+  .columns.small-6
+    .variant-bulk-buy-quantity-label
+      {{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
+    %div
+      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
+        -# U+FF0D Fullwidth Hyphen-Minus
+        －
+      %span.bulk-buy.variant-quantity>
+        {{ variant.line_item.max_quantity }}
+      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
+        -# U+FF0B Fullwidth Plus Sign
+        ＋
+
+%ng-include{src: "'partials/close.html'"}
diff --git a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml
index 8ba787f20b..0d6563bc2a 100644
--- a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml
+++ b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml
@@ -1,14 +1,16 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  %input{type: :number,
-  integer: true,
-  value: nil,
-  min: 0,
-  placeholder: "0",
-  "ofn-disable-scroll" => true,
-  "ng-debounce" => "500",
-  onwheel: "this.blur()",
-  "ng-model" => "variant.line_item.quantity",
-  "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
-  "ng-disabled" => "!variant.on_demand && variant.on_hand == 0",
-  name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
+  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
+    {{ "js.shopfront.variant.add_to_cart" | t }}
+  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(-1)"}}>
+    -# U+FF0D Fullwidth Hyphen-Minus
+    －
+  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
+    -# U+FF0B Fullwidth Plus Sign
+    ＋
+  %br
+  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
+    {{ "js.shopfront.variant.quantity_in_cart" | t:{quantity: variant.line_item.quantity || 0} }}
+  %input{type: :hidden,
+         name: "variants[{{::variant.id}}]",
+         ng: {model: "variant.line_item.quantity"}}
diff --git a/app/assets/javascripts/templates/partials/shop_variant_with_group_buy.html.haml b/app/assets/javascripts/templates/partials/shop_variant_with_group_buy.html.haml
index c0cc46ac13..18f46e5490 100644
--- a/app/assets/javascripts/templates/partials/shop_variant_with_group_buy.html.haml
+++ b/app/assets/javascripts/templates/partials/shop_variant_with_group_buy.html.haml
@@ -1,28 +1,17 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::variant.product.group_buy"}
 
-  %span.bulk-input-container
-    %span.bulk-input
-      %input.bulk.first{type: :number,
-      value: nil,
-      integer: true,
-      min: 0,
-      "ng-model" => "variant.line_item.quantity",
-      placeholder: "{{::'shop_variant_quantity_min' | t}}",
-      "ofn-disable-scroll" => true,
-      "ng-debounce" => "500",
-      onwheel: "this.blur()",
-      "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
-      name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
-    %span.bulk-input
-      %input.bulk.second{type: :number,
-      "ng-disabled" => "!variant.line_item.quantity",
-      integer: true,
-      min: 0,
-      "ng-model" => "variant.line_item.max_quantity",
-      placeholder: "{{::'shop_variant_quantity_max' | t}}",
-      "ofn-disable-scroll" => true,
-      "ng-debounce" => "500",
-      onwheel: "this.blur()",
-      min: "{{variant.line_item.quantity}}",
-      name: "variant_attributes[{{::variant.id}}][max_quantity]",
-      id: "variants_{{::variant.id}}_max"}
+  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "addBulk(1)", disabled: "!canAdd(1)"}}
+    {{ "js.shopfront.variant.add_to_cart" | t }}
+  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}>
+    {{ variant.line_item.quantity }}
+  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}
+    {{ variant.line_item.max_quantity || "-" }}
+  %br
+  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
+    {{ "js.shopfront.variant.in_cart" | t }}
+  %input{type: :hidden,
+         name: "variants[{{::variant.id}}]",
+         ng: {model: "variant.line_item.quantity"}}
+  %input{type: :hidden,
+         name: "variants[{{::variant.id}}]",
+         ng: {model: "variant.line_item.max_quantity"}}
diff --git a/app/assets/javascripts/templates/price_breakdown.html.haml b/app/assets/javascripts/templates/price_breakdown.html.haml
index 48e0a8d5e0..bd4c3bf88f 100644
--- a/app/assets/javascripts/templates/price_breakdown.html.haml
+++ b/app/assets/javascripts/templates/price_breakdown.html.haml
@@ -1,37 +1,28 @@
-.joyride-tip-guide.price_breakdown{"ng-class" => "{ in: tt_isOpen, fade: tt_animation }"}
-  %span.joyride-nub.right
+.joyride-tip-guide.price_breakdown{ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
+  %span.joyride-nub.top
+  .background{ng: {click: "tt_isOpen = false"}}
   .joyride-content-wrapper
-    .collapsed{"ng-show" => "!expanded"}
-      %price-percentage{percentage: 'variant.base_price_percentage'}
-      %a{"ng-click" => "expanded = !expanded"}
-        %span{"ng-bind" => "::'price_breakdown' | t"}
-        %i.ofn-i_005-caret-down
-
-    .expanded{"ng-show" => "expanded"}
-      %ul
-        %li.cost
-          .right {{ ::variant.price | localizeCurrency }}
-          %span{"ng-bind" => "::'item_cost' | t"}
-        %li.admin-fee{"ng-if" => "::variant.fees.admin"}
-          .right {{ ::variant.fees.admin | localizeCurrency }}
-          %span{"ng-bind" => "::'admin_fee' | t"}
-        %li.sales-fee{"ng-if" => "::variant.fees.sales"}
-          .right {{ ::variant.fees.sales | localizeCurrency }}
-          %span{"ng-bind" => "::'sales_fee' | t"}
-        %li.packing-fee{"ng-if" => "::variant.fees.packing"}
-          .right {{ ::variant.fees.packing | localizeCurrency }}
-          %span{"ng-bind" => "::'packing_fee' | t"}
-        %li.transport-fee{"ng-if" => "::variant.fees.transport"}
-          .right {{ ::variant.fees.transport | localizeCurrency }}
-          %span{"ng-bind" => "::'transport_fee' | t"}
-        %li.fundraising-fee{"ng-if" => "::variant.fees.fundraising"}
-          .right {{ ::variant.fees.fundraising | localizeCurrency }}
-          %span{"ng-bind" => "::'fundraising_fee' | t"}
-        %li.total
-          %strong
-            .right = {{ ::variant.price_with_fees | localizeCurrency }}
-            &nbsp;
-
-      %a{"ng-click" => "expanded = !expanded"}
-        %span{"ng-bind" => "::'price_graph' | t"}
-        %i.ofn-i_006-caret-up
+    %h6 {{ "js.shopfront.price_breakdown" | t }}
+    %ul
+      %li
+        .right {{ ::variant.price | localizeCurrency }}
+        %span{"ng-bind" => "::'item_cost' | t"}
+      %li{"ng-if" => "::variant.fees.admin"}
+        .right {{ ::variant.fees.admin | localizeCurrency }}
+        %span{"ng-bind" => "::'admin_fee' | t"}
+      %li{"ng-if" => "::variant.fees.sales"}
+        .right {{ ::variant.fees.sales | localizeCurrency }}
+        %span{"ng-bind" => "::'sales_fee' | t"}
+      %li{"ng-if" => "::variant.fees.packing"}
+        .right {{ ::variant.fees.packing | localizeCurrency }}
+        %span{"ng-bind" => "::'packing_fee' | t"}
+      %li{"ng-if" => "::variant.fees.transport"}
+        .right {{ ::variant.fees.transport | localizeCurrency }}
+        %span{"ng-bind" => "::'transport_fee' | t"}
+      %li{"ng-if" => "::variant.fees.fundraising"}
+        .right {{ ::variant.fees.fundraising | localizeCurrency }}
+        %span{"ng-bind" => "::'fundraising_fee' | t"}
+      %li
+        %strong
+          .right = {{ ::variant.price_with_fees | localizeCurrency }}
+          &nbsp;
diff --git a/app/assets/javascripts/templates/price_percentage.html.haml b/app/assets/javascripts/templates/price_percentage.html.haml
deleted file mode 100644
index f524103643..0000000000
--- a/app/assets/javascripts/templates/price_percentage.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.progress
-  .right {{::'fees' | t}}
-  .meter
-    {{::'item_cost' | t}}
diff --git a/app/assets/javascripts/templates/shop_variant.html.haml b/app/assets/javascripts/templates/shop_variant.html.haml
index 71ca3c33ec..1435f33399 100644
--- a/app/assets/javascripts/templates/shop_variant.html.haml
+++ b/app/assets/javascripts/templates/shop_variant.html.haml
@@ -1,31 +1,16 @@
 .variants.row
-  .small-12.medium-4.large-4.columns.variant-name
-    .table-cell
-      .inline {{ ::variant.name_to_display }}
-      .bulk-buy.inline{"ng-if" => "::variant.product.group_buy"}
-        %i.ofn-i_056-bulk><
-        %em><
-          \ {{::'bulk' | t}}
+  .small-4.medium-4.large-6.columns.variant-name
+    .inline{"ng-if" => "::variant.display_name"} {{ ::variant.display_name }}
+    .variant-unit {{ ::variant.unit_to_display }}
+  .small-3.medium-3.large-2.columns.variant-price
+    %price-breakdown{"price-breakdown" => "_", variant: "variant",
+      "price-breakdown-append-to-body" => "true",
+      "price-breakdown-placement" => "bottom",
+      "price-breakdown-animation" => true}
+    {{ variant.price_with_fees | localizeCurrency }}
+  .medium-2.large-1.columns.total-price
+    %span{"ng-class" => "{filled: variant.line_item.total_price}"}
+      {{ variant.line_item.total_price | localizeCurrency }}
 
   %ng-include{src: "'partials/shop_variant_no_group_buy.html'"}
   %ng-include{src: "'partials/shop_variant_with_group_buy.html'"}
-
-  .small-3.medium-1.large-1.columns.variant-unit
-    .table-cell
-      %em {{ ::variant.unit_to_display }}
-
-  .small-4.medium-2.large-2.columns.variant-price
-    .table-cell.price
-      %i.ofn-i_009-close
-      {{ variant.price_with_fees | localizeCurrency }}
-
-      -# Now in a template in app/assets/javascripts/templates !
-      %price-breakdown{"price-breakdown" => "_", variant: "variant",
-        "price-breakdown-append-to-body" => "true",
-        "price-breakdown-placement" => "left",
-        "price-breakdown-animation" => true}
-
-  .small-12.medium-2.large-2.columns.total-price.text-right
-    .table-cell
-      %strong{"ng-class" => "{filled: variant.line_item.total_price}"}
-        {{ variant.line_item.total_price | localizeCurrency }}
diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss
index 6d5992f8d4..65d555e561 100644
--- a/app/assets/stylesheets/admin/all.scss
+++ b/app/assets/stylesheets/admin/all.scss
@@ -35,7 +35,6 @@
 @import 'plugins/font-awesome';
 @import 'plugins/select2';
 
-@import 'sections/image_settings';
 @import 'sections/orders';
 @import 'sections/products';
 
diff --git a/app/assets/stylesheets/admin/hacks/ie.scss b/app/assets/stylesheets/admin/hacks/ie.scss
index ba5cd61501..4eff79ed84 100644
--- a/app/assets/stylesheets/admin/hacks/ie.scss
+++ b/app/assets/stylesheets/admin/hacks/ie.scss
@@ -29,11 +29,6 @@ html.ie {
       z-index: 0;
     }
   }
-
-  // Fix margin-top for destroy paperclip styles background
-  .destroy_new_attachment_styles {
-    margin-top: 17px !important;
-  }
 }
 
 // IE8 Hacks
diff --git a/app/assets/stylesheets/admin/sections/image_settings.scss b/app/assets/stylesheets/admin/sections/image_settings.scss
deleted file mode 100644
index dc7a29b1b2..0000000000
--- a/app/assets/stylesheets/admin/sections/image_settings.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.destroy_style, .destroy_header {
-  float: right;
-}
diff --git a/app/assets/stylesheets/admin/shared/layout.scss b/app/assets/stylesheets/admin/shared/layout.scss
index 4288e88266..17af56a59b 100644
--- a/app/assets/stylesheets/admin/shared/layout.scss
+++ b/app/assets/stylesheets/admin/shared/layout.scss
@@ -71,12 +71,6 @@
   display: none;
 }
 
-// For block grids
-.frameless {
-  margin-left: -10px;
-  margin-right: -10px;
-}
-
 // Header
 //---------------------------------------------------
 #header {
diff --git a/app/assets/stylesheets/darkswarm/_shop-inputs.scss b/app/assets/stylesheets/darkswarm/_shop-inputs.scss
index 59a3bd0c67..7de6a9355a 100644
--- a/app/assets/stylesheets/darkswarm/_shop-inputs.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-inputs.scss
@@ -6,93 +6,110 @@
 .darkswarm {
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
+}
 
-  // ordering
-  product {
-    input {
-      @include border-radius(0);
+.reveal-modal.product-bulk-modal {
+  width: 26em;
+}
 
-      @include csstrans;
+// Components to add variants to cart and change quantities
+//
+// They are not nested so that they can be used in modals.
+button.add-variant, button.variant-quantity {
+  height: 2.5rem;
+  border-radius: 0;
+  background-color: $orange-500;
+  color: white;
+  // Override foundation button styles:
+  font-size: 1rem;
+  margin: 0;
+  padding: 0;
+  transition: none;
 
-      margin: 0;
-      width: 10rem;
-      display: inline;
-
-      @include box-shadow(none);
-
-      border-color: #b3b3b3;
-      text-align: right;
-
-      @include breakpoint(desktop) {
-        width: 8rem;
-      }
-
-      @include breakpoint(tablet) {
-        width: 7rem;
-      }
-
-      @include breakpoint(phablet) {
-        float: left !important;
-        font-size: 0.75rem;
-        padding-left: 0.25rem;
-        padding-right: 0.25rem;
-      }
-
-      @include breakpoint(mobile) {
-        width: 5.8rem;
-      }
-
-      &:hover {
-        @include box-shadow(none);
-
-        border-color: #888;
-        background-color: #fafafa;
-      }
-
-      &:active, &:focus, &.active {
-        @include box-shadow(none);
-
-        background-color: #f9f4b9;
-        border-color: #666;
-      }
+  &:hover {
+    background-color: $orange-600;
+  }
+  &[disabled] {
+    &:hover, &:focus {
+      background-color: $orange-500;
     }
+  }
+  &:nth-of-type(1) {
+    border-bottom-left-radius: 0.25em;
+    border-top-left-radius: 0.25em;
+  }
+  &:nth-last-of-type(1) {
+    border-top-right-radius: 0.25em;
+    border-bottom-right-radius: 0.25em;
+  }
+}
 
-    // BULK
+button.add-variant {
+  min-width: 6rem;
+  padding: 0 1em;
 
-    input.bulk {
-      width: 5rem;
-
-      @include breakpoint(desktop) {
-        width: 4rem;
-      }
-
-      @include breakpoint(tablet) {
-        width: 3.5rem;
-      }
-
-      @include breakpoint(mobile) {
-        width: 2.8rem;
-      }
-    }
-
-    input.bulk.first {
-      border-right: 0;
-    }
-
-    input.bulk.second {
-      border-left: 0;
-    }
-
-    .bulk-input-container {
-      float: right;
-
-      @include breakpoint(phablet) {
-        float: left !important;
-      }
-
-      .bulk-input {
-        float: left;
-      }
+  &[disabled] {
+    &:hover, &:focus {
+      background-color: $orange-500;
     }
   }
 }
+
+button.variant-quantity {
+  width: 3rem;
+
+  &:nth-of-type(1):not(.bulk-buy):not(.bulk-buy-add) {
+    border-right: .1em solid $orange-400;
+  }
+}
+
+.variant-quantity-display {
+  display: inline-block;
+  font-size: 0.875em;
+  margin-top: 0.25em;
+  text-align: center;
+  width: 6rem;
+  visibility: hidden;
+
+  &.visible {
+    visibility: visible;
+  }
+}
+
+button.bulk-buy.variant-quantity {
+  background-color: transparent;
+  border: .1em solid $grey-200;
+  color: inherit;
+}
+
+button.bulk-buy-add.variant-quantity {
+  width: 2.5rem;
+
+  &[disabled] {
+    background-color: $grey-400;
+
+    &:hover, &:focus {
+      background-color: $grey-400;
+    }
+  }
+}
+
+span.bulk-buy.variant-quantity {
+  border: .1em solid $grey-200;
+  height: 2.5rem;
+  display: inline-block;
+  min-width: 3em;
+  padding: .5em;
+  text-align: center;
+  vertical-align: top;
+}
+
+.variant-bulk-buy-price-summary {
+  color: $disabled-med;
+  margin-bottom: 1em;
+}
+
+.variant-bulk-buy-quantity-label {
+  font-size: 0.875rem;
+  margin-bottom: .5em;
+}
diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.scss b/app/assets/stylesheets/darkswarm/_shop-navigation.scss
index d3febdb28f..8ed5400ed9 100644
--- a/app/assets/stylesheets/darkswarm/_shop-navigation.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-navigation.scss
@@ -178,7 +178,7 @@ shop ordercycle {
 }
 
 shop navigation ordercycle {
-  margin-top: 3em;
+  margin-top: 3.4em;
   padding: 1em;
   height: 7.6em;
   position: absolute;
diff --git a/app/assets/stylesheets/darkswarm/_shop-popovers.scss b/app/assets/stylesheets/darkswarm/_shop-popovers.scss
index dd5aa5a177..d91f870330 100644
--- a/app/assets/stylesheets/darkswarm/_shop-popovers.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-popovers.scss
@@ -4,86 +4,69 @@
 // Pop over
 // Foundation overrides
 .joyride-tip-guide.price_breakdown {
+  width: 16rem;
+  max-width: 65%;
   // JS needs to be tweaked to adjust for left alignment - this is dynamic can't rewrite in CSS
-  background-color: #999;
-  color: #1f1f1f;
-  margin-left: -8px;
+  margin-left: -7.4rem;
+  margin-top: 0.1rem;
 
-  @include box-shadow(0 1px 2px 0 rgba(0, 0, 0, 0.7));
+  @include box-shadow(0 2px 8px 0 rgba(0, 0, 0, 0.35));
 
   .joyride-content-wrapper {
-    padding: 1.125rem 1.25rem 1.5rem;
-    padding: 1rem;
-    margin: 1%;
+    padding: .625rem;
     width: 98%;
-    background-color: white;
-  }
-
-  h1, h2, h3, h4, h5, h6 {
-    color: #1f1f1f;
-  }
-
-  .joyride-nub.right {
-    top: 38px;
-    border-color: #999 !important;
-    border-top-color: transparent !important;
-    border-right-color: transparent !important;
-    border-bottom-color: transparent !important;
-  }
-
-  .progress {
-    background-color: #13bf85;
-    padding: 0;
-    border: none;
+    background-color: $grey-800;
     color: white;
-    font-size: 0.75rem;
-    font-style: oblique;
-    line-height: 1;
-    height: auto;
-
-    .right {
-      padding: 0.5rem 0.25rem 0 0;
-    }
-
-    .meter {
-      background-color: #0b8c61;
-      padding: 0.5rem 0.25rem;
-      border-right: 1px solid #539f92;
-    }
   }
 
-  .expanded {
-    ul, li {
-      list-style: none;
-      margin: 0;
-      font-size: 0.875rem;
-    }
+  h6 {
+    font-size: 0.937rem;
+    line-height: 1;
+    border-bottom: .1em solid $grey-700;
+    padding: 0 0 .625em 0;
+    margin-bottom: 2px;
+  }
 
-    li {
-      background-color: #13bf85;
-      padding: 0 0.25rem;
-      margin-bottom: 2px;
-      color: white;
-    }
+  .joyride-nub.top {
+    left: 7.4rem;
+    z-index: -1;
+  }
 
-    li.cost {
-      background-color: #0b8c61;
-    }
+  .background {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    cursor: pointer;
+  }
 
-    li:last-child {
-      margin-bottom: 0.75rem;
-    }
+  ul, li {
+    list-style: none;
+    margin: 0;
+    font-size: 0.875rem;
+  }
+
+  li {
+    line-height: 1;
+    border-bottom: .1em solid $grey-700;
+    padding: 0.625rem 0;
+    margin-bottom: 2px;
+  }
+
+  li:last-child {
+    border-bottom: 0;
+    padding-bottom: 0;
   }
 }
 
 button.graph-button {
   // z-index: 9999999
-  border: 1px solid transparent;
   padding: 0;
   margin: 0;
-  display: inline;
+  display: inline-block;
   background-color: rgba(255, 255, 255, 0.5);
-  padding: 4px;
 
   @include box-shadow(none);
 
@@ -97,7 +80,6 @@ button.graph-button {
   }
 
   &:focus {
-    border: 1px solid #e0e0e0;
     background-color: rgba(255, 255, 255, 1);
 
     &:before {
@@ -107,22 +89,15 @@ button.graph-button {
 
   &:hover, &:active {
     background-color: rgba(255, 255, 255, 1);
-    border: 1px solid transparent;
 
     &:before {
-      color: $clr-brick-bright;
+      color: $teal-500;
     }
   }
-
-  @include breakpoint(tablet) {
-    // Hide for small
-    display: none;
-  }
 }
 
 button.graph-button.open {
-  border: 1px solid transparent;
-  background-color: $clr-brick-bright;
+  background-color: $teal-500;
 
   &:before {
     content: "";
diff --git a/app/assets/stylesheets/darkswarm/_shop-product-rows.scss b/app/assets/stylesheets/darkswarm/_shop-product-rows.scss
index b0ea1faf39..feb9f54e5d 100644
--- a/app/assets/stylesheets/darkswarm/_shop-product-rows.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-product-rows.scss
@@ -10,91 +10,57 @@
         .columns {
           padding-top: 0em;
           padding-bottom: 0em;
-          display: table;
           line-height: 1.1;
-
-          // outline: 1px solid red
-
-          @include breakpoint(tablet) {
-            font-size: 0.875rem;
-          }
-
-          @include breakpoint(phablet) {
-            font-size: 0.75rem;
-          }
         }
+      }
 
-        .table-cell {
-          display: table-cell;
-          vertical-align: middle;
-          height: 37px;
+      .shop-variants {
+        // product-thumb width + 1rem
+        padding-left: calc(22.222% + 1rem);
+
+        @include breakpoint(phablet) {
+          padding-left: 0;
+          clear: left;
         }
       }
 
       // ROW VARIANTS
       .row.variants {
-        margin-left: 0;
-        margin-right: 0;
-        background-color: #ECECEC;
-
-        &:hover, &:focus, &:active {
-          background-color: $clr-brick-light;
-        }
-
-        &:nth-of-type(even) {
-          background-color: #f9f9f9;
-
-          &:hover, &:focus, &:active {
-            background-color: $clr-brick-ultra-light;
-          }
-        }
+        margin: 0 0 1em 0;
 
         &.out-of-stock {
           opacity: 0.2;
         }
 
+        .variant-name,
+        .total-price {
+          padding-top: .74em;
+        }
+        .variant-price {
+          padding-top: .65em;
+        }
+
         // Variant name
         .variant-name {
-          padding-left: 7.9375rem;
+          padding-left: 0;
+          padding-right: 0;
 
-          @include breakpoint(tablet) {
-            padding-left: 4.9375rem;
-          }
-        }
-
-        .variant-name {
           @include breakpoint(phablet) {
-            background: #333;
-            color: white;
-            padding-left: 0.9375rem;
-            font-weight: bold;
-
-            .table-cell {
-              height: 27px;
-            }
+            padding-left: 0.5rem;
           }
-        }
 
-        // Variant unit
-        .variant-unit {
-          padding-left: 0rem;
-          padding-right: 0rem;
-          color: #888;
-          font-size: 0.875rem;
-          overflow: hidden;
-
-          @include breakpoint(tablet) {
-            font-size: 0.75rem;
+          & > *:nth-child(n + 2) {
+            color: $grey-550;
+            font-size: 0.875rem;
+            font-style: italic;
+            line-height: normal;
           }
         }
 
         // Variant price
         .variant-price {
-          padding-left: 0.25rem;
-          padding-right: 0.25rem;
-
           @include breakpoint(phablet) {
-            text-align: right;
+            padding-left: 1rem;
           }
         }
 
@@ -108,24 +74,16 @@
           }
 
           @include breakpoint(phablet) {
-            background: #777;
-            color: $disabled-med;
-
-            .filled {
-              color: white;
-            }
-
-            .table-cell {
-              height: 27px;
-            }
+            display: none;
           }
         }
       }
 
       // ROW SUMMARY
-      .row.summary {
+      .summary {
         margin-left: 0;
         margin-right: 0;
+        margin-bottom: 1.25em;
         background: #fff;
 
         .columns {
@@ -140,39 +98,77 @@
         }
 
         .summary-header {
-          padding-left: 7.9375rem;
-
-          @include breakpoint(tablet) {
-            padding-left: 4.9375rem;
-          }
+          // product-thumb width + 1rem
+          padding-left: calc(22.222% + 1rem);
+          padding-right: 1rem;
 
           @include breakpoint(phablet) {
-            padding-left: 0.9375rem;
+            padding-left: calc(33.333% + 1rem);
           }
 
-          small {
-            font-size: 80%;
+          .product-producer {
+            color: $grey-550;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            font-style: italic;
+
+            a {
+              color: $teal-500;
+
+              &:hover, &:focus, &:active {
+                color: $teal-600;
+                text-decoration: underline;
+              }
+            }
           }
 
           h3 {
-            font-size: 1.5rem;
-            margin: 0;
+            font-size: 1.3rem;
+            margin-top: 0.75rem;
+            margin-bottom: 0.6rem;
           }
 
           h3 a {
-            color: #222;
-
-            i {
-              @include csstrans;
-
-              font-size: 0.6em;
-            }
+            color: $orange-500;
 
             &:hover, &:focus, &:active {
-              color: $clr-brick;
+              color: $orange-600;
+              text-decoration: underline;
+            }
+          }
 
-              i {
-                font-size: 0.8em;
+          .product-description {
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-bottom: 0.75rem;
+          }
+
+          .product-properties {
+            margin: .5em 0;
+
+            li {
+              margin: 0 0.25rem 0.25rem 0;
+
+              a {
+                padding: 0.1em 0.625em;
+
+                cursor: auto;
+
+                &.has-tip {
+                  cursor: pointer;
+                  font-weight: normal;
+                }
+                &:hover, &:focus {
+                  border-color: #ccc;
+                }
+              }
+
+              // Foundation doesn't show the nub on mobile.
+              // Repeating the style to show it here.
+              .nub {
+                border-color: transparent transparent #333333 transparent;
               }
             }
           }
diff --git a/app/assets/stylesheets/darkswarm/_shop-product-thumb.scss b/app/assets/stylesheets/darkswarm/_shop-product-thumb.scss
index c9f8794295..9b51d7f881 100644
--- a/app/assets/stylesheets/darkswarm/_shop-product-thumb.scss
+++ b/app/assets/stylesheets/darkswarm/_shop-product-thumb.scss
@@ -1,80 +1,32 @@
-@import "mixins";
-@import "branding";
-@import "animations";
-
 .darkswarm {
   products {
     product {
       .product-thumb {
-        @include csstrans;
-
-        position: absolute;
-        top: 2px;
-        left: 0px;
-        width: 7rem;
-        height: 7rem;
+        // Desktop: the product summary is nine columns wide. Use two
+        // for the image. 100% / 9 * 2 = 22.222% <= 192px
+        width: calc(22.222%);
         float: left;
-        display: block;
-        z-index: 1;
-        background-color: white;
-        overflow: hidden;
-
-        i {
-          @include csstrans;
-
-          transition-delay: 150ms;
-          position: absolute;
-          left: 45%;
-          top: 45%;
-          z-index: 99999;
-          color: white;
-          font-size: 1rem;
-          opacity: 0;
-        }
-
-        img {
-          @include csstrans;
-
-          opacity: 1;
-
-          @include transform-scale(scale(1));
-        }
-
-        &:hover, &:focus, &:active {
-          background-color: $clr-brick;
-
-          i {
-            left: 32%;
-            top: 30%;
-            font-size: 3rem;
-            opacity: 1;
-          }
-
-          img {
-            opacity: 0.5;
-
-            @include transform-scale(scale(1.1));
-          }
-        }
-
-        @include breakpoint(tablet) {
-          top: 2px;
-          width: 4rem;
-          height: 4rem;
-
-          &:hover, &:focus, &:active {
-            i {
-              left: 30%;
-              top: 30%;
-              font-size: 2rem;
-            }
-          }
-        }
 
+        // Mobile: the summary has full twelve columns and the image
+        // should take four of them. 100% / 12 * 4 = 33.333% <= 227px
         @include breakpoint(phablet) {
-          display: none;
-          width: 0rem;
-          height: 0rem;
+          width: calc(33.333%);
+        }
+
+        // Make this an anchor for the bulk label.
+        position: relative;
+
+        .product-thumb__bulk-label {
+          background-color: $grey-700;
+          color: white;
+          position: absolute;
+          right: 0;
+          top: .8em;
+          padding: .25em .5em;
+        }
+
+        &:hover {
+          filter: brightness(96%);
         }
       }
     }
diff --git a/app/assets/stylesheets/darkswarm/_shop-taxon-flag.scss b/app/assets/stylesheets/darkswarm/_shop-taxon-flag.scss
deleted file mode 100644
index b6b237215e..0000000000
--- a/app/assets/stylesheets/darkswarm/_shop-taxon-flag.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@import "mixins";
-
-.darkswarm {
-  products {
-    product {
-      .taxon-flag {
-        background: transparent image-url("flag.svg") top center no-repeat;
-        background-size: 34px 39px;
-        min-height: 40px;
-        width: 34px;
-        margin-top: -1.1rem;
-        padding-top: 0.25rem;
-        z-index: 999999;
-
-        @include breakpoint(mobile) {
-          background-size: 28px 32px;
-          min-height: 32px;
-          width: 28px;
-        }
-
-        render-svg {
-          svg {
-            width: 24px;
-            height: 24px;
-
-            path {
-              fill: #999;
-            }
-          }
-        }
-
-        @include breakpoint(tablet) {
-          margin-top: -0.85rem;
-        }
-
-        @include breakpoint(mobile) {
-          render-svg {
-            svg {
-              width: 18px;
-              height: 18px;
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/darkswarm/branding.scss b/app/assets/stylesheets/darkswarm/branding.scss
index de705bbfa3..b29e81acf9 100644
--- a/app/assets/stylesheets/darkswarm/branding.scss
+++ b/app/assets/stylesheets/darkswarm/branding.scss
@@ -11,7 +11,6 @@ $ofn-grey: #808184;
 $clr-brick: #c1122b;
 $clr-brick-light: #f5e6e7;
 $clr-brick-light-trans: rgba(245, 230, 231, 0.9);
-$clr-brick-ultra-light: #faf5f6;
 $clr-brick-bright: #eb4c46;
 $clr-brick-med-bright: #e5a2a0;
 $clr-brick-light-bright: #f5c4c9;
@@ -48,6 +47,7 @@ $grey-200: #ddd;
 $grey-300: #ccc;
 $grey-400: #bbb;
 $grey-500: #999;
+$grey-550: #888;
 $grey-600: #777;
 $grey-650: #666;
 $grey-700: #555;
@@ -56,6 +56,7 @@ $grey-800: #333;
 $teal-300: #80d3df;
 $teal-400: #4cb5c5;
 $teal-500: #0096ad;
+$teal-600: #007a9a;
 
 $orange-400: #ff9466;
 $orange-450: #f4704c;
diff --git a/app/assets/stylesheets/darkswarm/embedded_shopfront.scss b/app/assets/stylesheets/darkswarm/embedded_shopfront.scss
index 210825a008..2db5181cdd 100644
--- a/app/assets/stylesheets/darkswarm/embedded_shopfront.scss
+++ b/app/assets/stylesheets/darkswarm/embedded_shopfront.scss
@@ -59,13 +59,6 @@ body.embedded {
         line-height: $large-menu-height;
         height: $large-menu-height;
         vertical-align: top;
-
-        &.cart {
-          div.joyride-tip-guide { // Cart Dropdown
-            top: 75px;
-            overflow: visible;
-          }
-        }
       }
     }
 
diff --git a/app/assets/stylesheets/darkswarm/mixins.scss b/app/assets/stylesheets/darkswarm/mixins.scss
index 43d291e14e..90febd6009 100644
--- a/app/assets/stylesheets/darkswarm/mixins.scss
+++ b/app/assets/stylesheets/darkswarm/mixins.scss
@@ -142,57 +142,6 @@
 
 // Background options \\
 
-@mixin darkbg {
-  background-color: $clr-brick;
-
-  &, & * {
-    color: white;
-  }
-
-  a {
-    color: $clr-brick-ultra-light;
-
-    &:hover {
-      text-decoration: none;
-      color: $clr-brick-light;
-    }
-  }
-}
-
-@mixin lightbg {
-  background-color: $clr-brick-light;
-
-  &, & * {
-    color: black;
-  }
-
-  a {
-    color: $clr-brick;
-
-    &:hover {
-      text-decoration: none;
-      color: $clr-brick-bright;
-    }
-  }
-}
-
-@mixin turqbg {
-  background-color: $clr-turquoise-light;
-
-  &, & * {
-    color: $clr-turquoise;
-  }
-
-  a {
-    color: $clr-turquoise;
-
-    &:hover {
-      text-decoration: none;
-      color: $clr-turquoise-bright;
-    }
-  }
-}
-
 @mixin fullbg {
   background-position: center center;
   background-repeat: no-repeat;
@@ -202,12 +151,6 @@
   background-size: cover;
 }
 
-@mixin fullwidthbg {
-  background-position: center top;
-  background-repeat: no-repeat;
-  background-size: 100% auto;
-}
-
 @mixin gradient($gradient-clr1, $gradient-clr2) {
   background: $gradient-clr1;
 
diff --git a/app/assets/stylesheets/darkswarm/shop.scss b/app/assets/stylesheets/darkswarm/shop.scss
index 6f411db6e9..8312f6c360 100644
--- a/app/assets/stylesheets/darkswarm/shop.scss
+++ b/app/assets/stylesheets/darkswarm/shop.scss
@@ -8,10 +8,30 @@
 @import "shop-inputs";
 @import "shop-navigation";
 @import "shop-product-rows";
-@import "shop-taxon-flag";
 @import "shop-popovers";
 
 .darkswarm {
+  .product-listing {
+    @include breakpoint(desktop) {
+      padding-right: 0;
+      padding-left: 0;
+    }
+
+    .row.full {
+      width: 100%;
+      margin: 0;
+
+      .columns.full {
+        padding-right: 0;
+        padding-left: 0;
+      }
+    }
+  }
+
+  .filter-header {
+    margin-top: 1.1em;
+  }
+
   products {
     display: block;
 
@@ -51,32 +71,18 @@
     product {
       @include csstrans;
 
-      border-bottom: 1px solid #e5e5e5;
-      border-top: 1px solid #e5e5e5;
+      // Avoid margin collapsing which breaks the flush alignment of the first
+      // image.
+      overflow: auto;
+
+      &:nth-child(n + 2) {
+        border-top: 1px solid $grey-100;
+      }
       padding-bottom: 1px;
-      margin-bottom: 20px !important;
       position: relative;
       display: block;
       color: $med-drk-grey;
 
-      &:hover, &:focus, &:active {
-        border-bottom: 1px solid $clr-brick-med-bright;
-        border-top: 1px solid $clr-brick-med-bright;
-      }
-
-      // BULK
-      .bulk-buy {
-        font-size: 0.875rem;
-
-        @include breakpoint(tablet) {
-          font-size: 0.75rem;
-        }
-      }
-
-      .bulk-buy, .bulk-buy i {
-        color: #888;
-      }
-
       .inline {
         display: inline;
       }
@@ -85,27 +91,6 @@
         width: 100px;
         margin-bottom: 20px;
       }
-
-      // ICONS
-      i {
-        font-size: 0.75em;
-        padding-right: 0.9375rem;
-
-        @include breakpoint(phablet) {
-          padding-right: 0.25rem;
-        }
-      }
-
-      i.ofn-i_056-bulk {
-        font-size: 1rem;
-        padding-right: 0rem;
-      }
-
-      i.ofn-i_036-producers {
-        padding-left: 0.2rem;
-        padding-right: 0rem;
-        font-size: 0.8rem;
-      }
     }
   }
 
diff --git a/app/assets/stylesheets/darkswarm/shop_search.scss b/app/assets/stylesheets/darkswarm/shop_search.scss
index 4b141cd021..28e4269b4c 100644
--- a/app/assets/stylesheets/darkswarm/shop_search.scss
+++ b/app/assets/stylesheets/darkswarm/shop_search.scss
@@ -6,7 +6,6 @@
   background-color: $grey-100;
   height: 5em;
   padding: 1em 0;
-  margin-bottom: 1em;
   position: relative;
   z-index: 5;
 
@@ -50,7 +49,7 @@
 
   button {
     background-color: $grey-600;
-    margin-left: 1em;
+    margin: 0 0 0 1em;
     height: 3em;
     width: 7em;
     padding: 0;
diff --git a/app/assets/stylesheets/darkswarm/ui.scss b/app/assets/stylesheets/darkswarm/ui.scss
index d6b0988ad6..a9a43b0b5f 100644
--- a/app/assets/stylesheets/darkswarm/ui.scss
+++ b/app/assets/stylesheets/darkswarm/ui.scss
@@ -159,11 +159,6 @@ a.button.large {
   display: flex;
 }
 
-.no-gutter {
-  padding-right: 0;
-  padding-left: 0;
-}
-
 .disable-scroll {
   overflow: hidden;
 }
diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb
index 4277dc2ff4..f1b4887f6a 100644
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -73,7 +73,7 @@ module Admin
 
       if @enterprise.update(attributes)
         flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name)
-        redirect_to admin_dashboard_path
+        redirect_to spree.admin_dashboard_path
       else
         flash[:error] = I18n.t(:enterprise_register_error, enterprise: @enterprise.name)
         render :welcome, layout: "spree/layouts/bare_admin"
diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index c47b112359..b25dd490f2 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open_food_network/address_finder'
+require 'spree/core/gateway_error'
 
 class CheckoutController < Spree::StoreController
   layout 'darkswarm'
@@ -47,8 +48,6 @@ class CheckoutController < Spree::StoreController
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
     return action_failed unless @order.update(params_adapter.params[:order])
 
-    fire_event('spree.checkout.update')
-
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
     rescue_from_spree_gateway_error(e)
@@ -150,7 +149,7 @@ class CheckoutController < Spree::StoreController
   def handle_redirect_from_stripe
     if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
-      redirect_to(order_path(@order)) && return
+      redirect_to(spree.order_path(@order)) && return
     else
       checkout_failed
     end
@@ -210,10 +209,10 @@ class CheckoutController < Spree::StoreController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: order_path(@order))
+        respond_with(@order, location: spree.order_path(@order))
       end
       format.json do
-        render json: { path: order_path(@order) }, status: :ok
+        render json: { path: spree.order_path(@order) }, status: :ok
       end
     end
   end
diff --git a/app/controllers/spree/admin/general_settings_controller.rb b/app/controllers/spree/admin/general_settings_controller.rb
index dcb360bcc9..73fbe619d3 100644
--- a/app/controllers/spree/admin/general_settings_controller.rb
+++ b/app/controllers/spree/admin/general_settings_controller.rb
@@ -17,7 +17,7 @@ module Spree
         end
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
 
-        redirect_to edit_admin_general_settings_path
+        redirect_to spree.edit_admin_general_settings_path
       end
     end
   end
diff --git a/app/controllers/spree/admin/image_settings_controller.rb b/app/controllers/spree/admin/image_settings_controller.rb
deleted file mode 100644
index 476dd401a8..0000000000
--- a/app/controllers/spree/admin/image_settings_controller.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module Spree
-  module Admin
-    class ImageSettingsController < Spree::Admin::BaseController
-      def edit
-        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-      end
-
-      def update
-        update_styles(params)
-        update_headers(params) if Spree::Config[:use_s3]
-
-        Spree::Config.set(params[:preferences])
-        update_paperclip_settings
-
-        respond_to do |format|
-          format.html {
-            flash[:success] = Spree.t(:image_settings_updated)
-            redirect_to spree.edit_admin_image_settings_path
-          }
-        end
-      end
-
-      private
-
-      def update_styles(params)
-        if params[:new_attachment_styles].present?
-          params[:new_attachment_styles].each do |_index, style|
-            params[:attachment_styles][style[:name]] = style[:value] if style[:value].present?
-          end
-        end
-
-        styles = params[:attachment_styles]
-
-        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
-      end
-
-      def update_headers(params)
-        if params[:new_s3_headers].present?
-          params[:new_s3_headers].each do |_index, header|
-            params[:s3_headers][header[:name]] = header[:value] if header[:value].present?
-          end
-        end
-
-        headers = params[:s3_headers]
-
-        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
-      end
-
-      def update_paperclip_settings
-        if Spree::Config[:use_s3]
-          s3_creds = { access_key_id: Spree::Config[:s3_access_key],
-                       secret_access_key: Spree::Config[:s3_secret],
-                       bucket: Spree::Config[:s3_bucket] }
-          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
-          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
-          Spree::Image.attachment_definitions[:attachment][:s3_headers] =
-            ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
-        else
-          Spree::Image.attachment_definitions[:attachment].delete :storage
-        end
-
-        Spree::Image.attachment_definitions[:attachment][:styles] =
-          ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
-        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
-        Spree::Image.attachment_definitions[:attachment][:default_url] =
-          Spree::Config[:attachment_default_url]
-        Spree::Image.attachment_definitions[:attachment][:default_style] =
-          Spree::Config[:attachment_default_style]
-
-        # Spree stores attachent definitions in JSON. This converts the style name and format to
-        # strings. However, when paperclip encounters these, it doesn't recognise the format.
-        # Here we solve that problem by converting format and style name to symbols.
-        Spree::Image.reformat_styles
-      end
-    end
-  end
-end
diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb
index c73e4e6826..b16e643508 100644
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -61,7 +61,7 @@ module Spree
       private
 
       def location_after_save
-        admin_product_images_url(@product)
+        spree.admin_product_images_url(@product)
       end
 
       def load_data
diff --git a/app/controllers/spree/admin/mail_methods_controller.rb b/app/controllers/spree/admin/mail_methods_controller.rb
index 70d573f319..d3618488ed 100644
--- a/app/controllers/spree/admin/mail_methods_controller.rb
+++ b/app/controllers/spree/admin/mail_methods_controller.rb
@@ -23,7 +23,7 @@ module Spree
       rescue StandardError => e
         flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e }
       ensure
-        redirect_to edit_admin_mail_methods_url
+        redirect_to spree.edit_admin_mail_methods_url
       end
 
       private
diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb
index 8ad0c7ea28..56502d54a0 100644
--- a/app/controllers/spree/admin/orders/customer_details_controller.rb
+++ b/app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -27,7 +27,7 @@ module Spree
 
             @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
-            redirect_to admin_order_customer_path(@order)
+            redirect_to spree.admin_order_customer_path(@order)
           else
             render action: :edit
           end
diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
index 0e3b28d630..56dc8b0ed7 100644
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -29,7 +29,7 @@ module Spree
         @order = Order.create
         @order.created_by = spree_current_user
         @order.save
-        redirect_to edit_admin_order_url(@order)
+        redirect_to spree.edit_admin_order_url(@order)
       end
 
       def edit
@@ -48,16 +48,16 @@ module Spree
           if @order.line_items.empty?
             @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
           end
-          return redirect_to(edit_admin_order_path(@order),
+          return redirect_to(spree.edit_admin_order_path(@order),
                              flash: { error: @order.errors.full_messages.join(', ') })
         end
 
         @order.update!
         if @order.complete?
-          redirect_to edit_admin_order_path(@order)
+          redirect_to spree.edit_admin_order_path(@order)
         else
           # Jump to next step if order is not complete
-          redirect_to admin_order_customer_path(@order)
+          redirect_to spree.admin_order_customer_path(@order)
         end
       end
 
@@ -91,7 +91,9 @@ module Spree
         Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
         flash[:success] = t('admin.orders.invoice_email_sent')
 
-        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
+        respond_with(@order) { |format|
+          format.html { redirect_to spree.edit_admin_order_path(@order) }
+        }
       end
 
       def print
@@ -131,7 +133,9 @@ module Spree
 
         flash[:error] = t(:must_have_valid_business_number,
                           enterprise_name: @order.distributor.name)
-        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
+        respond_with(@order) { |format|
+          format.html { redirect_to spree.edit_admin_order_path(@order) }
+        }
       end
 
       def load_distribution_choices
diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb
index 950b97340b..72408fef26 100644
--- a/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/app/controllers/spree/admin/payment_methods_controller.rb
@@ -22,7 +22,7 @@ module Spree
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to edit_admin_payment_method_path(@payment_method)
+          redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
           respond_with(@payment_method)
@@ -43,7 +43,7 @@ module Spree
         if @payment_method.update(params_for_update)
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
-          redirect_to edit_admin_payment_method_path(@payment_method)
+          redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
           respond_with(@payment_method)
@@ -122,7 +122,7 @@ module Spree
         return if valid_payment_methods.include?(params[:payment_method][:type])
 
         flash[:error] = Spree.t(:invalid_payment_provider)
-        redirect_to new_admin_payment_method_path
+        redirect_to spree.new_admin_payment_method_path
       end
 
       def load_hubs
diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index bfdb4fd2ff..0b5732caa1 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -12,7 +12,7 @@ module Spree
 
       def index
         @payments = @order.payments
-        redirect_to new_admin_order_payment_url(@order) if @payments.empty?
+        redirect_to spree.new_admin_order_payment_url(@order) if @payments.empty?
       end
 
       def new
@@ -25,7 +25,7 @@ module Spree
 
         begin
           unless @payment.save
-            redirect_to admin_order_payments_path(@order)
+            redirect_to spree.admin_order_payments_path(@order)
             return
           end
 
@@ -35,16 +35,16 @@ module Spree
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
 
-            redirect_to admin_order_payments_path(@order)
+            redirect_to spree.admin_order_payments_path(@order)
           else
             OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
-            redirect_to edit_admin_order_url(@order)
+            redirect_to spree.edit_admin_order_url(@order)
           end
         rescue Spree::Core::GatewayError => e
           flash[:error] = e.message.to_s
-          redirect_to new_admin_order_payment_path(@order)
+          redirect_to spree.new_admin_order_payment_path(@order)
         end
       end
 
@@ -118,7 +118,7 @@ module Spree
         return if @order.payment? || @order.complete?
 
         flash[:notice] = Spree.t(:fill_in_customer_info)
-        redirect_to edit_admin_order_customer_url(@order)
+        redirect_to spree.edit_admin_order_customer_url(@order)
       end
 
       def load_order
diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb
index 0556c25a1a..42d4006680 100644
--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -29,9 +29,9 @@ module Spree
           if @object.save
             flash[:success] = flash_message_for(@object, :successfully_created)
             if params[:button] == "add_another"
-              redirect_to new_admin_product_path
+              redirect_to spree.new_admin_product_path
             else
-              redirect_to admin_products_path
+              redirect_to spree.admin_products_path
             end
           else
             render :new
@@ -70,7 +70,7 @@ module Spree
 
             flash[:success] = flash_message_for(@object, :successfully_updated)
           end
-          redirect_to edit_admin_product_url(@object, @url_filters)
+          redirect_to spree.edit_admin_product_url(@object, @url_filters)
         end
       end
 
@@ -97,7 +97,7 @@ module Spree
                             Spree.t('notice_messages.product_not_cloned')
                           end
 
-        redirect_to edit_admin_product_url(@new)
+        redirect_to spree.edit_admin_product_url(@new)
       end
 
       def group_buy_options
diff --git a/app/controllers/spree/admin/shipping_methods_controller.rb b/app/controllers/spree/admin/shipping_methods_controller.rb
index b91f8432a9..14f7654177 100644
--- a/app/controllers/spree/admin/shipping_methods_controller.rb
+++ b/app/controllers/spree/admin/shipping_methods_controller.rb
@@ -74,7 +74,7 @@ module Spree
       end
 
       def location_after_save
-        edit_admin_shipping_method_path(@shipping_method)
+        spree.edit_admin_shipping_method_path(@shipping_method)
       end
 
       def load_data
diff --git a/app/controllers/spree/admin/states_controller.rb b/app/controllers/spree/admin/states_controller.rb
index 09d7244439..56f077b0ea 100644
--- a/app/controllers/spree/admin/states_controller.rb
+++ b/app/controllers/spree/admin/states_controller.rb
@@ -14,7 +14,7 @@ module Spree
       protected
 
       def location_after_save
-        admin_country_states_url(@country)
+        spree.admin_country_states_url(@country)
       end
 
       def collection
diff --git a/app/controllers/spree/admin/tax_settings_controller.rb b/app/controllers/spree/admin/tax_settings_controller.rb
index a66ad219ff..8be30677e0 100644
--- a/app/controllers/spree/admin/tax_settings_controller.rb
+++ b/app/controllers/spree/admin/tax_settings_controller.rb
@@ -6,7 +6,7 @@ module Spree
 
         respond_to do |format|
           format.html {
-            redirect_to edit_admin_tax_settings_path
+            redirect_to spree.edit_admin_tax_settings_path
           }
         end
       end
diff --git a/app/controllers/spree/admin/taxonomies_controller.rb b/app/controllers/spree/admin/taxonomies_controller.rb
index fb735ec4fa..66497eda2a 100644
--- a/app/controllers/spree/admin/taxonomies_controller.rb
+++ b/app/controllers/spree/admin/taxonomies_controller.rb
@@ -11,9 +11,9 @@ module Spree
 
       def location_after_save
         if @taxonomy.created_at == @taxonomy.updated_at
-          edit_admin_taxonomy_url(@taxonomy)
+          spree.edit_admin_taxonomy_url(@taxonomy)
         else
-          admin_taxonomies_url
+          spree.admin_taxonomies_url
         end
       end
 
diff --git a/app/controllers/spree/admin/taxons_controller.rb b/app/controllers/spree/admin/taxons_controller.rb
index 0b171567d2..1b9b980da2 100644
--- a/app/controllers/spree/admin/taxons_controller.rb
+++ b/app/controllers/spree/admin/taxons_controller.rb
@@ -15,9 +15,9 @@ module Spree
           respond_with(@taxon) do |format|
             format.html do
               if redirect_to @taxonomy
-                edit_admin_taxonomy_url(@taxonomy)
+                spree.edit_admin_taxonomy_url(@taxonomy)
               else
-                admin_taxonomies_url
+                spree.admin_taxonomies_url
               end
             end
           end
@@ -95,7 +95,7 @@ module Spree
         end
 
         respond_with(@taxon) do |format|
-          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+          format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
           format.json { render json: @taxon.to_json }
         end
       end
diff --git a/app/controllers/spree/admin/users_controller.rb b/app/controllers/spree/admin/users_controller.rb
index e6ffeaa6cd..3241a889f1 100644
--- a/app/controllers/spree/admin/users_controller.rb
+++ b/app/controllers/spree/admin/users_controller.rb
@@ -60,14 +60,14 @@ module Spree
         if @user.generate_spree_api_key!
           flash[:success] = t('spree.api.key_generated')
         end
-        redirect_to edit_admin_user_path(@user)
+        redirect_to spree.edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
           flash[:success] = t('spree.api.key_cleared')
         end
-        redirect_to edit_admin_user_path(@user)
+        redirect_to spree.edit_admin_user_path(@user)
       end
 
       protected
diff --git a/app/controllers/spree/admin/variants_controller.rb b/app/controllers/spree/admin/variants_controller.rb
index 302b3e62a5..bb1f8284ac 100644
--- a/app/controllers/spree/admin/variants_controller.rb
+++ b/app/controllers/spree/admin/variants_controller.rb
@@ -61,17 +61,21 @@ module Spree
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
 
         @variant = Spree::Variant.find(params[:id])
-        flash[:success] = if VariantDeleter.new.delete(@variant)
-                            Spree.t('notice_messages.variant_deleted')
-                          else
-                            Spree.t('notice_messages.variant_not_deleted')
-                          end
+        flash[:success] = delete_variant
 
-        redirect_to admin_product_variants_url(params[:product_id], @url_filters)
+        redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
       end
 
       protected
 
+      def delete_variant
+        if VariantDeleter.new.delete(@variant)
+          Spree.t('notice_messages.variant_deleted')
+        else
+          Spree.t('notice_messages.variant_not_deleted')
+        end
+      end
+
       def create_before
         option_values = params[:new_variant]
         option_values.andand.each_value { |id| @object.option_values << OptionValue.find(id) }
diff --git a/app/controllers/spree/base_controller.rb b/app/controllers/spree/base_controller.rb
index 21a3d6fe5d..b2e4628bc3 100644
--- a/app/controllers/spree/base_controller.rb
+++ b/app/controllers/spree/base_controller.rb
@@ -3,8 +3,8 @@
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/respond_with'
-require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/ssl'
+require 'spree/core/controller_helpers/common'
 
 module Spree
   class BaseController < ApplicationController
diff --git a/app/controllers/spree/credit_cards_controller.rb b/app/controllers/spree/credit_cards_controller.rb
index a1c2e60ea5..9b4c2d971d 100644
--- a/app/controllers/spree/credit_cards_controller.rb
+++ b/app/controllers/spree/credit_cards_controller.rb
@@ -48,10 +48,10 @@ module Spree
       else
         flash[:error] = I18n.t(:card_could_not_be_removed)
       end
-      redirect_to account_path(anchor: 'cards')
+      redirect_to spree.account_path(anchor: 'cards')
     rescue Stripe::CardError
       flash[:error] = I18n.t(:card_could_not_be_removed)
-      redirect_to account_path(anchor: 'cards')
+      redirect_to spree.account_path(anchor: 'cards')
     end
 
     private
diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb
index 898ec93f99..9703c8def8 100644
--- a/app/controllers/spree/orders_controller.rb
+++ b/app/controllers/spree/orders_controller.rb
@@ -78,11 +78,7 @@ module Spree
         discard_empty_line_items
         with_open_adjustments { update_totals_and_taxes }
 
-        if @order == current_order
-          fire_event('spree.order.contents_changed')
-        else
-          @order.update_distribution_charge!
-        end
+        @order.update_distribution_charge!
 
         respond_with(@order) do |format|
           format.html do
@@ -90,7 +86,7 @@ module Spree
               @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
-              redirect_to order_path(@order)
+              redirect_to spree.order_path(@order)
             else
               redirect_to main_app.cart_path
             end
@@ -157,7 +153,7 @@ module Spree
       else
         flash[:error] = I18n.t(:orders_could_not_cancel)
       end
-      redirect_to request.referer || order_path(@order)
+      redirect_to request.referer || spree.order_path(@order)
     end
 
     private
@@ -221,7 +217,7 @@ module Spree
 
       if items.empty?
         flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-        redirect_to order_path(order_to_update)
+        redirect_to spree.order_path(order_to_update)
       end
     end
 
diff --git a/app/controllers/spree/user_passwords_controller.rb b/app/controllers/spree/user_passwords_controller.rb
index 4e7fc6e824..6358d16f0b 100644
--- a/app/controllers/spree/user_passwords_controller.rb
+++ b/app/controllers/spree/user_passwords_controller.rb
@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserPasswordsController < Devise::PasswordsController
-    helper 'spree/base', 'spree/store'
+    helper 'spree/base'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common
diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb
index 1a2d740da7..64c3681d81 100644
--- a/app/controllers/spree/user_registrations_controller.rb
+++ b/app/controllers/spree/user_registrations_controller.rb
@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
-    helper 'spree/base', 'spree/store'
+    helper 'spree/base'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common
diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index c17eafb892..f090a281ca 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserSessionsController < Devise::SessionsController
-    helper 'spree/base', 'spree/store'
+    helper 'spree/base'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common
diff --git a/app/helpers/admin/image_settings_helper.rb b/app/helpers/admin/image_settings_helper.rb
deleted file mode 100644
index e337161298..0000000000
--- a/app/helpers/admin/image_settings_helper.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Admin
-  module ImageSettingsHelper
-    def admin_image_settings_format_options
-      [['Unchanged', ''], ['PNG', 'png'], ['JPEG', 'jpg']]
-    end
-
-    def admin_image_settings_geometry_from_style(style)
-      geometry, _format = admin_image_settings_split_style style
-      geometry
-    end
-
-    def admin_image_settings_format_from_style(style)
-      _geometry, format = admin_image_settings_split_style style
-      format
-    end
-
-    def admin_image_settings_split_style(style)
-      [style, nil].flatten[0..1]
-    end
-  end
-end
diff --git a/app/mailers/spree/user_mailer.rb b/app/mailers/spree/user_mailer.rb
index a93aff05a5..a53db460a0 100644
--- a/app/mailers/spree/user_mailer.rb
+++ b/app/mailers/spree/user_mailer.rb
@@ -8,10 +8,12 @@ module Spree
     def reset_password_instructions(user, token, _opts = {})
       @edit_password_reset_url = spree.
         edit_spree_user_password_url(reset_password_token: token)
+      subject = "#{Spree::Config[:site_name]} " \
+        "#{I18n.t('spree.user_mailer.reset_password_instructions.subject')}"
 
-      mail(to: user.email, from: from_address,
-           subject: Spree::Config[:site_name] + ' ' +
-             I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]))
+      I18n.with_locale valid_locale(user) do
+        mail(to: user.email, from: from_address, subject: subject)
+      end
     end
 
     # This is a OFN specific email, not from Devise::Mailer
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 0bf0319bde..5bb20d3821 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -1,5 +1,6 @@
 require 'open_food_network/locking'
 require 'open_food_network/permalink_generator'
+require 'spree/core/s3_support'
 
 class EnterpriseGroup < ActiveRecord::Base
   include PermalinkGenerator
diff --git a/app/models/spree/app_configuration.rb b/app/models/spree/app_configuration.rb
new file mode 100644
index 0000000000..d56ca5a6ac
--- /dev/null
+++ b/app/models/spree/app_configuration.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+# This is the primary location for defining spree preferences
+#
+# This file allows us to add global configuration variables, which
+# we can allow to be modified in the UI by adding appropriate form
+# elements to existing or new configuration pages.
+#
+# The expectation is that this is created once and stored in
+# the spree environment
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
+module Spree
+  class AppConfiguration < Preferences::Configuration
+    # Should state/state_name be required
+    preference :address_requires_state, :boolean, default: true
+    preference :admin_interface_logo, :string, default: 'ofn-logo.png'
+    preference :admin_products_per_page, :integer, default: 10
+    # Should only be true if you don't need to track inventory
+    preference :allow_backorder_shipping, :boolean, default: false
+    preference :allow_checkout_on_gateway_error, :boolean, default: false
+    preference :allow_guest_checkout, :boolean, default: true
+    preference :allow_ssl_in_development_and_test, :boolean, default: false
+    preference :allow_ssl_in_production, :boolean, default: true
+    preference :allow_ssl_in_staging, :boolean, default: true
+    # Automatically capture the credit card (as opposed to just authorize and capture later)
+    preference :auto_capture, :boolean, default: false
+    # Replace with the name of a zone if you would like to limit the countries
+    preference :checkout_zone, :string, default: nil
+    preference :currency, :string, default: "USD"
+    preference :currency_decimal_mark, :string, default: "."
+    preference :currency_symbol_position, :string, default: "before"
+    preference :currency_thousands_separator, :string, default: ","
+    preference :display_currency, :boolean, default: false
+    preference :default_country_id, :integer
+    preference :default_meta_description, :string, default: 'OFN demo site'
+    preference :default_meta_keywords, :string, default: 'ofn, demo'
+    preference :default_seo_title, :string, default: ''
+    preference :hide_cents, :boolean, default: false
+    preference :layout, :string, default: 'darkswarm'
+    preference :logo, :string, default: 'ofn-logo.png'
+
+    # Maximum nesting level in taxons menu
+    preference :max_level_in_taxons_menu, :integer, default: 1
+    preference :orders_per_page, :integer, default: 15
+    preference :prices_inc_tax, :boolean, default: false
+    preference :products_per_page, :integer, default: 12
+    preference :redirect_https_to_http, :boolean, default: false
+    preference :require_master_price, :boolean, default: true
+    preference :shipment_inc_vat, :boolean, default: false
+    # Request instructions/info for shipping
+    preference :shipping_instructions, :boolean, default: false
+    # Displays variant full price or difference with product price.
+    preference :show_variant_full_price, :boolean, default: false
+    preference :show_products_without_price, :boolean, default: false
+    preference :show_raw_product_description, :boolean, default: false
+    preference :site_name, :string, default: 'OFN Demo Site'
+    preference :site_url, :string, default: 'demo.openfoodnetwork.org'
+    preference :tax_using_ship_address, :boolean, default: true
+    # Determines whether to track on_hand values for variants / products.
+    preference :track_inventory_levels, :boolean, default: true
+
+    # Preferences related to image settings
+    preference :attachment_default_url, :string,
+               default: '/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_path, :string,
+               default: ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_url, :string,
+               default: '/spree/products/:id/:style/:basename.:extension'
+    preference :attachment_styles, :string,
+               default: "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
+    preference :attachment_default_style, :string, default: 'product'
+    preference :s3_access_key, :string
+    preference :s3_bucket, :string
+    preference :s3_secret, :string
+    preference :s3_headers, :string, default: "{\"Cache-Control\":\"max-age=31557600\"}"
+    preference :use_s3, :boolean, default: false # Use S3 for images rather than the file system
+    preference :s3_protocol, :string
+    preference :s3_host_alias, :string
+
+    # Default mail headers settings
+    preference :enable_mail_delivery, :boolean, default: false
+    preference :mails_from, :string, default: 'ofn@example.com'
+    preference :mail_bcc, :string, default: 'ofn@example.com'
+    preference :intercept_email, :string, default: nil
+
+    # Default smtp settings
+    preference :override_actionmailer_config, :boolean, default: true
+    preference :mail_host, :string, default: 'localhost'
+    preference :mail_domain, :string, default: 'localhost'
+    preference :mail_port, :integer, default: 25
+    preference :secure_connection_type, :string,
+               default: Core::MailSettings::SECURE_CONNECTION_TYPES[0]
+    preference :mail_auth_type, :string, default: Core::MailSettings::MAIL_AUTH[0]
+    preference :smtp_username, :string
+    preference :smtp_password, :string
+
+    # Embedded Shopfronts
+    preference :enable_embedded_shopfronts, :boolean, default: false
+    preference :embedded_shopfronts_whitelist, :text, default: nil
+
+    # Legal Preferences
+    preference :footer_tos_url, :string, default: "/Terms-of-service.pdf"
+    preference :enterprises_require_tos, :boolean, default: false
+    preference :privacy_policy_url, :string, default: nil
+    preference :cookies_consent_banner_toggle, :boolean, default: false
+    preference :cookies_policy_matomo_section, :boolean, default: false
+
+    # Tax Preferences
+    preference :products_require_tax_category, :boolean, default: false
+    preference :shipping_tax_rate, :decimal, default: 0
+
+    # Monitoring
+    preference :last_job_queue_heartbeat_at, :string, default: nil
+
+    # External services
+    preference :bugherd_api_key, :string, default: nil
+    preference :matomo_url, :string, default: nil
+    preference :matomo_site_id, :string, default: nil
+    preference :matomo_tag_manager_url, :string, default: nil
+
+    # Invoices & Receipts
+    preference :enable_invoices?, :boolean, default: true
+    preference :invoice_style2?, :boolean, default: false
+    preference :enable_receipt_printing?, :boolean, default: false
+
+    # Stripe Connect
+    preference :stripe_connect_enabled, :boolean, default: false
+
+    # Number localization
+    preference :enable_localized_number?, :boolean, default: false
+
+    # Enable cache
+    preference :enable_products_cache?, :boolean,
+               default: (Rails.env.production? || Rails.env.staging?)
+  end
+end
diff --git a/app/models/spree/app_configuration_decorator.rb b/app/models/spree/app_configuration_decorator.rb
deleted file mode 100644
index a039ddbd45..0000000000
--- a/app/models/spree/app_configuration_decorator.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-Spree::AppConfiguration.class_eval do
-  # This file decorates the existing preferences file defined by Spree.
-  # It allows us to add our own global configuration variables, which
-  # we can allow to be modified in the UI by adding appropriate form
-  # elements to existing or new configuration pages.
-
-  # Embedded Shopfronts
-  preference :enable_embedded_shopfronts, :boolean, default: false
-  preference :embedded_shopfronts_whitelist, :text, default: nil
-
-  # Legal Preferences
-  preference :footer_tos_url, :string, default: "/Terms-of-service.pdf"
-  preference :enterprises_require_tos, :boolean, default: false
-  preference :privacy_policy_url, :string, default: nil
-  preference :cookies_consent_banner_toggle, :boolean, default: false
-  preference :cookies_policy_matomo_section, :boolean, default: false
-
-  # Tax Preferences
-  preference :products_require_tax_category, :boolean, default: false
-  preference :shipping_tax_rate, :decimal, default: 0
-
-  # Monitoring
-  preference :last_job_queue_heartbeat_at, :string, default: nil
-
-  # External services
-  preference :bugherd_api_key, :string, default: nil
-  preference :matomo_url, :string, default: nil
-  preference :matomo_site_id, :string, default: nil
-  preference :matomo_tag_manager_url, :string, default: nil
-
-  # Invoices & Receipts
-  preference :enable_invoices?, :boolean, default: true
-  preference :invoice_style2?, :boolean, default: false
-  preference :enable_receipt_printing?, :boolean, default: false
-
-  # Stripe Connect
-  preference :stripe_connect_enabled, :boolean, default: false
-
-  # Number localization
-  preference :enable_localized_number?, :boolean, default: false
-
-  # Enable cache
-  preference :enable_products_cache?, :boolean, default: (Rails.env.production? || Rails.env.staging?)
-end
diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb
index 99d57826fb..4b7533c2d8 100644
--- a/app/models/spree/gateway.rb
+++ b/app/models/spree/gateway.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'concerns/payment_method_distributors'
+require 'spree/core/delegate_belongs_to'
+
 module Spree
   class Gateway < PaymentMethod
     include PaymentMethodDistributors
diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb
index 3ece2769aa..c42d147ca0 100644
--- a/app/models/spree/image.rb
+++ b/app/models/spree/image.rb
@@ -5,13 +5,19 @@ module Spree
     validates_attachment_presence :attachment
     validate :no_attachment_errors
 
+    # This is where the styles are used in the app:
+    # - mini: used in the BackOffice: Bulk Product Edit page and Order Cycle edit page
+    # - small: used in the FrontOffice: Product List page
+    # - product: used in the BackOffice: Product Image upload modal in the Bulk Product Edit page
+    #                                      and Product image edit page
+    # - large: used in the FrontOffice: product modal
     has_attached_file :attachment,
-                      styles: { mini: '48x48>', small: '100x100>',
-                                product: '240x240>', large: '600x600>' },
+                      styles: { mini: "48x48#", small: "227x227#",
+                                product: "240x240>", large: "600x600>" },
                       default_style: :product,
                       url: '/spree/products/:id/:style/:basename.:extension',
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      convert_options: { all: '-strip -auto-orient -colorspace RGB' }
+                      convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
@@ -20,15 +26,6 @@ module Spree
     include Spree::Core::S3Support
     supports_s3 :attachment
 
-    Spree::Image.attachment_definitions[:attachment][:styles] =
-      ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
-    Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
-    Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
-    Spree::Image.attachment_definitions[:attachment][:default_url] =
-      Spree::Config[:attachment_default_url]
-    Spree::Image.attachment_definitions[:attachment][:default_style] =
-      Spree::Config[:attachment_default_style]
-
     # used by admin products autocomplete
     def mini_url
       attachment.url(:mini, false)
@@ -51,26 +48,26 @@ module Spree
       false
     end
 
-    # Spree stores attachent definitions in JSON. This converts the style name and format to
-    # strings. However, when paperclip encounters these, it doesn't recognise the format.
-    # Here we solve that problem by converting format and style name to symbols.
-    # See also: ImageSettingsController decorator.
-    #
-    # eg. {'mini' => ['48x48>', 'png']} is converted to {mini: ['48x48>', :png]}
-    def self.format_styles(styles)
-      styles_a = styles.map do |name, style|
-        style[1] = style[1].to_sym if style.is_a? Array
-        [name.to_sym, style]
+    def self.set_attachment_attributes(attribute_name, attribute_value)
+      attachment_definitions[:attachment][attribute_name] = attribute_value
+    end
+
+    def self.set_s3_attachment_definitions
+      if Spree::Config[:use_s3]
+        set_attachment_attributes(:storage, :s3)
+        set_attachment_attributes(:s3_credentials, s3_credentials)
+        set_attachment_attributes(:s3_headers,
+                                  ActiveSupport::JSON.decode(Spree::Config[:s3_headers]))
+        set_attachment_attributes(:bucket, Spree::Config[:s3_bucket])
+      else
+        attachment_definitions[:attachment].delete :storage
       end
-
-      Hash[styles_a]
     end
 
-    def self.reformat_styles
-      Spree::Image.attachment_definitions[:attachment][:styles] =
-        format_styles(Spree::Image.attachment_definitions[:attachment][:styles])
+    def self.s3_credentials
+      { access_key_id: Spree::Config[:s3_access_key],
+        secret_access_key: Spree::Config[:s3_secret],
+        bucket: Spree::Config[:s3_bucket] }
     end
-
-    reformat_styles
   end
 end
diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 00dfb64d4f..c2a0a98582 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -6,11 +6,6 @@ require 'open_food_network/feature_toggle'
 require 'open_food_network/tag_rule_applicator'
 require 'concerns/order_shipment'
 
-ActiveSupport::Notifications
-  .subscribe('spree.order.contents_changed') do |_name, _start, _finish, _id, payload|
-  payload[:order].reload.update_distribution_charge!
-end
-
 module Spree
   class Order < ActiveRecord::Base
     prepend OrderShipment
diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index 9c41fbefa2..a521122d67 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'concerns/payment_method_distributors'
+require 'spree/core/calculated_adjustments'
+
 module Spree
   class PaymentMethod < ActiveRecord::Base
     include Spree::Core::CalculatedAdjustments
@@ -99,7 +102,7 @@ module Spree
         self.class.include Spree::Core::CalculatedAdjustments
       end
 
-      self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
+      self.calculator ||= ::Calculator::FlatRate.new(preferred_amount: 0)
     end
 
     def has_distributor?(distributor)
diff --git a/app/models/spree/preference.rb b/app/models/spree/preference.rb
new file mode 100644
index 0000000000..b877f460ce
--- /dev/null
+++ b/app/models/spree/preference.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Spree
+  class Preference < ActiveRecord::Base
+    serialize :value
+
+    validates :key, presence: true
+    validates :value_type, presence: true
+
+    scope :valid, -> {
+      where(Spree::Preference.arel_table[:key].not_eq(nil)).
+        where(Spree::Preference.arel_table[:value_type].not_eq(nil))
+    }
+
+    # The type conversions here should match
+    # the ones in spree::preferences::preferrable#convert_preference_value
+    def value
+      if self[:value_type].present?
+        case self[:value_type].to_sym
+        when :string, :text
+          self[:value].to_s
+        when :password
+          self[:value].to_s
+        when :decimal
+          BigDecimal(self[:value].to_s).round(2, BigDecimal::ROUND_HALF_UP)
+        when :integer
+          self[:value].to_i
+        when :boolean
+          !(self[:value].to_s =~ /^[t|1]/i).nil?
+        else
+          self[:value].is_a?(String) ? YAML.safe_load(self[:value]) : self[:value]
+        end
+      else
+        self[:value]
+      end
+    end
+
+    def raw_value
+      self[:value]
+    end
+  end
+end
diff --git a/app/models/spree/preferences/configuration.rb b/app/models/spree/preferences/configuration.rb
new file mode 100644
index 0000000000..d1a514484d
--- /dev/null
+++ b/app/models/spree/preferences/configuration.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# This takes the preferrable methods and adds some
+# syntatic sugar to access the preferences
+#
+# class App < Configuration
+#   preference :color, :string
+# end
+#
+# a = App.new
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
+#
+module Spree
+  module Preferences
+    class Configuration
+      include Spree::Preferences::Preferable
+
+      def configure
+        yield(self) if block_given?
+      end
+
+      def preference_cache_key(name)
+        [ENV['RAILS_CACHE_ID'], self.class.name, name].flatten.join('::').underscore
+      end
+
+      def reset
+        preferences.each do |name, _value|
+          set_preference name, preference_default(name)
+        end
+      end
+
+      alias :[] :get_preference
+      alias :[]= :set_preference
+
+      alias :get :get_preference
+
+      def set(*args)
+        options = args.extract_options!
+        options.each do |name, value|
+          set_preference name, value
+        end
+
+        return unless args.size == 2
+
+        set_preference args[0], args[1]
+      end
+
+      def method_missing(method, *args)
+        name = method.to_s.gsub('=', '')
+        if has_preference? name
+          if method.to_s =~ /=$/
+            set_preference(name, args.first)
+          else
+            get_preference name
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/spree/preferences/preferable.rb b/app/models/spree/preferences/preferable.rb
new file mode 100644
index 0000000000..76f4e6aad7
--- /dev/null
+++ b/app/models/spree/preferences/preferable.rb
@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+# The preference_cache_key is used to determine if the preference
+# can be set. The default behavior is to return nil if there is no
+# id value. On ActiveRecords, new objects will have their preferences
+# saved to a pending hash until it is persisted.
+#
+# class_attributes are inheritied unless you reassign them in
+# the subclass, so when you inherit a Preferable class, the
+# inherited hook will assign a new hash for the subclass definitions
+# and copy all the definitions allowing the subclass to add
+# additional defintions without affecting the base
+module Spree
+  module Preferences
+    module Preferable
+      def self.included(base)
+        base.class_eval do
+          extend Spree::Preferences::PreferableClassMethods
+
+          if respond_to?(:after_create)
+            after_create do |obj|
+              obj.save_pending_preferences
+            end
+          end
+
+          if respond_to?(:after_destroy)
+            after_destroy do |obj|
+              obj.clear_preferences
+            end
+          end
+        end
+      end
+
+      def get_preference(name)
+        has_preference! name
+        __send__ self.class.preference_getter_method(name)
+      end
+      alias :preferred :get_preference
+      alias :prefers? :get_preference
+
+      def set_preference(name, value)
+        has_preference! name
+        __send__ self.class.preference_setter_method(name), value
+      end
+
+      def preference_type(name)
+        has_preference! name
+        __send__ self.class.preference_type_getter_method(name)
+      end
+
+      def preference_default(name)
+        has_preference! name
+        __send__ self.class.preference_default_getter_method(name)
+      end
+
+      def preference_description(name)
+        has_preference! name
+        __send__ self.class.preference_description_getter_method(name)
+      end
+
+      def has_preference!(name)
+        raise NoMethodError, "#{name} preference not defined" unless has_preference? name
+      end
+
+      def has_preference?(name)
+        respond_to? self.class.preference_getter_method(name)
+      end
+
+      def preferences
+        prefs = {}
+        methods.grep(/^prefers_.*\?$/).each do |pref_method|
+          prefs[pref_method.to_s.gsub(/prefers_|\?/, '').to_sym] = __send__(pref_method)
+        end
+        prefs
+      end
+
+      def preference_cache_key(name)
+        return unless id
+
+        [ENV["RAILS_CACHE_ID"], self.class.name, name, id].join('::').underscore
+      end
+
+      def save_pending_preferences
+        return unless @pending_preferences
+
+        @pending_preferences.each do |name, value|
+          set_preference(name, value)
+        end
+      end
+
+      def clear_preferences
+        preferences.keys.each { |pref| preference_store.delete preference_cache_key(pref) }
+      end
+
+      private
+
+      def add_pending_preference(name, value)
+        @pending_preferences ||= {}
+        @pending_preferences[name] = value
+      end
+
+      def get_pending_preference(name)
+        return unless @pending_preferences
+
+        @pending_preferences[name]
+      end
+
+      def convert_preference_value(value, type)
+        case type
+        when :string, :text
+          value.to_s
+        when :password
+          value.to_s
+        when :decimal
+          BigDecimal(value.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+        when :integer
+          value.to_i
+        when :boolean
+          if value.is_a?(FalseClass) ||
+             value.nil? ||
+             value == 0 ||
+             value =~ /^(f|false|0)$/i ||
+             (value.respond_to?(:empty?) && value.empty?)
+            false
+          else
+            true
+          end
+        else
+          value
+        end
+      end
+
+      def preference_store
+        Spree::Preferences::Store.instance
+      end
+    end
+  end
+end
diff --git a/app/models/spree/preferences/preferable_class_methods.rb b/app/models/spree/preferences/preferable_class_methods.rb
new file mode 100644
index 0000000000..dd9369d3a0
--- /dev/null
+++ b/app/models/spree/preferences/preferable_class_methods.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+module Spree
+  module Preferences
+    module PreferableClassMethods
+      def preference(name, type, *args)
+        options = args.extract_options!
+        options.assert_valid_keys(:default, :description)
+        default = options[:default]
+        description = options[:description] || name
+
+        # cache_key will be nil for new objects, then if we check if there
+        # is a pending preference before going to default
+        define_method preference_getter_method(name) do
+          # perference_cache_key will only be nil/false for new records
+          #
+          if preference_cache_key(name)
+            preference_store.get(preference_cache_key(name), default)
+          else
+            get_pending_preference(name) || default
+          end
+        end
+        alias_method prefers_getter_method(name), preference_getter_method(name)
+
+        define_method preference_setter_method(name) do |value|
+          value = convert_preference_value(value, type)
+          if preference_cache_key(name)
+            preference_store.set preference_cache_key(name), value, type
+          else
+            add_pending_preference(name, value)
+          end
+        end
+        alias_method prefers_setter_method(name), preference_setter_method(name)
+
+        define_method preference_default_getter_method(name) do
+          default
+        end
+
+        define_method preference_type_getter_method(name) do
+          type
+        end
+
+        define_method preference_description_getter_method(name) do
+          description
+        end
+      end
+
+      def remove_preference(name)
+        if method_defined? preference_getter_method(name)
+          remove_method preference_getter_method(name)
+        end
+        if method_defined? preference_setter_method(name)
+          remove_method preference_setter_method(name)
+        end
+        if method_defined? prefers_getter_method(name)
+          remove_method prefers_getter_method(name)
+        end
+        if method_defined? prefers_setter_method(name)
+          remove_method prefers_setter_method(name)
+        end
+        if method_defined? preference_default_getter_method(name)
+          remove_method preference_default_getter_method(name)
+        end
+        if method_defined? preference_type_getter_method(name)
+          remove_method preference_type_getter_method(name)
+        end
+        if method_defined? preference_description_getter_method(name)
+          remove_method preference_description_getter_method(name)
+        end
+      end
+
+      def preference_getter_method(name)
+        "preferred_#{name}".to_sym
+      end
+
+      def preference_setter_method(name)
+        "preferred_#{name}=".to_sym
+      end
+
+      def prefers_getter_method(name)
+        "prefers_#{name}?".to_sym
+      end
+
+      def prefers_setter_method(name)
+        "prefers_#{name}=".to_sym
+      end
+
+      def preference_default_getter_method(name)
+        "preferred_#{name}_default".to_sym
+      end
+
+      def preference_type_getter_method(name)
+        "preferred_#{name}_type".to_sym
+      end
+
+      def preference_description_getter_method(name)
+        "preferred_#{name}_description".to_sym
+      end
+    end
+  end
+end
diff --git a/app/models/spree/preferences/store.rb b/app/models/spree/preferences/store.rb
new file mode 100644
index 0000000000..cb30d31eaa
--- /dev/null
+++ b/app/models/spree/preferences/store.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+# Use singleton class Spree::Preferences::Store.instance to access
+#
+# StoreInstance has a persistence flag that is on by default,
+# but we disable database persistence in testing to speed up tests
+#
+
+require 'singleton'
+
+module Spree
+  module Preferences
+    class StoreInstance
+      attr_accessor :persistence
+
+      def initialize
+        @cache = Rails.cache
+        @persistence = true
+      end
+
+      def set(key, value, type)
+        @cache.write(key, value)
+        persist(key, value, type)
+      end
+
+      def exist?(key)
+        @cache.exist?(key) ||
+          should_persist? && Spree::Preference.where(key: key).exists?
+      end
+
+      def get(key, fallback = nil)
+        # return the retrieved value, if it's in the cache
+        # use unless nil? incase the value is actually boolean false
+        #
+        unless (val = @cache.read(key)).nil?
+          return val
+        end
+
+        if should_persist?
+          # If it's not in the cache, maybe it's in the database, but
+          # has been cleared from the cache
+
+          # does it exist in the database?
+          if Spree::Preference.table_exists? && preference = Spree::Preference.find_by(key: key)
+            # it does exist, so let's put it back into the cache
+            @cache.write(preference.key, preference.value)
+
+            # and return the value
+            return preference.value
+          end
+        end
+
+        unless fallback.nil?
+          # cache fallback so we won't hit the db above on
+          # subsequent queries for the same key
+          #
+          @cache.write(key, fallback)
+        end
+
+        fallback
+      end
+
+      def delete(key)
+        @cache.delete(key)
+        destroy(key)
+      end
+
+      def clear_cache
+        @cache.clear
+      end
+
+      private
+
+      def persist(cache_key, value, type)
+        return unless should_persist?
+
+        preference = Spree::Preference.where(key: cache_key).first_or_initialize
+        preference.value = value
+        preference.value_type = type
+        preference.save
+      end
+
+      def destroy(cache_key)
+        return unless should_persist?
+
+        preference = Spree::Preference.find_by(key: cache_key)
+        preference&.destroy
+      end
+
+      def should_persist?
+        @persistence && Spree::Preference.connected? && Spree::Preference.table_exists?
+      end
+    end
+
+    class Store < StoreInstance
+      include Singleton
+    end
+  end
+end
diff --git a/app/serializers/api/product_serializer.rb b/app/serializers/api/product_serializer.rb
index 733904c5b6..9223a797d8 100644
--- a/app/serializers/api/product_serializer.rb
+++ b/app/serializers/api/product_serializer.rb
@@ -18,7 +18,7 @@ class Api::ProductSerializer < ActiveModel::Serializer
 
   # return an unformatted descripton
   def description
-    strip_tags object.description
+    strip_tags object.description&.strip
   end
 
   # return a sanitized html description
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index ffbc7bdf25..9506cd4bcd 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -4,26 +4,39 @@
     = render partial: "shop/products/searchbar"
 
     .row
-      .small-12.columns
-        .footer-pad.small-12.columns.no-gutter
-          .row
-            .medium-12.large-10.columns
-              = render partial: "shop/products/search_feedback"
+      .footer-pad.small-12.columns.product-listing
+        .row.full
+          .medium-12.large-9.columns.full
+            = render partial: "shop/products/search_feedback"
 
-              %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading' }
-                %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
-                  = render "shop/products/summary"
+            %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading' }
+              %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
+                = render "shop/products/summary"
+                .shop-variants
                   %shop-variant{variant: 'variant', "ng-repeat" => "variant in product.variants | orderBy: ['name_to_display','unit_value'] track by variant.id", "id" => "variant-{{ variant.id }}", "ng-class" => "{'out-of-stock': !variant.on_demand && variant.on_hand == 0}"}
 
-                %product{"ng-show" => "Products.loading"}
-                  .row.summary
-                    .small-12.columns.text-center
-                      = t :products_loading
-                  .row
-                    .small-12.columns.text-center
-                      %img.spinner{ src: image_path("spinning-circles.svg") }
+              %product{"ng-show" => "Products.loading"}
+                .summary
+                  .small-12.columns.text-center
+                    = t :products_loading
+                .row.full
+                  .small-12.columns.text-center
+                    %img.spinner{ src: image_path("spinning-circles.svg") }
 
-            .hide-for-medium-down.large-2.columns
+          .hide-for-medium-down.large-1.columns
+            -# Space between products and filters
+            &nbsp;
+          .hide-for-medium-down.large-2.columns
+            %h5.filter-header
+              = t(:products_filter_by)
+              %span{ng: {show: 'filtersCount()' }}
+                = "({{ filtersCount() }} #{t(:products_filter_selected)})"
+
+            = render partial: "shop/products/filters"
+
+          .expanding-sidebar.shop-filters-sidebar.hide-for-large-up{ng: {show: 'showFilterSidebar', class: "{'shown': showFilterSidebar}"}}
+            .background{ng: {click: 'toggleFilterSidebar()'}}
+            .sidebar
               %h5
                 = t(:products_filter_by)
                 %span{ng: {show: 'filtersCount()' }}
@@ -31,18 +44,8 @@
 
               = render partial: "shop/products/filters"
 
-            .expanding-sidebar.shop-filters-sidebar.hide-for-large-up{ng: {show: 'showFilterSidebar', class: "{'shown': showFilterSidebar}"}}
-              .background{ng: {click: 'toggleFilterSidebar()'}}
-              .sidebar
-                %h5
-                  = t(:products_filter_by)
-                  %span{ng: {show: 'filtersCount()' }}
-                    = "({{ filtersCount() }} #{t(:products_filter_selected)})"
-
-                = render partial: "shop/products/filters"
-
-                .sidebar-footer
-                  %button.large.dark.left{type: 'button', ng: {click: 'clearFilters()'}}
-                    = t(:products_filter_clear)
-                  %button.large.bright.right{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
-                    = t(:products_filter_done)
+              .sidebar-footer
+                %button.large.dark.left{type: 'button', ng: {click: 'clearFilters()'}}
+                  = t(:products_filter_clear)
+                %button.large.bright.right{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
+                  = t(:products_filter_done)
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 3c12a68db8..c87d26ff46 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,20 +1,20 @@
 .product-thumb
   %a{"ng-click" => "triggerProductModal()"}
-    %i.ofn-i_057-expand
-    %img{"ng-src" => "{{::product.primaryImageOrMissing}}", "ng-click" => "triggerProductModal()"}
+    %span.product-thumb__bulk-label{"ng-if" => "::product.group_buy"}
+      = t(".bulk")
+    %img{"ng-src" => "{{::product.primaryImageOrMissing}}"}
 
-.row.summary
-  .small-10.medium-10.large-11.columns.summary-header
+.summary
+  .summary-header
     %h3
       %a{"ng-click" => "triggerProductModal()", href: 'javascript:void(0)'}
         %span{"ng-bind" => "::product.name"}
-        %i.ofn-i_057-expand
-    %small
-      %em
-        = t :products_from
+    %p.product-description{ng: {bind: "::product.description", click: "triggerProductModal()", show: "product.description.length"}}
+    .product-producer
+      = t :products_from
       %span
         %enterprise-modal
-          %i.ofn-i_036-producers
           %span{"ng-bind" => "::enterprise.name"}
-  .small-2.medium-2.large-1.columns.text-center
-    .taxon-flag
+
+    .product-properties.filter-shopfront.property-selectors
+      %filter-selector{ 'selector-set' => "productPropertySelectors", objects: "[product] | propertiesWithValuesOf" }
diff --git a/app/views/spree/admin/image_settings/edit.html.haml b/app/views/spree/admin/image_settings/edit.html.haml
deleted file mode 100644
index 4345755792..0000000000
--- a/app/views/spree/admin/image_settings/edit.html.haml
+++ /dev/null
@@ -1,81 +0,0 @@
-= render :partial => 'spree/admin/shared/configuration_menu'
-
-- content_for :page_title do
-  = Spree.t(:image_settings)
-
-= form_tag admin_image_settings_path, :method => :put do
-  - destroy = Spree.t(:destroy)
-
-  %fieldset.no-border-top
-    %fieldset.no-border-bottom
-      %legend{:align => "center"}= Spree.t(:general_settings)
-      .field
-        .warning.note= Spree.t(:image_settings_warning)
-
-      .field{"data-hook" => "attachment_path"}
-        = label_tag 'preferences[attachment_path]', Spree.t(:attachment_path)
-        = preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string
-      .alpha.eight.columns
-        .field{"data-hook" => "attachment_default_url"}
-          = label_tag 'preferences[attachment_default_url]', Spree.t(:attachment_default_url)
-          = preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string
-      .alpha.eight.columns
-        .field{"data-hook" => "attachment_url"}
-          = label_tag 'preferences[attachment_url]', Spree.t(:attachment_url)
-          = preference_field_tag 'preferences[attachment_url]', Spree::Config[:attachment_url], :type => :string
-      .omega.four.columns
-        .field{"data-hook" => "attachment_default_style"}
-          = label_tag 'preferences[attachment_default_style]', Spree.t(:attachment_default_style)
-          = collection_select 'preferences', 'attachment_default_style', @styles, :first, :first, {:selected => Spree::Config[:attachment_default_style] }, :class => 'select2 fullwidth'
-      .clear
-      .field{"data-hook" => "use_s3"}
-        = preference_field_tag 'preferences[use_s3]', Spree::Config[:use_s3], :type => :boolean
-        = label_tag 'preferences[use_s3]', Spree.t(:use_s3)
-
-    %fieldset#attachment_styles.no-border-bottom{"data-hook" => "attachment_styles"}
-      %legend{:align => "center"}= Spree.t(:attachment_styles)
-      #styles_list.row.frameless
-        - @styles.each_with_index do |(style_name, style_value), index|
-          .field.three.columns
-            = label_tag "attachment_styles[#{style_name}]", style_name
-            %a.destroy_style{:alt => t(:destroy), :href => "#", :title => t(:destroy)}
-              %i.icon-trash
-            = text_field_tag "attachment_styles[#{style_name}][]", admin_image_settings_geometry_from_style(style_value), :class => 'fullwidth'
-            %br/
-            - current_format = admin_image_settings_format_from_style(style_value) || ''
-            = select_tag "attachment_styles[#{style_name}][]", options_for_select(admin_image_settings_format_options, current_format), :class => 'fullwidth', :id => "attachment_styles_format_#{style_name}"
-      #new-styles.row.frameless
-      .field
-        = link_to_with_icon 'icon-plus', Spree.t(:add_new_style), '#', :class => 'add_new_style button'
-
-    .row
-      #s3_settings.alpha.six.columns{"data-hook" => "s3_settings", :style => "display: none"}
-        %fieldset.no-border-bottom
-          %legend{:align => "center"}= Spree.t(:configure_s3)
-          .field{"data-hook" => "s3_access_key"}
-            = label_tag 'preferences[s3_access_key]', Spree.t(:s3_access_key)
-            = preference_field_tag 'preferences[s3_access_key]', Spree::Config[:s3_access_key], :type => :string
-          .field{"data-hook" => "s3_secret"}
-            = label_tag 'preferences[s3_secret]', Spree.t(:s3_secret)
-            = preference_field_tag 'preferences[s3_secret]', Spree::Config[:s3_secret], :type => :string
-          .field{"data-hook" => "s3_bucket"}
-            = label_tag 'preferences[s3_bucket]', Spree.t(:s3_bucket)
-            = preference_field_tag 'preferences[s3_bucket]', Spree::Config[:s3_bucket], :type => :string
-          .field{"data-hook" => "s3_protocol"}
-            = label_tag 'preferences[s3_protocol]', Spree.t(:s3_protocol)
-            = preference_field_tag 'preferences[s3_protocol]', Spree::Config[:s3_protocol], :type => :string
-
-      #s3_headers.omega.six.columns{"data-hook" => "s3_headers", :style => "display: none"}
-        %fieldset.no-border-bottom
-          %legend{:align => "center"}= Spree.t(:s3_headers)
-          #headers_list
-            - @headers.each do |header_name, header_value|
-              .field
-                = label_tag "s3_headers[#{header_name}]", header_name
-                %a.destroy_header.with-tip{:alt => destroy, :href => "#", :title => destroy}
-                  %i.icon-trash
-                = text_field_tag "s3_headers[#{header_name}]", header_value, :class => 'fullwidth'
-          = link_to_with_icon 'icon-plus', Spree.t(:add_new_header), '#', :class => 'add_header button'
-
-    .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
-      = button Spree.t('actions.update'), 'icon-refresh'
diff --git a/app/views/spree/admin/orders/customer_details/_address_form.html.haml b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
index 18bd0970b6..da8d943c18 100644
--- a/app/views/spree/admin/orders/customer_details/_address_form.html.haml
+++ b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
@@ -16,10 +16,6 @@
   %div{class: "field"}
     = f.label :lastname, Spree.t(:last_name) + ':'
     = f.text_field :lastname, class: 'fullwidth'
-  - if Spree::Config[:company]
-    %div{class: "field"}
-      = f.label :company, Spree.t(:company) + ':'
-      = f.text_field :company, class: 'fullwidth'
   %div{class: "field"}
     = f.label :address1, Spree.t(:street_address) + ':'
     = f.text_field :address1, class: 'fullwidth'
diff --git a/app/views/spree/admin/shared/_configuration_menu.html.haml b/app/views/spree/admin/shared/_configuration_menu.html.haml
index c5f302f0db..3e5790beb5 100644
--- a/app/views/spree/admin/shared/_configuration_menu.html.haml
+++ b/app/views/spree/admin/shared/_configuration_menu.html.haml
@@ -7,7 +7,6 @@
       = configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path
       - if Spree::Config[:override_actionmailer_config]
         = configurations_sidebar_menu_item Spree.t(:mail_method_settings), edit_admin_mail_methods_path
-      = configurations_sidebar_menu_item Spree.t(:image_settings), edit_admin_image_settings_path
       = configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path
       = configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path
       = configurations_sidebar_menu_item Spree.t(:tax_settings), edit_admin_tax_settings_path
diff --git a/app/views/spree/admin/shared/_routes.html.erb b/app/views/spree/admin/shared/_routes.html.erb
index 15d562e4ef..438d257af9 100644
--- a/app/views/spree/admin/shared/_routes.html.erb
+++ b/app/views/spree/admin/shared/_routes.html.erb
@@ -1,4 +1,10 @@
 <script>
+  if (Spree === undefined) {
+    var Spree = {}
+  }
+  if (Spree.routes == undefined) {
+    Spree.routes = {}
+  }
   Spree.routes = <%== {
     :variants_search       => spree.admin_search_variants_path(:format => 'json'),
     :taxons_search         => main_app.api_taxons_path(:format => 'json'),
diff --git a/app/views/spree/admin/shared/_tabs.html.haml b/app/views/spree/admin/shared/_tabs.html.haml
index e0134ee272..eb653c2500 100644
--- a/app/views/spree/admin/shared/_tabs.html.haml
+++ b/app/views/spree/admin/shared/_tabs.html.haml
@@ -3,7 +3,7 @@
 = tab :order_cycles, url: main_app.admin_order_cycles_path, icon: 'icon-refresh'
 = tab :orders, :subscriptions, :customer_details, :adjustments, :payments, :return_authorizations, url: admin_orders_path('q[s]' => 'completed_at desc'), icon: 'icon-shopping-cart'
 = tab :reports, icon: 'icon-file'
-= tab :general_settings, :mail_methods, :image_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :enterprise_fees, :contents, :invoice_settings, :matomo_settings, :stripe_connect_settings, label: 'configuration', icon: 'icon-wrench', url: edit_admin_general_settings_path
+= tab :general_settings, :mail_methods, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :taxonomies, :shipping_methods, :shipping_categories, :enterprise_fees, :contents, :invoice_settings, :matomo_settings, :stripe_connect_settings, label: 'configuration', icon: 'icon-wrench', url: edit_admin_general_settings_path
 = tab :enterprises, :enterprise_relationships, url: main_app.admin_enterprises_path
 = tab :customers, url: main_app.admin_customers_path
 = tab :enterprise_groups, url: main_app.admin_enterprise_groups_path, label: 'groups'
diff --git a/app/views/spree/admin/shared/_translations.html.erb b/app/views/spree/admin/shared/_translations.html.erb
index 3637cdea27..f72a09bd8a 100644
--- a/app/views/spree/admin/shared/_translations.html.erb
+++ b/app/views/spree/admin/shared/_translations.html.erb
@@ -20,17 +20,11 @@
     :datetime_ui_time_text    => I18n.t('datetime_picker_ui.time_text'),
     :name                     => Spree.t(:name),
     :next                     => Spree.t(:next),
-    :no_results               => Spree.t(:no_results),
-    :option_type_placeholder  => Spree.t(:option_type_placeholder),
     :paste                    => Spree.t(:paste),
     :previous                 => Spree.t(:previous),
     :remove                   => Spree.t(:remove),
     :rename                   => Spree.t(:rename),
-    :searching                => Spree.t(:searching),
     :sku                      => Spree.t(:sku),
-    :type_to_search           => Spree.t(:type_to_search),
-    :taxon_placeholder        => Spree.t(:taxon_placeholder),
-    :variant_placeholder      => Spree.t(:variant_placeholder),
     :value                    => Spree.t(:value)
   }.to_json
 %>
diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml
index e93d15c542..1f3dcce205 100644
--- a/app/views/spree/layouts/_admin_body.html.haml
+++ b/app/views/spree/layouts/_admin_body.html.haml
@@ -67,3 +67,5 @@
 
 %script
   = raw "Spree.api_key = \"#{spree_current_user.try(:spree_api_key).to_s}\";"
+
+= render "layouts/matomo_tag"
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 9280befea3..46ef78138f 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -7,7 +7,6 @@
 # config.setting_name = 'new value'
 
 require "spree/core/environment"
-require 'spree/product_filters'
 
 # Due to a bug in ActiveRecord we need to load the tagging code in Gateway which
 # should have inherited it from its parent PaymentMethod.
@@ -33,9 +32,15 @@ Spree.config do |config|
   config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY']
   config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET']
   config.use_s3 = true if ENV['S3_BUCKET']
+  config.s3_headers = ENV['S3_HEADERS'] if ENV['S3_HEADERS']
   config.s3_protocol = ENV.fetch('S3_PROTOCOL', 'https')
 end
 
+# Attachments settings
+Spree::Image.set_attachment_attributes(:path, ENV['ATTACHMENT_PATH']) if ENV['ATTACHMENT_PATH']
+Spree::Image.set_attachment_attributes(:url, ENV['ATTACHMENT_URL']) if ENV['ATTACHMENT_URL']
+Spree::Image.set_s3_attachment_definitions
+
 # Spree 2.0 recommends explicitly setting this here when using spree_auth_devise
 Spree.user_class = 'Spree::User'
 
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f5885b6d48..c77d78bb66 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -23,6 +23,10 @@ ar:
         variant_unit_name: "اسم وحدة النوع"
       spree/credit_card:
         base: "بطاقة ائتمان"
+        number: "رقم "
+        month: "شهر"
+        verification_value: "قيمة التحقق"
+        year: "عام"
       order_cycle:
         orders_close_at: تاريخ الاغلاق
       variant_override:
@@ -1212,6 +1216,9 @@ ar:
         require_customer_html: "إذا كنت ترغب في بدء التسوق هنا ، فيرجى %{contact} %{enterprise} أن تسأل عن الانضمام."
       select_oc:
         select_oc_html: "يرجى <span class='highlighted'>اختيار الوقت الذي تريده لطلبك</span> ، لمعرفة المنتجات المتوفرة."
+    products:
+      summary:
+        bulk: "جملة"
   card_could_not_be_updated: لا يمكن تحديث البطاقة
   card_could_not_be_saved: لا يمكن حفظ البطاقة
   spree_gateway_error_flash_for_checkout: "حدثت مشكلة في معلومات الدفع الخاصة بك: %{error}"
@@ -1606,8 +1613,8 @@ ar:
   components_filters_nofilters: "لا يوجد مرشحات"
   components_filters_clearfilters: "مسح جميع المرشحات"
   groups_title: مجموعات
-  groups_headline: المجموعات / المناطق
-  groups_text: "كل منتج فريد من نوعه. كل الأعمال لديها شيء مختلف للعرض. مجموعاتنا هي مجموعات من المنتجين والمحاور والموزعين الذين يشتركون في شيء مثل الموقع أو سوق المزارعين أو الفلسفة. هذا يجعل تجربة التسوق أسهل. لذلك استكشف مجموعاتنا وقمنا بتنظيمها لك."
+  groups_headline: المجموعات
+  groups_text: "كل منتج فريد من نوعه. كل الأعمال لديها شيء مختلف للعرض. مجموعاتنا هي مجموعات من المنتجين ومراكز البيع والموزعين الذين يشتركون في خصلة مثل الموقع أو سوق المزارعين أو الفلسفة. هذا يجعل تجربة التسوق أسهل. لذلك استكشف مجموعاتنا التي قمنا بتنظيمها لك."
   groups_search: "البحث عن اسم أو كلمة أساسية"
   groups_no_groups: "لم يتم العثور على مجموعات"
   groups_about: "معلومات عنا"
@@ -1927,7 +1934,6 @@ ar:
   shop_for_products_html: "متجر لمنتجات <span class=\"turquoise\">%{enterprise}</span> على:"
   change_shop: "تغيير المتجر إلى:"
   shop_at: "تسوق الآن عبر:"
-  price_breakdown: "تفاصيل السعر الكامل"
   admin_fee: "رسوم الاشراف"
   sales_fee: "رسوم المبيعات"
   packing_fee: "رسوم التعبئة"
@@ -2002,6 +2008,7 @@ ar:
   calculator: "آلة حاسبة"
   calculator_values: "القيم المحوسبة"
   calculator_settings_warning: "إذا كنت تقوم بتغيير نوع الحاسبة ، فيجب عليك الحفظ أولاً قبل أن تتمكن من تحرير إعدادات الحاسبة"
+  calculator_preferred_unit_error: "يجب أن تكون كجم أو رطل"
   flat_percent_per_item: "نسبة ثابتة (لكل بند)"
   flat_rate_per_item: "سعر ثابت (لكل بند)"
   flat_rate_per_order: "تسعيرة ثابته (لكل طلب)"
@@ -2593,6 +2600,15 @@ ar:
           إليك ما تغير:
       now_out_of_stock: الآن لا يوجد مخزون.
       only_n_remainging: "الآن ليس لديه %{num} متبقية."
+    shopfront:
+      variant:
+        add_to_cart: "إضافة"
+        in_cart: "في السلة"
+        quantity_in_cart: "%{quantity} في السلة"
+      bulk_buy_modal:
+        min_quantity: "اقل كمية "
+        max_quantity: "اعلى كمية"
+      price_breakdown: "تفاصيل السعر"
     variants:
       on_demand:
         'yes': "حسب الطلب"
@@ -2996,15 +3012,6 @@ ar:
     smtp_send_copy_to_this_addresses: "يرسل نسخة من جميع الرسائل الصادرة إلى هذا العنوان. لعناوين متعددة ، افصل بينها بفواصل."
     intercept_email_address: "اعتراض عنوان البريد الإلكتروني"
     intercept_email_instructions: "تجاوز مستلم البريد الإلكتروني واستبداله بهذا العنوان."
-    image_settings: "إعدادات الصورة"
-    image_settings_warning: "ستحتاج إلى تجديد الصور المصغرة إذا قمت بتحديث أنماط مشبك الورق. استخدم rap paperclip: refresh: الصور المصغرة CLASS = Spree :: Image للقيام بذلك."
-    attachment_default_style: نمط المرفقات
-    attachment_default_url: "المرفقات عنوان URL الافتراضي"
-    attachment_path: "مسار المرفقات"
-    attachment_styles: "أنماط الورق"
-    attachment_url: "مرفقات URL"
-    add_new_style: "إضافة نمط جديد"
-    image_settings_updated: "تم تحديث إعدادات الصورة بنجاح."
     tax_categories: "فئات الضرائب"
     listing_tax_categories: "قائمة فئات الضرائب"
     back_to_tax_categories_list: "العودة إلى قائمة فئات الضرائب"
@@ -3078,11 +3085,18 @@ ar:
     inventory_error_flash_for_insufficient_quantity: "المواد في سلة التسوق غير متاح."
     inventory: المخزون
     zipcode: الرمز البريدي
-    weight: الوزن (لكل كجم)
+    weight: الوزن (لكل كجم أو رطل)
     error_user_destroy_with_orders: "لا يمكن حذف المستخدمين الذين لديهم طلبات مكتملة"
     cannot_create_payment_without_payment_methods: "لا يمكنك إنشاء دفعة لطلب بدون تحديد طرقة الدفع."
     please_define_payment_methods: "يرجى تحديد بعض طرق الدفع أولاً."
     options: "خيارات"
+    has_no_shipped_units: "لا يوجد لديه طلبات مشحونة"
+    successfully_created: '%{resource} تم إنشاؤه بنجاح!'
+    successfully_updated: 'تم تحديث %{resource} بنجاح!'
+    payment_processing_failed: "لا يمكن معالجة الدفع ، يرجى التحقق من التفاصيل التي أدخلتها"
+    not_available: "غير متاح"
+    order_populator:
+      out_of_stock: '%{item} غير متوفر.'
     actions:
       update: "تحديث"
     shared:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7db4b034bb..208b4fbd25 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -23,6 +23,10 @@ ca:
         variant_unit_name: "Nom de la unitat de la variant"
       spree/credit_card:
         base: "Targeta de crèdit"
+        number: "Número"
+        month: "Mes"
+        verification_value: "Valor de verificació"
+        year: "Any"
       order_cycle:
         orders_close_at: Data de tancament
       variant_override:
@@ -1216,6 +1220,9 @@ ca:
         require_customer_html: "Si vols començar a comprar aquí, si us plau %{contact} %{enterprise} per unir-t'hi."
       select_oc:
         select_oc_html: "<span class='highlighted'>Trieu quan voleu la vostra comanda</span> per veure quins productes estan disponibles."
+    products:
+      summary:
+        bulk: "A granel"
   card_could_not_be_updated: No s'ha pogut actualitzar la targeta
   card_could_not_be_saved: no s'ha pogut desar la targeta
   spree_gateway_error_flash_for_checkout: "Hi ha hagut un problema amb la vostra informació de pagament: %{error}"
@@ -1923,7 +1930,6 @@ ca:
   shop_for_products_html: "Compra productes de <span class = \"turquesa\"> %{enterprise} </ span> a:"
   change_shop: "Canvia la botiga a:"
   shop_at: "Compra ara a:"
-  price_breakdown: "Desglossament complet del preu"
   admin_fee: "Comissió d'administració"
   sales_fee: "Comissió de venda"
   packing_fee: "Comissió d'embalatge"
@@ -1998,6 +2004,7 @@ ca:
   calculator: "Calculadora"
   calculator_values: "Valors de la calculadora"
   calculator_settings_warning: "Si canvieu el tipus de calculadora, primer heu de desar abans de poder editar la configuració de la calculadora"
+  calculator_preferred_unit_error: "ha de ser kg o lliures"
   flat_percent_per_item: "Percentatge fixe (per article)"
   flat_rate_per_item: "Tarifa fixa (per article)"
   flat_rate_per_order: "Tarifa fixa (per comanda)"
@@ -2599,6 +2606,15 @@ ca:
           més dels productes de la cistella. Aquí podeu veure el que ha canviat:
       now_out_of_stock: ara està fora d'estoc.
       only_n_remainging: "ara només n'hi ha %{num}restants."
+    shopfront:
+      variant:
+        add_to_cart: "Afegeix"
+        in_cart: "a la cistella"
+        quantity_in_cart: "%{quantity} a la cistella"
+      bulk_buy_modal:
+        min_quantity: "Quantitat mínima"
+        max_quantity: "Quantitat màxima"
+      price_breakdown: "Desglossament del preu"
     variants:
       on_demand:
         'yes': "Sota demanda"
@@ -2904,15 +2920,6 @@ ca:
     smtp_send_copy_to_this_addresses: "Envia una còpia de tots els correus sortints a aquesta adreça. Per a diverses adreces, separeu amb comes."
     intercept_email_address: "Intercepta adreça de correu"
     intercept_email_instructions: "Invalida el destinatari de correu electrònic i reemplaça amb aquesta adreça."
-    image_settings: "Configuració de la imatge"
-    image_settings_warning: "Haureu de regenerar thumbnails si actualitzeu els estils de paperclip. Feu servir rake paperclip:refresh:thumbnails CLASS=Spree::Image per fer-ho."
-    attachment_default_style: Estil de fitxers adjunts
-    attachment_default_url: "URL predeterminada de fitxers adjunts"
-    attachment_path: "Ruta de fitxers adjunts"
-    attachment_styles: "Estils de paperclip"
-    attachment_url: "URL dels fitxers adjunts"
-    add_new_style: "Afegeix un estil nou"
-    image_settings_updated: "La configuració de la imatge s'ha actualitzat correctament."
     tax_categories: "Tipus d'impostos"
     listing_tax_categories: "Llista de categories d'impostos"
     back_to_tax_categories_list: "Tornar a la llista de categories d'impostos"
@@ -2986,11 +2993,18 @@ ca:
     inventory_error_flash_for_insufficient_quantity: "Un article de la teva cistella ha deixat d'estar disponible."
     inventory: Inventari
     zipcode: Codi postal
-    weight: Pes (per kg)
+    weight: Pes (per kg o lliures)
     error_user_destroy_with_orders: "No es poden esborrar usuaris amb comandes completades"
     cannot_create_payment_without_payment_methods: "No podeu crear un pagament per a una comanda sense que hi hagi definit cap mètode de pagament."
     please_define_payment_methods: "Primer definiu alguns mètodes de pagament."
     options: "Opcions"
+    has_no_shipped_units: "no té cap unitat enviada"
+    successfully_created: '%{resource} s''ha creat correctament.'
+    successfully_updated: '%{resource} s''ha actualitzat correctament.'
+    payment_processing_failed: "El pagament no s'ha pogut processar, comproveu les dades que heu introduït"
+    not_available: "No disponible"
+    order_populator:
+      out_of_stock: '%{item} està esgotat.'
     actions:
       update: "Actualitzar"
     shared:
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index 92e9da5de9..462b44026e 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -22,6 +22,7 @@ de_DE:
         variant_unit_name: "Name der Varianteneinheit"
       spree/credit_card:
         base: "Kreditkarte"
+        number: "Nummer"
       order_cycle:
         orders_close_at: Schlussdatum
       variant_override:
@@ -1874,7 +1875,6 @@ de_DE:
   shop_for_products_html: "Suche nach <span class=\"turquoise\">%{enterprise}</span> Produkten unter:"
   change_shop: "Laden ändern auf:"
   shop_at: "Kaufe jetzt bei:"
-  price_breakdown: "Vollständige Preisaufschlüsselung"
   admin_fee: "Gebühr Administration"
   sales_fee: "Gebühr Verkauf"
   packing_fee: "Gebühr Umverpackung"
@@ -2537,6 +2537,9 @@ de_DE:
           in Ihrem Warenkorb verringert. Das Folgende hat sich geändert:
       now_out_of_stock: ist jetzt ausverkauft.
       only_n_remainging: "Jetzt hat nur noch %{num} übrig."
+    shopfront:
+      variant:
+        add_to_cart: "Hinzufügen"
     variants:
       on_demand:
         'yes': "Auf Anfrage"
@@ -2827,15 +2830,6 @@ de_DE:
     smtp_send_copy_to_this_addresses: "Sendet eine Kopie aller ausgehenden Mails an diese Adresse. Bei mehreren Adressen trennen Sie diese durch Kommas."
     intercept_email_address: "E-Mail-Adresse abfangen"
     intercept_email_instructions: "Überschreiben Sie den E-Mail-Empfänger und ersetzen Sie ihn mit dieser Adresse."
-    image_settings: "Bildeinstellungen"
-    image_settings_warning: "Sie müssen die Miniaturbilder neu erstellen, wenn Sie die Büroklammerformate aktualisieren. Verwenden Sie dazu die Rake-Büroklammer: Refresh: thumbnails CLASS = Spree :: Image."
-    attachment_default_style: Anhänge-Stil
-    attachment_default_url: "Anhänge Standard-URL"
-    attachment_path: "Pfad der Anhänge"
-    attachment_styles: "Büroklammer-Stile"
-    attachment_url: "Anhänge-URL"
-    add_new_style: "Neuen Stil hinzufügen"
-    image_settings_updated: "Bildeinstellungen erfolgreich aktualisiert."
     tax_categories: "Steuerkategorien"
     listing_tax_categories: "Steuerkategorien auflisten"
     back_to_tax_categories_list: "Zurück zur Liste der Steuerkategorien"
@@ -2909,7 +2903,6 @@ de_DE:
     inventory_error_flash_for_insufficient_quantity: "Ein Artikel in Ihrem Warenkorb ist nicht mehr verfügbar."
     inventory: Katalog
     zipcode: Postleitzahl
-    weight: Gewicht (pro kg)
     error_user_destroy_with_orders: "Benutzer mit abgeschlossenen Bestellungen dürfen nicht gelöscht werden"
     cannot_create_payment_without_payment_methods: "Sie können keine Zahlung für eine Bestellung erstellen, ohne dass Zahlungsmethoden definiert sind."
     please_define_payment_methods: "Bitte definieren Sie zunächst die Zahlungsmethoden."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5979a77a97..206d3d6a7e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -44,6 +44,10 @@ en:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
+        month: "Month"
+        verification_value: "Verification Value"
+        year: "Year"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1282,6 +1286,9 @@ en:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
 
   # Front-end controller translations
   card_could_not_be_updated: Card could not be updated
@@ -2049,7 +2056,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2722,6 +2728,15 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+        in_cart: "in cart"
+        quantity_in_cart: "%{quantity} in cart"
+      bulk_buy_modal:
+        min_quantity: "Min quantity"
+        max_quantity: "Max quantity"
+      price_breakdown: "Price breakdown"
     variants:
       on_demand:
         "yes": "On demand"
@@ -3050,16 +3065,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
 
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
-
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -3152,6 +3157,13 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    has_no_shipped_units: "has no shipped units"
+    successfully_created: ! '%{resource} has been successfully created!'
+    successfully_updated: ! '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: ! '%{item} is out of stock.'
 
     actions:
       update: "Update"
@@ -3571,6 +3583,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         issue_text: |
           If the above URL does not work try copying and pasting it into your browser.
           If you continue to have problems please feel free to contact us.
+        subject: "Reset password instructions"
       confirmation_instructions:
         subject: "Please confirm your OFN account"
     shipment_mailer:
diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml
index 1c66424b82..c1881ed075 100644
--- a/config/locales/en_AU.yml
+++ b/config/locales/en_AU.yml
@@ -22,6 +22,7 @@ en_AU:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1177,6 +1178,9 @@ en_AU:
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop."
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1873,7 +1877,6 @@ en_AU:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2525,6 +2528,11 @@ en_AU:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2746,15 +2754,6 @@ en_AU:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2828,9 +2827,11 @@ en_AU:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml
index 2fc64a5ed2..2d1e7154b2 100644
--- a/config/locales/en_BE.yml
+++ b/config/locales/en_BE.yml
@@ -22,6 +22,7 @@ en_BE:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1138,6 +1139,9 @@ en_BE:
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop."
         require_customer_html: "If you'd like to start shopping here, please %{contact}%{enterprise}to ask about joining."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1833,7 +1837,6 @@ en_BE:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2485,6 +2488,11 @@ en_BE:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2703,15 +2711,6 @@ en_BE:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2778,7 +2777,9 @@ en_BE:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
+    successfully_created: '%{resource} has been successfully created! '
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml
index f8c35792aa..8aef0d9353 100644
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -23,6 +23,10 @@ en_CA:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
+        month: "Month"
+        verification_value: "Verification Value"
+        year: "Year"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1213,6 +1217,9 @@ en_CA:
         require_customer_html: "If you'd like to start shopping here, please %{contact}%{enterprise}  to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose the store you want</span> from the dropdown box above right."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1920,7 +1927,6 @@ en_CA:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -1995,6 +2001,7 @@ en_CA:
   calculator: "Calculator"
   calculator_values: "Calculator values"
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
+  calculator_preferred_unit_error: "must be kg or lb"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2592,6 +2599,15 @@ en_CA:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+        in_cart: "in cart"
+        quantity_in_cart: "%{quantity} in cart"
+      bulk_buy_modal:
+        min_quantity: "Min quantity"
+        max_quantity: "Max quantity"
+      price_breakdown: "Price breakdown"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2899,15 +2915,6 @@ en_CA:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image settings successfully updated"
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back to Tax Categories List"
@@ -2981,11 +2988,18 @@ en_CA:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable"
     inventory: Inventory
     zipcode: Postal Code
-    weight: Weight (per kg)
+    weight: Weight (per kg or lb)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    has_no_shipped_units: "has no shipped units"
+    successfully_created: '%{resource}has been successfully created!'
+    successfully_updated: '%{resource}has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered."
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} is out of stock.'
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml
index 9a4aec6cbf..6ea908c828 100644
--- a/config/locales/en_DE.yml
+++ b/config/locales/en_DE.yml
@@ -22,6 +22,7 @@ en_DE:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1148,6 +1149,9 @@ en_DE:
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop."
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1843,7 +1847,6 @@ en_DE:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2495,6 +2498,11 @@ en_DE:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2716,15 +2724,6 @@ en_DE:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2792,8 +2791,10 @@ en_DE:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml
index adec8aaa58..6a370077c7 100644
--- a/config/locales/en_FR.yml
+++ b/config/locales/en_FR.yml
@@ -23,6 +23,10 @@ en_FR:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
+        month: "Month"
+        verification_value: "Verification Value"
+        year: "Year"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1213,6 +1217,9 @@ en_FR:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose an option</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1920,7 +1927,6 @@ en_FR:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -1995,6 +2001,7 @@ en_FR:
   calculator: "Calculator"
   calculator_values: "Calculator values"
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
+  calculator_preferred_unit_error: "must be kg or lb"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2593,6 +2600,15 @@ en_FR:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+        in_cart: "in cart"
+        quantity_in_cart: "%{quantity} in cart"
+      bulk_buy_modal:
+        min_quantity: "Min quantity"
+        max_quantity: "Max quantity"
+      price_breakdown: "Price breakdown"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2900,15 +2916,6 @@ en_FR:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2982,11 +2989,18 @@ en_FR:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
+    weight: Weight (per kg or lb)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    has_no_shipped_units: "has no shipped units"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} is out of stock.'
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index ac40ac8f46..32a295fd2e 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -23,6 +23,7 @@ en_GB:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1213,6 +1214,9 @@ en_GB:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1920,7 +1924,6 @@ en_GB:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2599,6 +2602,11 @@ en_GB:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "Unlimited"
@@ -2906,15 +2914,6 @@ en_GB:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2988,11 +2987,13 @@ en_GB:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_IE.yml b/config/locales/en_IE.yml
index fc6c64cd3b..4fb8fea4d2 100644
--- a/config/locales/en_IE.yml
+++ b/config/locales/en_IE.yml
@@ -23,6 +23,7 @@ en_IE:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1201,6 +1202,9 @@ en_IE:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1908,7 +1912,6 @@ en_IE:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2584,6 +2587,11 @@ en_IE:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "Unlimited"
@@ -2884,15 +2892,6 @@ en_IE:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2966,11 +2965,13 @@ en_IE:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_IN.yml b/config/locales/en_IN.yml
index 8772792ec6..37711319e1 100644
--- a/config/locales/en_IN.yml
+++ b/config/locales/en_IN.yml
@@ -22,6 +22,7 @@ en_IN:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1197,6 +1198,9 @@ en_IN:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1904,7 +1908,6 @@ en_IN:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2578,6 +2581,11 @@ en_IN:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "Unlimited"
@@ -2878,15 +2886,6 @@ en_IN:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2960,11 +2959,13 @@ en_IN:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml
index 6999b1dcfb..91354b6bec 100644
--- a/config/locales/en_NZ.yml
+++ b/config/locales/en_NZ.yml
@@ -23,6 +23,7 @@ en_NZ:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1213,6 +1214,9 @@ en_NZ:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1920,7 +1924,6 @@ en_NZ:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2593,6 +2596,11 @@ en_NZ:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2900,15 +2908,6 @@ en_NZ:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2982,11 +2981,13 @@ en_NZ:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_PH.yml b/config/locales/en_PH.yml
index 85c2a72890..b79a50eea6 100644
--- a/config/locales/en_PH.yml
+++ b/config/locales/en_PH.yml
@@ -22,6 +22,7 @@ en_PH:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1179,6 +1180,9 @@ en_PH:
         contact: "contact"
         require_customer_login: "Only approved customers can access this shop."
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1878,7 +1882,6 @@ en_PH:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2539,6 +2542,11 @@ en_PH:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2833,15 +2841,6 @@ en_PH:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2915,11 +2914,13 @@ en_PH:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml
index 98b943d6be..2db7e696ee 100644
--- a/config/locales/en_US.yml
+++ b/config/locales/en_US.yml
@@ -23,6 +23,7 @@ en_US:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close Date
       variant_override:
@@ -1213,6 +1214,9 @@ en_US:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1920,7 +1924,6 @@ en_US:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -1995,6 +1998,7 @@ en_US:
   calculator: "Calculator"
   calculator_values: "Calculator values"
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
+  calculator_preferred_unit_error: "must be kg or lb"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2593,6 +2597,11 @@ en_US:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "On demand"
@@ -2900,15 +2909,6 @@ en_US:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mail to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2982,11 +2982,14 @@ en_US:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Zipcode
-    weight: Weight (per lb)
+    weight: Weight (per kg or lb)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
     cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
     please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml
index 2ba1ccc919..5b4d5c234e 100644
--- a/config/locales/en_ZA.yml
+++ b/config/locales/en_ZA.yml
@@ -22,6 +22,7 @@ en_ZA:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Credit Card"
+        number: "Number"
       order_cycle:
         orders_close_at: Close date
       variant_override:
@@ -1186,6 +1187,9 @@ en_ZA:
         require_customer_html: "If you'd like to start shopping here, please %{contact} %{enterprise} to ask about joining."
       select_oc:
         select_oc_html: "Please <span class='highlighted'>choose when you want your order</span>, to see what products are available."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Card could not be updated
   card_could_not_be_saved: card could not be saved
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}"
@@ -1892,7 +1896,6 @@ en_ZA:
   shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
-  price_breakdown: "Full price breakdown"
   admin_fee: "Admin fee"
   sales_fee: "Sales fee"
   packing_fee: "Packing fee"
@@ -2560,6 +2563,11 @@ en_ZA:
           in your cart have reduced. Here's what's changed:
       now_out_of_stock: is now out of stock.
       only_n_remainging: "now only has %{num} remaining."
+    shopfront:
+      variant:
+        add_to_cart: "Add"
+      bulk_buy_modal:
+        max_quantity: "Max quantity"
     variants:
       on_demand:
         'yes': "Unlimited"
@@ -2778,15 +2786,6 @@ en_ZA:
     smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
     intercept_email_address: "Intercept Email Address"
     intercept_email_instructions: "Override email recipient and replace with this address."
-    image_settings: "Image Settings"
-    image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
-    attachment_default_style: Attachments Style
-    attachment_default_url: "Attachments Default URL"
-    attachment_path: "Attachments Path"
-    attachment_styles: "Paperclip Styles"
-    attachment_url: "Attachments URL"
-    add_new_style: "Add New Style"
-    image_settings_updated: "Image Settings successfully updated."
     tax_categories: "Tax Categories"
     listing_tax_categories: "Listing Tax Categories"
     back_to_tax_categories_list: "Back To Tax Categories List"
@@ -2853,8 +2852,10 @@ en_ZA:
     inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
     inventory: Inventory
     zipcode: Postcode
-    weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    successfully_created: '%{resource} has been successfully created!'
+    successfully_updated: '%{resource} has been successfully updated!'
+    payment_processing_failed: "Payment could not be processed, please check the details you entered"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e5b2c7824f..75bea30bc0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -23,6 +23,10 @@ es:
         variant_unit_name: "Nombre de la unidad de la variante"
       spree/credit_card:
         base: "Tarjeta de crédito"
+        number: "Número"
+        month: "Mes"
+        verification_value: "Valor de verificación"
+        year: "Año"
       order_cycle:
         orders_close_at: Fecha de cierre
       variant_override:
@@ -1215,6 +1219,9 @@ es:
         require_customer_html: "Si desea comenzar a comprar aquí, por favor %{contact} %{enterprise} para preguntar acerca de incorporación."
       select_oc:
         select_oc_html: "Por favor <span class='highlighted'>debes elegir cuando quieres tu pedido</span>, para poder ver qué productos hay disponibles."
+    products:
+      summary:
+        bulk: "Agrupar"
   card_could_not_be_updated: La tarjeta no se pudo actualizar
   card_could_not_be_saved: la tarjeta no se pudo guardar
   spree_gateway_error_flash_for_checkout: "Hubo un problema con tu información de pago: %{error}"
@@ -1922,7 +1929,6 @@ es:
   shop_for_products_html: "Comprar productos de <span class=\"turquoise\">%{enterprise}</span> en:"
   change_shop: "Cambiar de tienda:"
   shop_at: "Comprar en:"
-  price_breakdown: "Desglose de precios completo"
   admin_fee: "Comisión de administración"
   sales_fee: "Comisión de ventas"
   packing_fee: "Comisión de empaquetado"
@@ -1997,6 +2003,7 @@ es:
   calculator: "Calculadora"
   calculator_values: "Calculadora de valores"
   calculator_settings_warning: "Si está cambiando el tipo de calculadora, debe de salvar primero antes de editar las configuraciones de la calculadora"
+  calculator_preferred_unit_error: "debe ser kg o lb"
   flat_percent_per_item: "Porcentaje fijo (por artículo)"
   flat_rate_per_item: "Tarifa plana (por artículo)"
   flat_rate_per_order: "Tarifa plana (por pedido)"
@@ -2599,6 +2606,15 @@ es:
           de tu carrito se han reducido. Aquí está lo que ha cambiado:
       now_out_of_stock: está ahora fuera de stock.
       only_n_remainging: "Solo quedan %{num} ."
+    shopfront:
+      variant:
+        add_to_cart: "Añadir"
+        in_cart: "en el carrito"
+        quantity_in_cart: "%{quantity} en el carrito"
+      bulk_buy_modal:
+        min_quantity: "Cantidad mínima"
+        max_quantity: "Cantidad máxima"
+      price_breakdown: "Desglose de el precio"
     variants:
       on_demand:
         'yes': "Bajo demanda"
@@ -2904,15 +2920,6 @@ es:
     smtp_send_copy_to_this_addresses: "Envía una copia de todos los correos salientes a esta dirección. Para direcciones múltiples, sepárelas con comas."
     intercept_email_address: "Interceptar la dirección de correo electrónico"
     intercept_email_instructions: "Anular destinatario de correo electrónico y reemplazar con esta dirección."
-    image_settings: "Ajustes de imagen"
-    image_settings_warning: "Deberá regenerar las miniaturas si actualiza los estilos de paperclip. Utilize rake paperclip:refresh:thumbnails CLASS=Spree::Image para hacer esto."
-    attachment_default_style: Estilo de los archivos adjuntos
-    attachment_default_url: "URL predeterminada de los archivos adjuntos"
-    attachment_path: "Ruta de los archivos adjuntos"
-    attachment_styles: "Estilos de clip"
-    attachment_url: "URL de los archivos adjuntos"
-    add_new_style: "Añadir nuevo estilo"
-    image_settings_updated: "Configuración de la imagen se actualizó correctamente."
     tax_categories: "Categorías de impuestos"
     listing_tax_categories: "Listado de categorías de impuestos"
     back_to_tax_categories_list: "Volver a la lista de categorías de impuestos"
@@ -2986,11 +2993,18 @@ es:
     inventory_error_flash_for_insufficient_quantity: "Un artículo de su carrito ya no está disponible."
     inventory: Inventario
     zipcode: Código Postal
-    weight: Peso (en kg)
+    weight: Peso (por kg o lb)
     error_user_destroy_with_orders: "Los usuarios con pedidos completados no pueden ser eliminados"
     cannot_create_payment_without_payment_methods: "No se puede crear un pago para una orden sin un medio de pago definido"
     please_define_payment_methods: "por favor definir métodos de pago"
     options: "Opciones"
+    has_no_shipped_units: "no tiene unidades enviadas"
+    successfully_created: '%{resource} se ha creado exitosamente!'
+    successfully_updated: '%{resource} ha sido actualizado exitosamente!'
+    payment_processing_failed: "No se pudo procesar el pago, por favor verifique los detalles que introdujo"
+    not_available: "No disponible"
+    order_populator:
+      out_of_stock: '%{item} está agotado.'
     actions:
       update: "Actualizar"
     shared:
diff --git a/config/locales/es_CO.yml b/config/locales/es_CO.yml
index 801b0af8de..9cab6049e2 100644
--- a/config/locales/es_CO.yml
+++ b/config/locales/es_CO.yml
@@ -23,6 +23,7 @@ es_CO:
         variant_unit_name: "Nombre de la unidad de la variante"
       spree/credit_card:
         base: "Tarjeta de crédito"
+        number: "Número"
       order_cycle:
         orders_close_at: Fecha de cierre
       variant_override:
@@ -1205,6 +1206,9 @@ es_CO:
         require_customer_html: "Si desea comenzar a comprar aquí, por favor %{contact} %{enterprise} para preguntar acerca de incorporación."
       select_oc:
         select_oc_html: "Elije <span class='highlighted'>cuándo desees realizar tu pedido</span> para ver qué productos están disponibles."
+    products:
+      summary:
+        bulk: "Agrupar"
   card_could_not_be_updated: La tarjeta no se pudo actualizar
   card_could_not_be_saved: la tarjeta no se pudo guardar
   spree_gateway_error_flash_for_checkout: "Hubo un problema con su información de pago: %{error}"
@@ -1912,7 +1916,6 @@ es_CO:
   shop_for_products_html: "Comprar productos de <span class=\"turquoise\">%{enterprise}</span> en:"
   change_shop: "Cambiar de tienda a:"
   shop_at: "Comprar ahora en:"
-  price_breakdown: "Desglose de precios completo"
   admin_fee: "Comisión de administración"
   sales_fee: "Comisión de ventas"
   packing_fee: "Cuota de empaquetado"
@@ -2586,6 +2589,11 @@ es_CO:
           de los productos de su carrito se han reducido. Aquí está lo que ha cambiado:
       now_out_of_stock: está ahora fuera de inventario.
       only_n_remainging: "ahora solo hay %{num} restantes."
+    shopfront:
+      variant:
+        add_to_cart: "Añadir"
+      bulk_buy_modal:
+        max_quantity: "Cantidad máxima"
     variants:
       on_demand:
         'yes': "Bajo demanda"
@@ -2892,15 +2900,6 @@ es_CO:
     smtp_send_copy_to_this_addresses: "Envía una copia de todos los correos salientes a esta dirección. Para direcciones múltiples, sepárelas con comas."
     intercept_email_address: "Interceptar la dirección de correo electrónico"
     intercept_email_instructions: "Anular destinatario de correo electrónico y reemplazar con esta dirección."
-    image_settings: "Ajustes de imágen"
-    image_settings_warning: "Deberá regenerar las miniaturas si actualiza los estilos de paperclip. Utilize rake paperclip:refresh:thumbnails CLASS=Spree::Image para hacer esto."
-    attachment_default_style: Estilo de los archivos adjuntos
-    attachment_default_url: "URL predeterminada de los archivos adjuntos"
-    attachment_path: "Ruta de los archivos adjuntos"
-    attachment_styles: "Estilos de clip"
-    attachment_url: "URL de los archivos adjuntos"
-    add_new_style: "Añadir nuevo estilo"
-    image_settings_updated: "Configuración de la imagen se actualizó correctamente."
     tax_categories: "Categorías de impuestos"
     listing_tax_categories: "Listado de categorías de impuestos"
     back_to_tax_categories_list: "Volver a la lista de categorías de impuestos"
@@ -2974,11 +2973,13 @@ es_CO:
     inventory_error_flash_for_insufficient_quantity: "Un artículo de su carrito ya no está disponible."
     inventory: Inventario
     zipcode: Código postal
-    weight: Peso (en kg)
     error_user_destroy_with_orders: "Los usuarios con pedidos completados no pueden ser eliminados"
     cannot_create_payment_without_payment_methods: "No se puede crear un pago para una orden sin un método de pago definido."
     please_define_payment_methods: "Por favor definir métodos de pago primero."
     options: "Opciones"
+    successfully_created: '%{resource} se ha creado exitosamente!'
+    successfully_updated: '%{resource} ha sido actualizado exitosamente!'
+    payment_processing_failed: "No se pudo procesar el pago, por favor verifique los detalles que introdujo"
     actions:
       update: "Actualizar"
     shared:
diff --git a/config/locales/es_CR.yml b/config/locales/es_CR.yml
index 8f024c6edf..0233f2b726 100644
--- a/config/locales/es_CR.yml
+++ b/config/locales/es_CR.yml
@@ -22,6 +22,7 @@ es_CR:
         variant_unit_name: "Nombre de la unidad de la variante"
       spree/credit_card:
         base: "Tarjeta de crédito"
+        number: "Número"
       order_cycle:
         orders_close_at: Fecha de cierre
       variant_override:
@@ -1182,6 +1183,9 @@ es_CR:
         contact: "contactar"
         require_customer_login: "Sólo los clientes aprobados pueden acceder a esta tienda."
         require_customer_html: "Si desea comenzar a comprar aquí, por favor %{contact} %{enterprise} para preguntar acerca de incorporación."
+    products:
+      summary:
+        bulk: "Agrupar"
   card_could_not_be_updated: La tarjeta no se pudo actualizar
   card_could_not_be_saved: la tarjeta no se pudo guardar
   spree_gateway_error_flash_for_checkout: "Hubo un problema con su información de pago: %{error}"
@@ -1881,7 +1885,6 @@ es_CR:
   shop_for_products_html: "Comprar productos de <span class=\"turquoise\">%{enterprise}</span> en:"
   change_shop: "Cambiar de tienda a:"
   shop_at: "Comprar ahora en:"
-  price_breakdown: "Desglose de precios completo"
   admin_fee: "Comisión de administración"
   sales_fee: "Comisión de ventas"
   packing_fee: "Cuota de empaquetado"
@@ -2547,6 +2550,11 @@ es_CR:
           de los productos de su carrito se han reducido. Aquí está lo que ha cambiado:
       now_out_of_stock: está ahora fuera de inventario.
       only_n_remainging: "ahora solo hay %{num} restantes."
+    shopfront:
+      variant:
+        add_to_cart: "Añadir"
+      bulk_buy_modal:
+        max_quantity: "Cantidad máxima"
     variants:
       on_demand:
         'yes': "Bajo demanda"
@@ -2841,15 +2849,6 @@ es_CR:
     smtp_send_copy_to_this_addresses: "Envía una copia de todos los correos salientes a esta dirección. Para direcciones múltiples, sepárelas con comas."
     intercept_email_address: "Interceptar la dirección de correo electrónico"
     intercept_email_instructions: "Anular destinatario de correo electrónico y reemplazar con esta dirección."
-    image_settings: "Ajustes de imágen"
-    image_settings_warning: "Deberá regenerar las miniaturas si actualiza los estilos de paperclip. Utilize rake paperclip:refresh:thumbnails CLASS=Spree::Image para hacer esto."
-    attachment_default_style: Estilo de los archivos adjuntos
-    attachment_default_url: "URL predeterminada de los archivos adjuntos"
-    attachment_path: "Ruta de los archivos adjuntos"
-    attachment_styles: "Estilos de clip"
-    attachment_url: "URL de los archivos adjuntos"
-    add_new_style: "Añadir nuevo estilo"
-    image_settings_updated: "Configuración de la imagen se actualizó correctamente."
     tax_categories: "Categorías de impuestos"
     listing_tax_categories: "Listado de categorías de impuestos"
     back_to_tax_categories_list: "Volver a la lista de categorías de impuestos"
@@ -2923,11 +2922,13 @@ es_CR:
     inventory_error_flash_for_insufficient_quantity: "Un artículo de su carrito ya no está disponible."
     inventory: Inventario
     zipcode: Código postal
-    weight: Peso (en kg)
     error_user_destroy_with_orders: "Los usuarios con pedidos completados no pueden ser eliminados"
     cannot_create_payment_without_payment_methods: "No se puede crear un pago para una orden sin un método de pago definido."
     please_define_payment_methods: "Por favor definir métodos de pago primero."
     options: "Opciones"
+    successfully_created: '%{resource} se ha creado exitosamente!'
+    successfully_updated: '%{resource} ha sido actualizado exitosamente!'
+    payment_processing_failed: "No se pudo procesar el pago, por favor verifique los detalles que introdujo"
     actions:
       update: "Actualizar"
     shared:
diff --git a/config/locales/fil_PH.yml b/config/locales/fil_PH.yml
index c230c28c60..9d2a26d639 100644
--- a/config/locales/fil_PH.yml
+++ b/config/locales/fil_PH.yml
@@ -22,6 +22,7 @@ fil_PH:
         variant_unit_name: "pangalan ng yunit ng variant"
       spree/credit_card:
         base: "Credit Card"
+        number: "Bilang"
       order_cycle:
         orders_close_at: petsa ng pagsasara
       variant_override:
@@ -1182,6 +1183,9 @@ fil_PH:
         contact: "makipag-ugnayan"
         require_customer_login: "ang mga inaprubahang customer lamang ang maaaring gumamit ng shop na ito."
         require_customer_html: "kung nais mong magsimulang mamili rito, maaaring%{contact}%{enterprise} at magtanong kung paano sumali."
+    products:
+      summary:
+        bulk: "Bulto"
   card_could_not_be_updated: hindi ma-update ang card
   card_could_not_be_saved: hindi ma-save ang card
   spree_gateway_error_flash_for_checkout: "mayroong problema sa ibinigay na impormasyon ng pagbabayad:%{error}"
@@ -1881,7 +1885,6 @@ fil_PH:
   shop_for_products_html: "mamili ng<span class=\"turquoise\">%{enterprise}</span>na mga produkto sa:"
   change_shop: "palitan ang shop ng:"
   shop_at: "mamili ngayon sa:"
-  price_breakdown: "ibaba ang listahan ng presyo"
   admin_fee: "bayad sa admin"
   sales_fee: "bayad sa pagbebenta"
   packing_fee: "bayad sa pagbabalot"
@@ -2552,6 +2555,11 @@ fil_PH:
           produkto sa inyong cart ay nabawasan. ito ang nagbago:
       now_out_of_stock: ay out of stock na ngayon
       only_n_remainging: "ngayon ay may%{num}na natitira"
+    shopfront:
+      variant:
+        add_to_cart: "idagdag"
+      bulk_buy_modal:
+        max_quantity: "sagad na dami"
     variants:
       on_demand:
         'yes': "on demand"
@@ -2846,15 +2854,6 @@ fil_PH:
     smtp_send_copy_to_this_addresses: "nagpapadala ng kopya ng lahat ng lumalabas na mga sulat sa address na ito, para sa maraming address, paghiwalayin gamit ang kuwit."
     intercept_email_address: "harangin ang email address"
     intercept_email_instructions: "pawalang halaga ang tatanggap ng email at palitan ng address na ito"
-    image_settings: "mga setting ng larawan"
-    image_settings_warning: "kinakailangang gumawa muli ng mga thumbnail kung ia-update ang mga estilo ng paperclip. gumamit ng rake paperclip:refresh:thumbnails CLASS=Spree::Image para gawin ito."
-    attachment_default_style: estilo ng mga attachment
-    attachment_default_url: "Default URL ng mga attachment"
-    attachment_path: "landas ng mga attachment"
-    attachment_styles: "estilo ng Paperclips"
-    attachment_url: "URL ng mga attachment"
-    add_new_style: "magdagdag ng bagong estilo"
-    image_settings_updated: "matagumpay na na-update ang settings ng larawan"
     tax_categories: "kategorya ng tax"
     listing_tax_categories: "kategorya ng nakalistang tax"
     back_to_tax_categories_list: "bumalik sa listahan ng kategorya ng tax"
@@ -2928,11 +2927,13 @@ fil_PH:
     inventory_error_flash_for_insufficient_quantity: "ang isang item sa inyong cart ay hindi na available."
     inventory: imbentaryo
     zipcode: Postcode
-    weight: timbang (per kg)
     error_user_destroy_with_orders: "ang mga gumagamit na may kumpletong order ay hindi maaaring tanggalin"
     cannot_create_payment_without_payment_methods: "hindi maaaring magbayad para sa isang order na walang nakasaad na paraan ng pagbabayad."
     please_define_payment_methods: "isaad muna ang paraan ng pagbabayad"
     options: "pagpipilian"
+    successfully_created: '%{resource}ay matagumpay na nagawa!'
+    successfully_updated: '%{resource}ay matagumpay na na-update'
+    payment_processing_failed: "hindi maproseso ang bayad, maaaring suriin ang mga detalyeng inilagay"
     actions:
       update: "i-update"
     shared:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ddfe9df194..66c1598244 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -23,6 +23,10 @@ fr:
         variant_unit_name: "Unité de la variante"
       spree/credit_card:
         base: "Carte de crédit"
+        number: "N° commande"
+        month: "Mois"
+        verification_value: "Valeur de vérification"
+        year: "Année"
       order_cycle:
         orders_close_at: Date de fermeture
       variant_override:
@@ -1215,6 +1219,9 @@ fr:
         require_customer_html: "Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}."
       select_oc:
         select_oc_html: "Merci de <span class='highlighted'>sélectionner une option dans la liste déroulante</span>, afin de voir quel produits sont disponibles."
+    products:
+      summary:
+        bulk: "Vrac"
   card_could_not_be_updated: La carte bancaire n'a pas pu être mise à jour
   card_could_not_be_saved: la carte n'a pas pu être sauvegardée
   spree_gateway_error_flash_for_checkout: "Il y a eu un problème avec vos informations de paiement : %{error}"
@@ -1242,7 +1249,7 @@ fr:
   ticket_column_item: "Produit"
   ticket_column_unit_price: "Prix unitaire"
   ticket_column_total_price: "Prix total"
-  menu_1_title: "Boutiques"
+  menu_1_title: "Acheter"
   menu_1_url: "/shops"
   menu_2_title: "Carte"
   menu_2_url: "/map"
@@ -1387,7 +1394,7 @@ fr:
       cookies_policy_link: "politique de cookies"
       cookies_accept_button: "Accepter les cookies"
   home_shop: Faire mes courses
-  brandstory_headline: "NOUVEAU : on change de nom !"
+  brandstory_headline: "On change de nom !"
   brandstory_intro: "Votre plateforme Open Food France change de nom et devient CoopCircuits, une plateforme libre, cogérée et accessible à tous."
   brandstory_part1: "Le service proposé est basé sur le logiciel libre Open Food Network. Les organisateurs de circuits courts qui utilisent la plateforme décident ensemble des évolutions à apporter au logiciel, et gèrent conjointement l’activité de la coopérative CoopCircuits. Ils décident notamment du prix qu’ils paieront pour utiliser cette plateforme."
   brandstory_part2: "Afin de permettre à tout type d’initiative de circuit court de fonctionner efficacement, les offres proposées s’adaptent à la diversité des modèles économiques : que vous gériez un groupement d’achat bénévolement, ou pilotiez une entreprise familiale de distribution, CoopCircuits vous accompagne :-)"
@@ -1922,7 +1929,6 @@ fr:
   shop_for_products_html: "Acheter les produits de <span class=\"turquoise\">%{enterprise}</span> dans les boutiques suivantes:"
   change_shop: "Changer de boutique pour:"
   shop_at: "Acheter maintenant :"
-  price_breakdown: "Détail du prix:"
   admin_fee: "Frais de gestion admin"
   sales_fee: "Frais de ventes/marketing"
   packing_fee: "Frais de packaging"
@@ -1997,6 +2003,7 @@ fr:
   calculator: "Calculateur"
   calculator_values: "Valeurs applicables"
   calculator_settings_warning: "Si vous modifiez le type de calculateur, vous devez sauvegarder avant de modifier les paramètres du calculateur."
+  calculator_preferred_unit_error: "doit être kg ou lb"
   flat_percent_per_item: "Pourcentage net"
   flat_rate_per_item: "Montant fixe par article"
   flat_rate_per_order: "Montant fixe par commande"
@@ -2622,6 +2629,15 @@ fr:
           à votre demande. Voilà les modifications opérées:
       now_out_of_stock: est maintenant en rupture de stock.
       only_n_remainging: "plus que %{num} en stock."
+    shopfront:
+      variant:
+        add_to_cart: "Ajouter"
+        in_cart: "au panier"
+        quantity_in_cart: "%{quantity} au panier"
+      bulk_buy_modal:
+        min_quantity: "Quantité min"
+        max_quantity: "Quantité max"
+      price_breakdown: "Détail du prix"
     variants:
       on_demand:
         'yes': "A volonté"
@@ -2929,15 +2945,6 @@ fr:
     smtp_send_copy_to_this_addresses: "Envoyer une copie de tous les mails sortants à cette adresse. Si plusieurs adresses, les séparer par une virgule."
     intercept_email_address: "Adresse email d'interception"
     intercept_email_instructions: "Modifier l'email destinataire et le remplacer avec cette adresse."
-    image_settings: "Paramètres des images"
-    image_settings_warning: "Vous devrez générer de nouvelles vignettes si vous mettez à jour les styles paperclip. Utilisez rake paperclip:refresh:thumbnails CLASS=Spree::Image pour le faire."
-    attachment_default_style: Style des pièces jointes
-    attachment_default_url: "URL par défaut des pièces jointes"
-    attachment_path: "Chemin des pièces jointes"
-    attachment_styles: "Styles paperclip"
-    attachment_url: "URL des pièces jointes"
-    add_new_style: "Ajouter nouveau style"
-    image_settings_updated: "Paramètre des images mis à jour avec succès."
     tax_categories: "TVA applicable"
     listing_tax_categories: "Catégories de taxe en cours d'affichage"
     back_to_tax_categories_list: "Retour à la liste des catégories de taxe"
@@ -3011,11 +3018,18 @@ fr:
     inventory_error_flash_for_insufficient_quantity: "Un produit de votre panier n'est plus disponible."
     inventory: Catalogue boutique
     zipcode: Code postal
-    weight: Poids (au kg)
+    weight: Poids (par kg ou lb)
     error_user_destroy_with_orders: "Les utilisateurs avec des commandes finalisées pourraient ne pas être supprimés"
     cannot_create_payment_without_payment_methods: "Vous ne pouvez pas ajouter un paiement pour une commande sans avoir défini de méthode de paiement au préalable."
     please_define_payment_methods: "Il faut que vous définissiez une méthode de paiement avant tout !"
     options: "Options"
+    has_no_shipped_units: "n'a pas d'éléments envoyés"
+    successfully_created: '%{resource} a été créé avec succès !'
+    successfully_updated: '%{resource} a été mis à jour avec succès !'
+    payment_processing_failed: "Le paiement n'a pas pu être traité, veuillez vérifier les informations saisies"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} est en rupture de stock.'
     actions:
       update: "Mettre à jour"
     shared:
diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml
index e5f47f914f..116ac482bb 100644
--- a/config/locales/fr_BE.yml
+++ b/config/locales/fr_BE.yml
@@ -23,6 +23,7 @@ fr_BE:
         variant_unit_name: "Nom de la variante"
       spree/credit_card:
         base: "Carte de crédit"
+        number: "N° commande"
       order_cycle:
         orders_close_at: Date de fermeture
       variant_override:
@@ -1205,6 +1206,9 @@ fr_BE:
         require_customer_html: "Si vous souhaitez commencer à faire vos achats ici, veuillez %{contact}%{enterprise} et demandez pour vous inscrire."
       select_oc:
         select_oc_html: "Veuillez <span class='highlighted'>choisir quand vous voulez votre commande</span> , pour voir quels produits sont disponibles."
+    products:
+      summary:
+        bulk: "Vrac"
   card_could_not_be_updated: La carte bancaire n'a pas pu être mise à jour
   card_could_not_be_saved: la carte n'a pas pu être sauvegardée
   spree_gateway_error_flash_for_checkout: "Il y a eu un problème avec vos informations de paiement : %{error}"
@@ -1912,7 +1916,6 @@ fr_BE:
   shop_for_products_html: "Acheter les produits de <span class=\"turquoise\">%{enterprise}</span> dans les comptoirs suivants:"
   change_shop: "Changer de comptoir pour:"
   shop_at: "Acheter maintenant :"
-  price_breakdown: "Détail du prix:"
   admin_fee: "Frais de gestion admin"
   sales_fee: "Frais de ventes/marketing"
   packing_fee: "Frais d'emballage"
@@ -2595,6 +2598,11 @@ fr_BE:
           à votre demande. Voilà les modifications opérées:
       now_out_of_stock: est maintenant en rupture de stock.
       only_n_remainging: "plus que %{num} en stock."
+    shopfront:
+      variant:
+        add_to_cart: "Ajouter"
+      bulk_buy_modal:
+        max_quantity: "Quantité max"
     variants:
       on_demand:
         'yes': "A volonté"
@@ -2824,15 +2832,6 @@ fr_BE:
     smtp_send_copy_to_this_addresses: "Envoit une copie de tous les mails sortants vers cette adresse. En cas de plusieurs adresses, séparer par une virgule."
     intercept_email_address: "Intercepter les adresses mail"
     intercept_email_instructions: "Ignorer le destinataire et le remplacer par cette adresse."
-    image_settings: "Paramètres image"
-    image_settings_warning: "Il est nécessaire de régénérer des logos lors de la mise à jour des styles de trombones . Utiliser ratisser trombone:rafraîchir:logos CLASS=Spree::Image pour faire ceci. "
-    attachment_default_style: Style Pièces  jointes
-    attachment_default_url: "Joint à URL par défaut"
-    attachment_path: "Pièces jointes liés"
-    attachment_styles: "Styles trombones"
-    attachment_url: "URL lié"
-    add_new_style: "Ajouter un nouveau style "
-    image_settings_updated: "Paramètres Image mis à jour avec succès."
     tax_categories: "TVA applicable"
     listing_tax_categories: "Liste catégories TVA"
     back_to_tax_categories_list: "Retour à la liste des catégories de TVA"
@@ -2906,11 +2905,13 @@ fr_BE:
     inventory_error_flash_for_insufficient_quantity: "Une donnée n'est plus disponible sur votre carte."
     inventory: Catalogue boutique
     zipcode: Code postal
-    weight: Poids (au kg)
     error_user_destroy_with_orders: "Les utilisateurs avec une commande finalisée ne peuvent pas être supprimés"
     cannot_create_payment_without_payment_methods: "Vous ne pouvez pas créer un paiement pour une commande sans qu'aucun mode de paiement ne soit défini."
     please_define_payment_methods: "Veuillez d'abord définir certains modes de paiement."
     options: "Options"
+    successfully_created: '%{resource}est crée avec succès! '
+    successfully_updated: '%{resource}a été enregistrée avec succès'
+    payment_processing_failed: "Le paiement n' a pu être effectué , merci de vérifier les données rentrées"
     actions:
       update: "Mettre à jour"
     shared:
diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml
index 85e977d5c9..e01cc4b327 100644
--- a/config/locales/fr_CA.yml
+++ b/config/locales/fr_CA.yml
@@ -23,6 +23,10 @@ fr_CA:
         variant_unit_name: "Unité de la variante"
       spree/credit_card:
         base: "Carte de crédit"
+        number: "N° commande"
+        month: "Mois"
+        verification_value: "Valeur de vérification"
+        year: "Année"
       order_cycle:
         orders_close_at: Date de fermeture
       variant_override:
@@ -1215,6 +1219,9 @@ fr_CA:
         require_customer_html: "Si vous voulez demander à y accéder, veuillez %{contact} %{enterprise}."
       select_oc:
         select_oc_html: "Merci de 1sélectionner une option dans la liste déroulante1, afin de voir quel produits sont disponibles."
+    products:
+      summary:
+        bulk: "Vrac"
   card_could_not_be_updated: La carte n'a pu être mise à jour
   card_could_not_be_saved: la carte n'a pas pu être sauvegardée
   spree_gateway_error_flash_for_checkout: "Il y a eu un problème avec vos informations de paiement : %{error}"
@@ -1922,7 +1929,6 @@ fr_CA:
   shop_for_products_html: "Acheter les produits de <span class=\"turquoise\">%{enterprise}</span> dans les boutiques suivantes:"
   change_shop: "Changer de boutique pour:"
   shop_at: "Acheter maintenant :"
-  price_breakdown: "Détail du prix:"
   admin_fee: "Frais de gestion admin"
   sales_fee: "Frais de ventes/marketing"
   packing_fee: "Frais de conditionnement"
@@ -1997,6 +2003,7 @@ fr_CA:
   calculator: "Calculateur"
   calculator_values: "Valeurs applicables"
   calculator_settings_warning: "Si vous modifiez le type de calculateur, vous devez sauvegarder avant de modifier les paramètres du calculateur."
+  calculator_preferred_unit_error: "doit être kg ou lb"
   flat_percent_per_item: "Pourcentage net"
   flat_rate_per_item: "Taux forfaitaire par article"
   flat_rate_per_order: "Montant fixe par commande"
@@ -2606,6 +2613,15 @@ fr_CA:
           à votre demande. Voilà les modifications opérées:
       now_out_of_stock: est maintenant en rupture de stock.
       only_n_remainging: "plus que %{num} en stock."
+    shopfront:
+      variant:
+        add_to_cart: "Ajouter"
+        in_cart: "au panier"
+        quantity_in_cart: "%{quantity} au panier"
+      bulk_buy_modal:
+        min_quantity: "Quantité min"
+        max_quantity: "Quantité max"
+      price_breakdown: "Détail du prix"
     variants:
       on_demand:
         'yes': "A volonté"
@@ -2913,15 +2929,6 @@ fr_CA:
     smtp_send_copy_to_this_addresses: "Envoyer une copie de tous les mails sortants à cette adresse. Si plusieurs adresses, les séparer par une virgule."
     intercept_email_address: "Adresse email d'interception"
     intercept_email_instructions: "Modifier l'email destinataire et le remplacer avec cette adresse."
-    image_settings: "Paramètres des images"
-    image_settings_warning: "Vous devrez générer de nouvelles vignettes si vous mettez à jour les styles paperclip. Utilisez rake paperclip:refresh:thumbnails CLASS=Spree::Image pour le faire."
-    attachment_default_style: Style des pièces jointes
-    attachment_default_url: "URL par défaut des pièces jointes"
-    attachment_path: "Chemin des pièces jointes"
-    attachment_styles: "Styles paperclip"
-    attachment_url: "URL des pièces jointes"
-    add_new_style: "Ajouter nouveau style"
-    image_settings_updated: "Paramètre des images mis à jour avec succès."
     tax_categories: "Taxe applicable"
     listing_tax_categories: "Catégories de taxe en cours d'affichage"
     back_to_tax_categories_list: "Retour à la liste des catégories de taxe"
@@ -2995,11 +3002,18 @@ fr_CA:
     inventory_error_flash_for_insufficient_quantity: "Un produit de votre panier n'est plus disponible."
     inventory: Catalogue boutique
     zipcode: Code postal
-    weight: Poids (au kg)
+    weight: Poids (par kg ou lb)
     error_user_destroy_with_orders: "Les utilisateurs avec des commandes finalisées pourraient ne pas être supprimés"
     cannot_create_payment_without_payment_methods: "Vous ne pouvez pas ajouter un paiement pour une commande sans avoir défini de méthode de paiement au préalable."
     please_define_payment_methods: "Il faut que vous définissiez une méthode de paiement avant tout !"
     options: "Options"
+    has_no_shipped_units: "n'a pas d'éléments envoyés"
+    successfully_created: '%{resource} a été créé avec succès !'
+    successfully_updated: ' %{resource}été mis à jour avec succès !'
+    payment_processing_failed: "Le paiement n'a pas pu être traité, veuillez vérifier les informations saisies"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} est en rupture de stock.'
     actions:
       update: "Mettre à jour"
     shared:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0ce49447be..8d5be43d38 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -23,6 +23,10 @@ it:
         variant_unit_name: "Nome Unità Variante"
       spree/credit_card:
         base: "Carta di Credito"
+        number: "Numero"
+        month: "Mese"
+        verification_value: "Valore di verifica"
+        year: "Anno"
       order_cycle:
         orders_close_at: Data chiusura
       variant_override:
@@ -121,6 +125,7 @@ it:
       not_array_error: "deve essere un array"
       invalid_element_error: "deve contenere solo numeri interi"
   datetime_picker_ui:
+    current_text: Adesso
     close_text: Fatto
     time_text: Ora
   enterprise_mailer:
@@ -230,6 +235,7 @@ it:
   enterprises: Aziende
   enterprise_groups: Gruppi
   reports: Resoconti
+  listing_reports: Lista Report
   variant_overrides: Inventario
   import: Importazione
   spree_products: Prodotti Spree
@@ -276,6 +282,9 @@ it:
   on hand: "Disponibile"
   ship: "Spedizione"
   shipping_category: "Categoria Spedizioni"
+  height: "Altezza"
+  width: "Larghezza"
+  depth: "Profondità"
   actions:
     create_and_add_another: "Crea e Aggiungi un Altro"
     create: "Crea"
@@ -596,6 +605,7 @@ it:
         order_date: "Completato al"
         max: "Max"
         product_unit: "Prodotto: Unità"
+        weight_volume: "Peso/Volume (g)"
         ask: "Chiedi?"
         page_title: "Gestione di ordine all'ingrosso"
         actions_delete: "Cancella i selezionati"
@@ -632,6 +642,8 @@ it:
           acn_placeholder: es. 123 456 789
           display_invoice_logo: Mostra logo nelle fatture
           invoice_text: Aggiungere testo personalizzato alla fine delle fatture
+          terms_and_conditions: "Termini e Condizioni"
+          remove_terms_and_conditions: "Rimuovi File"
         contact:
           name: Nome
           name_placeholder: es. Gustav Plum
@@ -723,6 +735,8 @@ it:
           enable_subscriptions_tip: "Abilita la funzionalità \"sottoscrizioni\"?"
           enable_subscriptions_false: "Disabilitata"
           enable_subscriptions_true: "Abilitata"
+          customer_names_in_reports: "Report con Nomi Clienti"
+          customer_names_tip: "Permetti ai tuoi fornitori di visualizzare i nomi dei tuoi clienti nei report."
           customer_names_false: "Disabilitata"
           customer_names_true: "Abilitata"
           shopfront_message: "Messaggio vetrina"
@@ -1032,8 +1046,8 @@ it:
       packing:
         name: Resoconti smistamento/imballaggio
       enterprise_fee_summary:
-        name: "Riepilogo commissioni dell'azienda"
-        description: "Riepilogo delle commissioni dell'azienda"
+        name: "Riepilogo tariffe dell'azienda"
+        description: "Riepilogo delle Tariffe applicate dall'azienda"
     subscriptions:
       index:
         title: "Abbonamenti"
@@ -1139,12 +1153,17 @@ it:
       destroy_attachment_does_not_exist: "Logo inesistente"
     enterprise_promo_image:
       destroy_attachment_does_not_exist: "Immagine promozionale inesistente"
+    enterprise_terms_and_conditions:
+      destroy_attachment_does_not_exist: "Il file Termini e Condizioni non esiste"
     orders:
       failed_to_update: "Aggiornamento ordine fallito"
   checkout:
     already_ordered:
       cart: "carrello"
       message_html: "Hai già un ordine per questo ciclo d'ordine. Controlla%{cart} per vedere gli articoli ordinati in precedenza. Puoi anche cancellare gli articoli finché il ciclo dell'ordine è aperto."
+    terms_and_conditions:
+      message_html: "Confermando la tua gentile richiesta acconsenti ai%{terms_and_conditions_link}."
+      link_text: "Termini di Servizio"
     failed: "Checkout fallito. Contattaci per poter processare il tuo ordine."
   shops:
     hubs:
@@ -1162,6 +1181,7 @@ it:
         items_in_cart_plural: "%{num} articoli nel tuo carrello"
         close: "Chiuso"
         cart_empty: "Il tuo carrello è vuoto"
+        take_me_shopping: "Portami ad acquistare!"
       signed_in:
         profile: "Profilo"
       mobile_menu:
@@ -1198,6 +1218,9 @@ it:
         require_customer_html: "Se vuoi iniziare a comprare, per favore %{contact} %{enterprise} per chiedere di aggiungerti ai clienti."
       select_oc:
         select_oc_html: "Per favore <span class='highlighted'>scegli quando vuoi il tuo ordine </span>, per vedere quali prodotti sono disponibili."
+    products:
+      summary:
+        bulk: "Volume"
   card_could_not_be_updated: La Carta non ha potuto essere rinnovata
   card_could_not_be_saved: La Carta non ha potuto essere salvata
   spree_gateway_error_flash_for_checkout: "C'è stato un problema con le informazioni sul pagamento: %{error}"
@@ -1905,7 +1928,6 @@ it:
   shop_for_products_html: "Acquista prodotti di <span class=\"turquoise\">%{enterprise}</span>:"
   change_shop: "Cambia negozio:"
   shop_at: "Acquista ora a:"
-  price_breakdown: "Scomposizione del prezzo"
   admin_fee: "Contributo amministrativo"
   sales_fee: "Commissione di vendita"
   packing_fee: "Tariffa imballaggio"
@@ -1966,11 +1988,12 @@ it:
   supplier: "Fornitore"
   product_name: "Nome Prodotto"
   product_description: "Descrizione prodotto"
+  permalink: "Permalink"
   shipping_categories: "Categorie Spedizioni"
   units: "Unità di misura"
   coordinator: "Coordinatore"
   distributor: "Distributore"
-  enterprise_fees: "Contributi dell'azienda"
+  enterprise_fees: "Tariffe dell'azienda"
   process_my_order: "Elabora la mia gentile richiesta"
   delivery_instructions: Istruzioni di consegna
   delivery_method: Metodo di consegna
@@ -1979,6 +2002,7 @@ it:
   calculator: "Calcolatore"
   calculator_values: "Valori del calcolatore"
   calculator_settings_warning: "Se stai modificando il tipo di calcolatore, devi prima salvare prima di editare i setting del calcolatore"
+  calculator_preferred_unit_error: "deve essere kg"
   flat_percent_per_item: "Percentuale (per prodotto)"
   flat_rate_per_item: "Tariffa fissa (per articolo)"
   flat_rate_per_order: "Tariffa fissa (per gentile richiesta)"
@@ -2016,7 +2040,7 @@ it:
   spree_admin_enterprises_hubs_name: "Nome"
   spree_admin_enterprises_create_new: "CREA NUOVO"
   spree_admin_enterprises_shipping_methods: "Metodi di Spedizione"
-  spree_admin_enterprises_fees: "Contributi dell'azienda"
+  spree_admin_enterprises_fees: "Tariffe dell'azienda"
   spree_admin_enterprises_none_create_a_new_enterprise: "CREA NUOVA AZIENDA"
   spree_admin_enterprises_none_text: "Non hai nessua azienda al momento"
   spree_admin_enterprises_tabs_hubs: "HUBS"
@@ -2062,6 +2086,7 @@ it:
   remove_tax: "Rimuovi tassa"
   first_name_begins_with: "Il nome inizia con"
   last_name_begins_with: "Il cognome inizia con"
+  shipping_method: "Metodi di spedizione"
   new_order: "Nuovo ordine"
   enterprise_tos_link: "link Termini di Servizio Aziende"
   enterprise_tos_message: "Abbiamo bisogno di lavorare con persone che condividono i nostri scopi e i nostri valori. Per questo chiediamo alle nuove aziende di sottoscrivere i nostri"
@@ -2287,6 +2312,7 @@ it:
   enterprise_name_error: "è già stato utilizzato. Se questo è il nome della tua azienda e vorresti reclamarne la proprietà, o se vuoi contattare questa azienda, puoi contattare l'attuale referente di questo profilo a %{email}."
   enterprise_owner_error: "^%{email}non può gestire altre aziende (il limite è %{enterprise_limit})."
   enterprise_role_uniqueness_error: "^Questo ruolo è già presente."
+  enterprise_terms_and_conditions_type_error: "Solo PDF "
   inventory_item_visibility_error: deve essere vero o falso
   product_importer_file_error: "errore: nessun documento caricato"
   product_importer_spreadsheet_error: "non è stato possibile elaborare il documento: tipo di documento non valido"
@@ -2568,6 +2594,8 @@ it:
             immediate_logo_removal_warning: "Il logo verrà rimosso immediatamente dopo la conferma."
             removed_promo_image_successfully: "Immagine promozionale rimossa con successo"
             immediate_promo_image_removal_warning: "L'immagine promozionale verrà rimossa immediatamente dopo la conferma da parte tua.."
+            immediate_terms_and_conditions_removal_warning: "I Termini e Condizioni verranno rimossi non appena darai la tua conferma."
+            removed_terms_and_conditions_successfully: "File di Termini e Condizioni rimosso con successo"
     insufficient_stock: "Scorte disponibili insufficienti, solo %{on_hand} rimanenti"
     out_of_stock:
       reduced_stock_available: Quantità disponibile ridotta
@@ -2576,6 +2604,15 @@ it:
           nel tuo carrello sono diminuite. Ecco cosa è cambiato:
       now_out_of_stock: non è al momento disponibile
       only_n_remainging: "attualmente solo %{num} rimasto."
+    shopfront:
+      variant:
+        add_to_cart: "Aggiungi"
+        in_cart: "nel carrello"
+        quantity_in_cart: "%{quantity} nel carrello"
+      bulk_buy_modal:
+        min_quantity: "Quantità minima"
+        max_quantity: "Quantità massima"
+      price_breakdown: "Composizione del prezzo"
     variants:
       on_demand:
         'yes': "A richiesta"
@@ -2641,6 +2678,11 @@ it:
       signup_or_login: "Inizia registrandoti (o accedendo)"
       have_an_account: "Hai già un account?"
       action_login: "Accedi ora."
+    stripe_elements:
+      unknown_error_from_stripe: |
+          C'è stato un problema nell'impostare la tua carta nel nostro portale di pagamento.
+          Per favore aggiorna la pagina e prova ancora, se dovesse ripresentarsi l'errore,
+          contattaci per avere supporto.
   inflections:
     each:
       one: "ogni"
@@ -2771,6 +2813,8 @@ it:
   adjustments: "Regolazioni"
   payments: "Pagamenti"
   return_authorizations: "Authorizationi reso"
+  credit_owed: "Credito dovuto"
+  new_adjustment: "Nuove regolazioni"
   payment: "Pagamento"
   payment_method: "Metodo di pagamento"
   shipment: "Spedizione"
@@ -2876,15 +2920,6 @@ it:
     smtp_send_copy_to_this_addresses: "Invia una copia di tutti i messaggi in uscita a questo indirizzo. Per più indirizzi, separare con virgole."
     intercept_email_address: "Intercettare l'indirizzo email"
     intercept_email_instructions: "Sostituire il destinatario della posta elettronica con questo indirizzo."
-    image_settings: "Impostazioni immagine"
-    image_settings_warning: "Avrai bisogno di rigenerare le miniature se aggiorni gli stili di graffetta. Usa rake paperclip: refresh: miniature CLASS = Spree :: Immagine per farlo."
-    attachment_default_style: Stile allegati
-    attachment_default_url: "Allegati URL predefinito"
-    attachment_path: "Percorso degli allegati"
-    attachment_styles: "Stili di graffetta"
-    attachment_url: "URL allegati"
-    add_new_style: "Aggiungi nuovo stile"
-    image_settings_updated: "Impostazioni immagine aggiornate con successo."
     tax_categories: "Categorie imposte"
     listing_tax_categories: "Elenco delle categorie fiscali"
     back_to_tax_categories_list: "Torna all'elenco delle categorie fiscali"
@@ -2958,11 +2993,18 @@ it:
     inventory_error_flash_for_insufficient_quantity: "Un articolo nel tuo carrello è diventato non disponibile."
     inventory: Inventario
     zipcode: CAP
-    weight: Peso (kg)
+    weight: Peso (per kg)
     error_user_destroy_with_orders: "Gli utenti con ordini completi non dovrebbero essere cancellati"
     cannot_create_payment_without_payment_methods: "Non è possibile creare un pagamento per un ordine senza alcun metodo di pagamento definito."
     please_define_payment_methods: "Definisci prima alcuni metodi di pagamento."
     options: "Opzioni"
+    has_no_shipped_units: "non ha unità spedite"
+    successfully_created: '%{resource} è stato creato con successo!'
+    successfully_updated: '%{resource} è stato aggiornato con successo!'
+    payment_processing_failed: "Non è stato possibile elaborare il pagamento, per favore controlla i dettagli che hai inserito"
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item} non è al momento disponibile.'
     actions:
       update: "Aggiorna"
     shared:
@@ -2972,6 +3014,7 @@ it:
           other: "%{count} errori hanno proibito il salvataggio di questo record:"
         there_were_problems_with_the_following_fields: "Si sono verificati problemi con i seguenti campi"
       payments_list:
+        date_time: "Data/ora"
         amount: "Quantità"
         payment_method: "Metodo di pagamento"
         payment_state: "Stato Pagamento"
@@ -3189,6 +3232,8 @@ it:
           stripe:
             error_saving_payment: Errore memorizzando il pagamento
             submitting_payment: Eseguendo il pagamento
+          paypal:
+            no_payment_via_admin_backend: I pagamenti con Paypal non possono comparire nel Pannello di Controllo
       products:
         image_upload_error: "L'immagine del prodotto non è stata riconosciuta. Carica un'immagine in formato PNG o JPG."
         new:
@@ -3242,6 +3287,8 @@ it:
           bulk_coop_allocation: 'Assegnazione - tabella'
           bulk_coop_packing_sheets: 'Imballaggio - tabella'
           bulk_coop_customer_payments: 'Bulk Co-op - Pagamenti Clienti'
+        customer_names_message:
+          customer_names_tip: "Se i nomi dei clienti sono nascosti nelle gentili richieste che hai evaso, puoi contattare il distributore e chiedergli di aggiornare le sue impostazioni per permettere ai suoi fornitori di visualizzare i nomi dei clienti."
       users:
         index:
           listing_users: "Elenco Utenti"
@@ -3322,7 +3369,7 @@ it:
           remember_this_card: Ricordare questa Carta?
     date_picker:
       format: '%Y-%m-%d'
-      js_format: 'aa-mm-gg'
+      js_format: 'yy/mm/dd'
     orders:
       error_flash_for_unavailable_items: "Un oggetto nel tuo carrello è diventato non disponibile, Per favore aggiorna le quantità selezionate."
       edit:
@@ -3387,6 +3434,11 @@ it:
         thanks: "Grazie per il tuo lavoro."
         track_information: "Informazioni Tracking: %{tracking}"
         track_link: "Tracking Link: %{url}"
+    test_mailer:
+      test_email:
+        greeting: "Congratulazioni!"
+        message: "Se hai ricevuto questa mail, le tue impostazioni email sono corrette."
+        subject: "Mail prova"
     order_state:
       address: indirizzo
       adjustments: aggiustamenti
@@ -3469,3 +3521,8 @@ it:
       shipment:
         cannot_ready: "Impossibile spedizione immediata."
       invalid_taxonomy_id: "ID tassonomia non valido."
+    activerecord:
+      models:
+        spree/payment:
+          one: Pagamento
+          other: Pagamenti
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 17708c3523..156612ce5a 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -23,6 +23,10 @@ nb:
         variant_unit_name: "Enhetsnavn Variant"
       spree/credit_card:
         base: "Kredittkort"
+        number: "Antall"
+        month: "Måned"
+        verification_value: "Verifiseringsverdi"
+        year: "År"
       order_cycle:
         orders_close_at: Lukkedato
       variant_override:
@@ -1213,6 +1217,9 @@ nb:
         require_customer_html: "Hvis du vil begynne å handle her, vennligst %{contact} %{enterprise} for å spørre om å bli med."
       select_oc:
         select_oc_html: "Vennligst <span class='highlighted'>velg når du vil ha bestillingen din</span> , for å se hvilke produkter som er tilgjengelige."
+    products:
+      summary:
+        bulk: "Bulk"
   card_could_not_be_updated: Kortet kunne ikke oppdateres
   card_could_not_be_saved: kort kunne ikke lagres
   spree_gateway_error_flash_for_checkout: "Det oppstod et problem med betalingsinformasjonen din: %{error}"
@@ -1920,7 +1927,6 @@ nb:
   shop_for_products_html: "Handle produkter fra <span class=\"turquoise\">%{enterprise}</span> på:"
   change_shop: "Endre butikk til:"
   shop_at: "Handle nå på:"
-  price_breakdown: "Prisfordeling"
   admin_fee: "Administrasjonsgebyr"
   sales_fee: "Salgsgebyr"
   packing_fee: "Pakkegebyr"
@@ -1995,6 +2001,7 @@ nb:
   calculator: "Kalkulator"
   calculator_values: "Kalkulatorverdier"
   calculator_settings_warning: "Hvis du endrer kalkulatortypen, må du lagre først før du kan redigere kalkulatorinnstillingene"
+  calculator_preferred_unit_error: "må være kg eller lb."
   flat_percent_per_item: "Flat prosent (per stk)"
   flat_rate_per_item: "Flat rate (per vare)"
   flat_rate_per_order: "Flat Rate (per bestilling)"
@@ -2593,6 +2600,11 @@ nb:
           i din handlekurv gått ned. Her er hva som er endret.
       now_out_of_stock: er nå ikke på lager.
       only_n_remainging: "har nå kun %{num} igjen."
+    shopfront:
+      variant:
+        add_to_cart: "Legg til"
+      bulk_buy_modal:
+        max_quantity: "Max mengde"
     variants:
       on_demand:
         'yes': "Ved forespørsel"
@@ -2897,15 +2909,6 @@ nb:
     smtp_send_copy_to_this_addresses: "Sender en kopi av alle utgående eposter til denne adressen. For flere adresser, skill med komma."
     intercept_email_address: "Avskjær epostadresse"
     intercept_email_instructions: "Overstyr epost mottaker og erstatt med denne adressen."
-    image_settings: "Bildeinnstillinger"
-    image_settings_warning: "Du må regenerere miniatyrbilder hvis du oppdaterer paperclip-stiler. Bruk rake paperclip:refresh:thumbnails CLASS=Spree::Image for å gjøre dette"
-    attachment_default_style: Vedlegg Stil
-    attachment_default_url: "Vedlegg Standard URL"
-    attachment_path: "Vedlegg Sti"
-    attachment_styles: "Paperclip Stiler"
-    attachment_url: "Vedlegg URL"
-    add_new_style: "Legg til ny stil"
-    image_settings_updated: "Oppdatering av bildeinnstillinger var vellykket."
     tax_categories: "Avgiftskategorier"
     listing_tax_categories: "Oppføring av Avgiftskategorier"
     back_to_tax_categories_list: "Tilbake til Avgiftskategorier Liste"
@@ -2979,11 +2982,18 @@ nb:
     inventory_error_flash_for_insufficient_quantity: "Et element i handlekurven din er blitt utilgjengelig."
     inventory: Varelager
     zipcode: Postnummer
-    weight: Vekt (per kg)
+    weight: Vekt (per kg eller lb)
     error_user_destroy_with_orders: "Brukere med fullførte ordrer kan ikke slettes"
     cannot_create_payment_without_payment_methods: "Du kan ikke opprette en betaling for en bestilling uten at det er definert noen betalingsmetoder."
     please_define_payment_methods: "Vennligst angi noen betalingsmetoder først."
     options: "Valg"
+    has_no_shipped_units: "har ingen sendte enheter"
+    successfully_created: 'Opprettelsen av %{resource} var vellykket!'
+    successfully_updated: 'Oppdatering av%{resource} var vellykket!'
+    payment_processing_failed: "Betalingen kunne ikke behandles, vennligst sjekk detaljene du skrev inn"
+    not_available: "Ikke relevant"
+    order_populator:
+      out_of_stock: '%{item} er utsolgt.'
     actions:
       update: "Oppdater"
     shared:
diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml
index dd49b10046..c9eb2ee940 100644
--- a/config/locales/nl_BE.yml
+++ b/config/locales/nl_BE.yml
@@ -23,6 +23,7 @@ nl_BE:
         variant_unit_name: "Variant Unit Name"
       spree/credit_card:
         base: "Kredietkaart"
+        number: "Nummer"
       order_cycle:
         orders_close_at: Sluitingsdatum
       variant_override:
@@ -1207,6 +1208,9 @@ nl_BE:
         require_customer_html: "Als u hier wilt beginnen met winkelen, kunt u vragen of %{contact}%{enterprise}u lid wilt worden."
       select_oc:
         select_oc_html: "Alstublief<span class='highlighted'>kies waneer uw u orde wilt</span>, om te zien welke producten beschikbaar zijn."
+    products:
+      summary:
+        bulk: "Bulk (grote hoeveelheid)"
   card_could_not_be_updated: De bankkaart kon niet worden geüpdatet.
   card_could_not_be_saved: De bankkaart kon niet worden bewaard.
   spree_gateway_error_flash_for_checkout: "Er was een probleem met betaalinformatie: %{error}"
@@ -1914,7 +1918,6 @@ nl_BE:
   shop_for_products_html: "Koop voor <span class=\"turquoise\">%{enterprise}</span>producten bij:"
   change_shop: "Verander winkel naar:"
   shop_at: "Winkel nu bij:"
-  price_breakdown: "De volledige prijs ontleedt"
   admin_fee: "Adminkost"
   sales_fee: "Verkoopskost"
   packing_fee: "Verpakkingskost"
@@ -2590,6 +2593,11 @@ nl_BE:
           van uw produkten  onvoldoende. Ziehier de wijzigingen :
       now_out_of_stock: is niet meer in stock
       only_n_remainging: "%{num}blijven over."
+    shopfront:
+      variant:
+        add_to_cart: "Voeg toe"
+      bulk_buy_modal:
+        max_quantity: "Maximale hoeveelheid"
     variants:
       on_demand:
         'yes': "Op Aanvraag"
@@ -2819,15 +2827,6 @@ nl_BE:
     smtp_send_copy_to_this_addresses: "Stuurt een kopie van alle uitgaande mails naar dit adres. In geval van meerdere adressen, die met een comma scheiden."
     intercept_email_address: "Email adres onderscheppen"
     intercept_email_instructions: "De mailontvanger omzeilen en door dit adres vervangen. "
-    image_settings: "Beeldinstellingen "
-    image_settings_warning: "Logos regeneren als de paperclips stylen bijgewerkt worden. Paperclip harken gebruiken :opfrissen:logos CLASS=Spree::Image om het doen. "
-    attachment_default_style: Bijlagestijl
-    attachment_default_url: "Standaard Band met URL"
-    attachment_path: "Pad bijlagen"
-    attachment_styles: "Paperclipstijlen"
-    attachment_url: "URL bijlagen"
-    add_new_style: "Een nieuwe stijl toevoegen"
-    image_settings_updated: "Beeldinstellingen zijn met succes bijgewerkt."
     tax_categories: "Belastingcategorieën"
     listing_tax_categories: "Lijst BTW categoriëen "
     back_to_tax_categories_list: "Terug naar de lijst BTW categoriëen "
@@ -2901,11 +2900,13 @@ nl_BE:
     inventory_error_flash_for_insufficient_quantity: "Een gegeven op je kaart is onbereikbaar."
     inventory: Inventarisatie
     zipcode: Postcode
-    weight: Gewicht (per kg)
     error_user_destroy_with_orders: "Gebruiker met voltooide besteling mag niet woden verwijderd"
     cannot_create_payment_without_payment_methods: "U kunt niet een betaling maken voor een besteling met geen betalingsmethode toegewezen"
     please_define_payment_methods: "Bepaal een geldige betaalmethode eerst."
     options: "Opties"
+    successfully_created: '%{resource}is met succes gedaan! '
+    successfully_updated: '%{resource}is succesvol bijgewerkt!'
+    payment_processing_failed: "De betaling is niet succesvol, gelieve de  ingevoerde gegevens na te kijken"
     actions:
       update: "Update"
     shared:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bfed3bb68f..87bd7fa5c7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -23,6 +23,7 @@ pl:
         variant_unit_name: "Nazwa jednostki wariantu"
       spree/credit_card:
         base: "Karta kredytowa"
+        number: "Numer zamówienia"
       order_cycle:
         orders_close_at: Data zakończenia
       variant_override:
@@ -1923,7 +1924,6 @@ pl:
   shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> - te produkty kupisz w następujących miejscach: "
   change_shop: "Zmień sklep na:"
   shop_at: "Kup teraz na:"
-  price_breakdown: "Pełne zestawienie cen"
   admin_fee: "opłata administracyjna"
   sales_fee: "Opłata za sprzedaż"
   packing_fee: "Opłata za pakowanie"
@@ -2599,6 +2599,9 @@ pl:
           w Twoim koszyku. Oto, co się zmieniło:
       now_out_of_stock: jest teraz niedostępny.
       only_n_remainging: "teraz pozostało tylko %{num}."
+    shopfront:
+      variant:
+        add_to_cart: "Dodaj"
     variants:
       on_demand:
         'yes': "Na żądanie"
@@ -2951,15 +2954,6 @@ pl:
     smtp_send_copy_to_this_addresses: "Wysyła kopię wszystkich wychodzących wiadomości na ten adres. W przypadku wielu adresów, oddziel je przecinkami."
     intercept_email_address: "Przechwyć adres e-mail"
     intercept_email_instructions: "Zastąp adresata wiadomości e-mail i zastąp tym adresem."
-    image_settings: "Ustawienia obrazu"
-    image_settings_warning: "Jeśli zaktualizujesz style spinaczy, będziesz musiał ponownie wygenerować miniatury. Użyj rake paperclip:refresh:thumbnails CLASS=Spree::Image , aby to zrobić."
-    attachment_default_style: Styl załączników
-    attachment_default_url: "Załączniki Domyślny adres URL"
-    attachment_path: "Ścieżka załączników"
-    attachment_styles: "Style spinaczy"
-    attachment_url: "URL załączników"
-    add_new_style: "Dodaj nowy styl"
-    image_settings_updated: "Ustawienia obrazu zostały pomyślnie zaktualizowane."
     tax_categories: "Kategorie podatków"
     listing_tax_categories: "Lista kategorii podatkowych"
     back_to_tax_categories_list: "Powrót do listy kategorii podatkowych"
@@ -3033,7 +3027,6 @@ pl:
     inventory_error_flash_for_insufficient_quantity: "Produkt w Twoim koszyku stał się niedostępny."
     inventory: Zapasy
     zipcode: Kod pocztowy
-    weight: Waga (na kg)
     error_user_destroy_with_orders: "Nie można usunąć użytkowników ze zrealizowanymi zamówieniami"
     cannot_create_payment_without_payment_methods: "Nie możesz utworzyć płatności za zamówienie bez zdefiniowanych metod płatności."
     please_define_payment_methods: "Najpierw określ niektóre metody płatności."
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 4e9e2dab26..967930289e 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -20,6 +20,7 @@ pt:
         variant_unit: "Unidade da Variante"
       spree/credit_card:
         base: "Cartão de Crédito"
+        number: "Número"
       order_cycle:
         orders_close_at: Data de fecho
       variant_override:
@@ -1115,6 +1116,9 @@ pt:
       customer_required:
         login: "Entrar"
         contact: "contacto"
+    products:
+      summary:
+        bulk: "Em Massa"
   card_could_not_be_updated: O cartão não pode ser actualizado
   card_could_not_be_saved: o cartão não pode ser guardado
   spree_gateway_error_flash_for_checkout: "Houve um problema com a sua informação de pagamento: %{error}"
@@ -1809,7 +1813,6 @@ pt:
   shop_for_products_html: "Compre produtos da <span class=\"turquoise\">%{enterprise}</span> em:"
   change_shop: "Mudar loja para:"
   shop_at: "Compre agora em:"
-  price_breakdown: "Preço detalhado"
   admin_fee: "Taxa de administração"
   sales_fee: "Taxa de venda"
   packing_fee: "Taxa de embalagem"
@@ -2451,6 +2454,11 @@ pt:
           carrinho baixou. Aqui está o que mudou:
       now_out_of_stock: está agora sem stock.
       only_n_remainging: "agora só tem %{num}restantes."
+    shopfront:
+      variant:
+        add_to_cart: "Adicionar"
+      bulk_buy_modal:
+        max_quantity: "Quantidade máxima"
     variants:
       on_demand:
         'yes': "Sob encomenda"
@@ -2667,15 +2675,6 @@ pt:
     smtp_send_copy_to_this_addresses: "Envia uma cópia de todos os email enviados para este endereço. Para múltiplos endereços, separar por vírgulas."
     intercept_email_address: "Interceptar Endereço de Email"
     intercept_email_instructions: "Substituir destinatário de todos os email por este endereço."
-    image_settings: "Configurações de Imagens"
-    image_settings_warning: "Terá de regenerar os ícones se alterar is estilos. Para tal execute rake paperclip:refresh:thumbnails CLASS=Spree::Image"
-    attachment_default_style: Estilo dos Anexos
-    attachment_default_url: "URL por defeito dos Anexos"
-    attachment_path: "Localização dos Anexos"
-    attachment_styles: "Estilos do Anexo"
-    attachment_url: "URL do Anexo"
-    add_new_style: "Adicionar Novo Estilo"
-    image_settings_updated: "Configurações de Imagens actualizadas com sucesso."
     tax_categories: "Categorias de Impostos"
     listing_tax_categories: "Lista de Categorias de Impostos"
     back_to_tax_categories_list: "Voltar à Lista de Categorias de Impostos"
@@ -2733,7 +2732,9 @@ pt:
     inventory_error_flash_for_insufficient_quantity: "Um item do seu carrinho ficou indisponível."
     inventory: Inventário
     zipcode: Código postal
-    weight: Peso (por kg)
+    successfully_created: '%{resource} foi criado/a com sucesso!'
+    successfully_updated: '%{resource} foi actualizado/a com sucesso!'
+    payment_processing_failed: "O pagamento não pode ser processado, por favor verifique os detalhes que introduziu"
     actions:
       update: "Atualizar"
     shared:
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 3f01065074..a45abf7c7d 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -23,6 +23,10 @@ pt_BR:
         variant_unit_name: "Nome da unidade variante"
       spree/credit_card:
         base: "Cartão de Crédito"
+        number: "Número"
+        month: "Mês"
+        verification_value: "Valor de Verificação"
+        year: "Ano"
       order_cycle:
         orders_close_at: Dia de fechamento
       variant_override:
@@ -121,7 +125,9 @@ pt_BR:
       not_array_error: "deve ser uma matriz"
       invalid_element_error: "deve conter apenas números inteiros válidos"
   datetime_picker_ui:
+    current_text: Agora
     close_text: Feito
+    time_text: Data
   enterprise_mailer:
     confirmation_instructions:
       subject: "Por favor confirme o endereço de e-mail para %{enterprise}"
@@ -229,6 +235,7 @@ pt_BR:
   enterprises: Iniciativas
   enterprise_groups: Grupos
   reports: Relatórios
+  listing_reports: Relatório dos registros
   variant_overrides: Inventário
   import: Importar
   spree_products: Produtos Spree
@@ -598,6 +605,7 @@ pt_BR:
         order_date: "Concluído em"
         max: "Máximo"
         product_unit: "Produto: Unidade"
+        weight_volume: "Peso/Volume (g)"
         ask: "Perguntar?"
         page_title: "Gestão de Pedidos em Massa"
         actions_delete: "Deletar selecionado"
@@ -634,6 +642,8 @@ pt_BR:
           acn_placeholder: 'ex: 987 654 321'
           display_invoice_logo: Exibir logo nas faturas
           invoice_text: 'Adicionar texto customizado no final das faturas '
+          terms_and_conditions: "Termos e Condições"
+          remove_terms_and_conditions: "Remover Arquivo"
         contact:
           name: Nome
           name_placeholder: 'ex: Gustavo Pereira'
@@ -1140,12 +1150,17 @@ pt_BR:
       destroy_attachment_does_not_exist: "Logo não existe"
     enterprise_promo_image:
       destroy_attachment_does_not_exist: "Imagem promocional não existe"
+    enterprise_terms_and_conditions:
+      destroy_attachment_does_not_exist: "O arquivo de Termos e Condições não existe"
     orders:
       failed_to_update: "Falha ao atualizar o pedido"
   checkout:
     already_ordered:
       cart: "Carrinho"
       message_html: "Você já possui um pedido para esta compra. Verifique o %{cart} para ver os itens já encomendados. Você também pode cancelar itens enquanto o ciclo estiver aberto."
+    terms_and_conditions:
+      message_html: "Ao fazer esse pedido você concorda com os%{terms_and_conditions_link}"
+      link_text: "Termos de serviço"
     failed: "O checkout falhou. Informe-nos para que possamos processar seu pedido."
   shops:
     hubs:
@@ -1200,6 +1215,9 @@ pt_BR:
         require_customer_html: "Se quiser começar a comprar aqui, entre em contato com %{enterprise}para saber como."
       select_oc:
         select_oc_html: "Favor <span class='highlighted'>escolher a data que quer receber seu pedido</span> para saber quais produtos estão disponíveis."
+    products:
+      summary:
+        bulk: "Atacado"
   card_could_not_be_updated: Não foi possível atualizar o cartão
   card_could_not_be_saved: o cartão não pôde ser salvo
   spree_gateway_error_flash_for_checkout: "Ocorreu um problema com os seus dados de pagamento: %{error}"
@@ -1907,7 +1925,6 @@ pt_BR:
   shop_for_products_html: "Compre produtos da <span class=\"turquoise\">%{enterprise}</span> em:"
   change_shop: "Mudar loja para:"
   shop_at: "Compre agora em:"
-  price_breakdown: "Preço detalhado"
   admin_fee: "Taxa de manejo"
   sales_fee: "Taxa de venda"
   packing_fee: "Taxa de embalagem"
@@ -1982,6 +1999,7 @@ pt_BR:
   calculator: "Calculadora"
   calculator_values: "Valores da calculadora"
   calculator_settings_warning: "Se você estiver alterando o tipo de calculadora, salve primeiro antes de poder editar as configurações da calculadora."
+  calculator_preferred_unit_error: "Deve ser kg ou lb"
   flat_percent_per_item: "Percentual (por unidade)"
   flat_rate_per_item: "Taxa fixa (por item)"
   flat_rate_per_order: "Taxa fixa ( por pedido)"
@@ -2291,6 +2309,7 @@ pt_BR:
   enterprise_name_error: "já foi tomada. Se esta é sua empresa e você deseja reivindicar a propriedade, ou se deseja negociar com esta empresa, entre em contato com o gerente atual desse perfil em %{email}."
   enterprise_owner_error: "^ %{email} não possui permissão para ter mais iniciativas (o limite é %{enterprise_limit})."
   enterprise_role_uniqueness_error: "^ Esse papel já está presente."
+  enterprise_terms_and_conditions_type_error: "Somente PDFs são aceitos"
   inventory_item_visibility_error: deve ser verdadeiro ou falso
   product_importer_file_error: "erro: nenhum arquivo carregado"
   product_importer_spreadsheet_error: "não foi possível processar o arquivo: tipo de arquivo inválido"
@@ -2572,6 +2591,10 @@ pt_BR:
           images:
             removed_logo_successfully: "Logo removida com sucesso"
             immediate_logo_removal_warning: "A logo será removida imediatamente após a confirmação."
+            removed_promo_image_successfully: "Imagem promocional removida com sucesso"
+            immediate_promo_image_removal_warning: "A imagem promocional será removida imediatamente após a confirmação"
+            immediate_terms_and_conditions_removal_warning: "O arquivo de Termos e Condições será removido imediatamente após confirmação"
+            removed_terms_and_conditions_successfully: "Arquivo de Termos e Condições removido com sucesso"
     insufficient_stock: "Estoque insuficiente disponível, apenas %{on_hand} restante"
     out_of_stock:
       reduced_stock_available: Estoque reduzido disponível
@@ -2580,6 +2603,15 @@ pt_BR:
           em seu carrinho foram reduzidos. Aqui está o que mudou:
       now_out_of_stock: está agora fora de estoque.
       only_n_remainging: "agora só tem %{num} restantes."
+    shopfront:
+      variant:
+        add_to_cart: "Adicionar"
+        in_cart: "no carrinho"
+        quantity_in_cart: "%{quantity}no carrinho"
+      bulk_buy_modal:
+        min_quantity: "quantidade min. "
+        max_quantity: "Quantidade máxima"
+      price_breakdown: "Detalhamento do preço"
     variants:
       on_demand:
         'yes': "Sob encomenda"
@@ -2645,6 +2677,11 @@ pt_BR:
       signup_or_login: "Faça seu cadastro ou login para começar"
       have_an_account: "Já possui um conta?"
       action_login: "Entrar agora"
+    stripe_elements:
+      unknown_error_from_stripe: |
+          Houve um problema ao configurar seu cartão no nosso serviço de pagamento.
+          Favor recarregar a página e tentar novamente. Se não funcionar,
+          por favor entre em contato com o nosso suporte.
   inflections:
     each:
       one: "cada"
@@ -2882,15 +2919,6 @@ pt_BR:
     smtp_send_copy_to_this_addresses: "Envia uma cópia de todos os correios enviados para este endereço. Para vários endereços, separe com vírgulas."
     intercept_email_address: "Interceptar endereço de email"
     intercept_email_instructions: "Substitua o destinatário do email e substitua por este endereço."
-    image_settings: "Configurações de imagem"
-    image_settings_warning: "Você precisará gerar novamente as miniaturas se atualizar os estilos de clipes de papel. Use o clipe de papel rake: refresh: miniaturas CLASS = Spree :: Image para fazer isso."
-    attachment_default_style: Estilo dos Anexos
-    attachment_default_url: "URL padrão de anexos"
-    attachment_path: "Caminho dos Anexos"
-    attachment_styles: "Estilos de clipes de papel"
-    attachment_url: "URL de anexos"
-    add_new_style: "Adicionar novo estilo"
-    image_settings_updated: "Configurações de imagem atualizadas com sucesso."
     tax_categories: "Categorias fiscais"
     listing_tax_categories: "Listando categorias de impostos"
     back_to_tax_categories_list: "Voltar à lista de categorias de impostos"
@@ -2964,11 +2992,18 @@ pt_BR:
     inventory_error_flash_for_insufficient_quantity: "Um item no seu carrinho ficou indisponível."
     inventory: Inventário
     zipcode: CEP
-    weight: Peso (por kg)
+    weight: Peso (por kg ou lb)
     error_user_destroy_with_orders: "Usuários com pedidos concluídos não podem ser excluídos"
     cannot_create_payment_without_payment_methods: "Você não pode criar um pagamento para um pedido sem métodos de pagamento definidos."
     please_define_payment_methods: "Defina primeiro algum método de pagamento."
     options: "Opções"
+    has_no_shipped_units: "não tem itens enviados"
+    successfully_created: '%{resource}foi criado com sucesso!'
+    successfully_updated: '%{resource}foi atualizado com sucesso!'
+    payment_processing_failed: "O pagamento não pôde ser processado, favor verificar os dados informados. "
+    not_available: "N/A"
+    order_populator:
+      out_of_stock: '%{item}fora de estoque. '
     actions:
       update: "Atualizar"
     shared:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b2f7f09cdf..0b1973ed54 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -23,6 +23,10 @@ ru:
         variant_unit_name: "Название Единицы Варианта"
       spree/credit_card:
         base: "Кредитная Карта"
+        number: "Номер"
+        month: "Месяц"
+        verification_value: "Значение Проверки"
+        year: "Год"
       order_cycle:
         orders_close_at: Время Закрытия
       variant_override:
@@ -365,18 +369,18 @@ ru:
       edit:
         title: "Stripe Connect"
         settings: "Настройки"
-        stripe_connect_enabled: Enable shops to accept payments using Stripe Connect?
-        no_api_key_msg: No Stripe account exists for this enterprise.
-        configuration_explanation_html: For detailed instructions on configuring the Stripe Connect integration, please <a href='https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance' target='_blank'>consult this guide</a>.
+        stripe_connect_enabled: Разрешить магазинам принимать платежи с помощью Stripe Connect?
+        no_api_key_msg: У этого предприятия нет учетной записи Stripe.
+        configuration_explanation_html: Подробные инструкции по настройке интеграции Stripe Connect <a href='https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance' target='_blank'>см. в этом руководстве</a> .
         status: Статус
         ok: Ok
-        instance_secret_key: Instance Secret Key
-        account_id: Account ID
-        business_name: Business Name
-        charges_enabled: Charges Enabled
-        charges_enabled_warning: "Warning: Charges are not enabled for your account"
-        auth_fail_error: The API key you provided is invalid
-        empty_api_key_error_html: No Stripe API key has been provided. To set your API key, please follow <a href="https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance" target="_blank">these instructions</a>
+        instance_secret_key: Секретный ключ экземпляра
+        account_id: ID аккаунта
+        business_name: Наименование фирмы
+        charges_enabled: Сборы Включены
+        charges_enabled_warning: "Предупреждение: для вашей учетной записи не включена оплата"
+        auth_fail_error: Указанный вами ключ API недействителен.
+        empty_api_key_error_html: Ключ Stripe API не предоставлен. Чтобы установить ключ API, следуйте <a href="https://github.com/openfoodfoundation/openfoodnetwork/wiki/Setting-up-Stripe-on-an-OFN-instance" target="_blank">этим инструкциям.</a>
     matomo_settings:
       edit:
         title: "Настройки Matomo"
@@ -758,15 +762,15 @@ ru:
           facebook_placeholder: "напр. www.facebook.com/PageNameHere"
           linkedin_placeholder: "напр. www.linkedin.com/in/YourNameHere"
         stripe_connect:
-          connect_with_stripe: "Connect with Stripe"
-          stripe_connect_intro: "To accept payments using credit card, you will need to connect your stripe account to the Open Food Network. Use the button to the right to get started."
-          stripe_account_connected: "Stripe account connected."
-          disconnect: "Disconnect account"
+          connect_with_stripe: "Подключиться к Stripe"
+          stripe_connect_intro: "Чтобы принимать платежи с помощью кредитной карты, вам необходимо подключить свою учетную запись Stripe к Открытой Сети Продуктов. Используйте кнопку справа, чтобы начать."
+          stripe_account_connected: "Аккаунт Stripe подключен."
+          disconnect: "Отключить аккаунт"
           confirm_modal:
-            title: Connect with Stripe
-            part1: Stripe is a payment processing service that allows shops on the OFN to accept credit card payments from customers.
-            part2: To use this feature, you must connect your Stripe account to the OFN. Clicking 'I Agree' below will redirect to you the Stripe website where you can connect an existing Stripe account, or create a new one if you don't already have one.
-            part3: This will allow the Open Food Network to accept credit card payments from customers on your behalf. Please note that you willneed to maintain your own Stripe account, pay the fees Stripe charges and handle any chargebacks and customer service yourself.
+            title: Подключиться к Stripe
+            part1: Stripe - это служба обработки платежей, которая позволяет магазинам в сети ОСП принимать платежи по кредитным картам от клиентов.
+            part2: Чтобы использовать эту функцию, вы должны подключить свою учетную запись Stripe к ОСП. Нажав «Я согласен» ниже, вы перейдете на веб-сайт Stripe, на котором вы можете подключить существующую учетную запись Stripe или создать новую, если у вас ее еще нет.
+            part3: Это позволит Открытой Сети Продуктов принимать платежи по кредитным картам от клиентов от вашего имени. Обратите внимание, что вам нужно будет вести свою учетную запись Stripe, оплачивать сборы Stripe и самостоятельно обрабатывать любые возвратные платежи и обслуживание клиентов.
             i_agree: Согласен
             cancel: Выход
         tag_rules:
@@ -1126,7 +1130,7 @@ ru:
       pause_failure_msg: "Извините, приостановка не удалась!"
       confirm_unpause_msg: "Если в расписании этой подписки есть открытый Цикл заказа, для этого клиента будет создан заказ. Вы уверены, что хотите отменить эту подписку?"
       unpause_failure_msg: "Извините, не удалось возобновить!"
-      confirm_cancel_open_orders_msg: "В настоящее время открыты некоторые заказы на эту подписку. Клиент уже был уведомлен о том, что заказ будет размещен. Вы хотите отменить эти заказы или оставить их?"
+      confirm_cancel_open_orders_msg: "В настоящее время открыты некоторые заказы на эту подписку. Клиент уже был уведомлен о том, что заказ будет размещен. Вы хотите отменить этот заказ(ы) или оставить его?"
       resume_canceled_orders_msg: "Некоторые заказы по этой подписке могут быть возобновлены прямо сейчас. Вы можете возобновить их из выпадающего списка заказов."
       yes_cancel_them: Отменить их
       no_keep_them: Оставить их
@@ -1141,11 +1145,11 @@ ru:
         associated_subscriptions_error: Это расписание не может быть удалено, потому что оно имеет связанные подписки
     controllers:
       enterprises:
-        stripe_connect_cancelled: "Connection to Stripe has been cancelled"
-        stripe_connect_success: "Stripe account connected successfully"
-        stripe_connect_fail: Sorry, the connection of your Stripe account failed
+        stripe_connect_cancelled: "Подключение к Stripe было отменено"
+        stripe_connect_success: "Аккаунт Stripe успешно подключен"
+        stripe_connect_fail: К сожалению, не удалось подключиться к вашей учетной записи Stripe
       stripe_connect_settings:
-        resource: Stripe Connect configuration
+        resource: Конфигурация Stripe Connect
   api:
     enterprise_logo:
       destroy_attachment_does_not_exist: "Логотип не существует"
@@ -1216,6 +1220,9 @@ ru:
         require_customer_html: "Если Вы хотите покупать здесь, пожалуйста %{contact} %{enterprise} и спросите о присоединении."
       select_oc:
         select_oc_html: "Пожалуйста, <span class='highlighted'>выберите, когда вы хотите заказать</span>, чтобы увидеть какие товары доступны."
+    products:
+      summary:
+        bulk: "Массовый"
   card_could_not_be_updated: Карта не может быть обновлена
   card_could_not_be_saved: карта не может быть сохранена
   spree_gateway_error_flash_for_checkout: "Возникла проблема с вашей платежной информацией: %{error}"
@@ -1333,7 +1340,7 @@ ru:
   card_securitycode: "Секретный код"
   card_expiry_date: Срок действия
   card_masked_digit: "X"
-  card_expiry_abbreviation: "Exp"
+  card_expiry_abbreviation: "Срок действия"
   new_credit_card: "Новая кредитная карта"
   my_credit_cards: Мои кредитные карты
   add_new_credit_card: Добавить новую кредитную карту
@@ -1365,7 +1372,7 @@ ru:
       cookie_consent_desc: "Используется для поддержания статуса согласия пользователя на хранение куки"
       cookie_remember_me_desc: "Используется, если пользователь запросил сайт, чтобы запомнить его. Этот файл cookie автоматически удаляется через 12 дней. Если вы как пользователь хотите удалить этот файл cookie, вам нужно только выйти из системы. Если вы не хотите, чтобы этот файл cookie устанавливался на ваш компьютер, не следует ставить флажок “запомнить меня” при входе в систему."
       cookie_openstreemap_desc: "Используется нашим дружественным картографическим провайдером с открытым исходным кодом (OpenStreetMap), чтобы гарантировать, что он не получает слишком много запросов в течение определенного периода времени, чтобы предотвратить злоупотребление их услугами."
-      cookie_stripe_desc: "Data collected by our payment processor Stripe for fraud detection https://stripe.com/cookies-policy/legal. Not all shops use Stripe as a payment method but it is a good practice to prevent fraud to apply it to all pages. Stripe probably build a picture of which of our pages usually interact with their API and then flag anything unusual. So setting the Stripe cookie has a broader function than simply the provision of a payment method to a user. Removing it could affect the security of the service itself. You can learn more about Stripe and read its privacy policy at https://stripe.com/privacy."
+      cookie_stripe_desc: "Данные, собираемые нашей платежной системой Stripe для обнаружения мошенничества https://stripe.com/cookies-policy/legal. Не все магазины используют Stripe в качестве метода оплаты, но для предотвращения мошенничества рекомендуется применять его ко всем страницам. Stripe, вероятно, создаст картину того, какие из наших страниц обычно взаимодействуют со своим API, а затем пометит что-то необычное. Таким образом, установка Stripe cookie имеет более широкую функцию, чем просто предоставление пользователю способа оплаты. Его удаление может повлиять на безопасность самой службы. Вы можете узнать больше о Stripe и ознакомиться с его политикой конфиденциальности на https://stripe.com/privacy."
       statistics_cookies: "Статистика Cookies"
       statistics_cookies_desc: "Следующие указания не являются строго необходимыми, но помогают предоставить вам лучший пользовательский опыт, позволяя нам анализировать поведение пользователей, определять, какие функции вы используете чаще всего или не используете, понимать проблемы взаимодействия с пользователем и т.д."
       statistics_cookies_matomo_desc_html: "Для сбора и анализа данных об использовании платформы мы используем <a href='https://matomo.org/' target='_blank'>Matomo</a> (бывший Piwik), инструмент для анализа с открытым исходным кодом, совместимый с GDPR и защищающий вашу конфиденциальность."
@@ -1580,7 +1587,7 @@ ru:
   products_clear: Сбросить
   products_showing: "Показать:"
   products_results_for: "Результаты для"
-  products_or: "ИЛИ"
+  products_or: "или"
   products_and: "и"
   products_filters_in: "в"
   products_with: с
@@ -1927,7 +1934,6 @@ ru:
   shop_for_products_html: "Покупайте товары <span class=\"turquoise\">%{enterprise}</span> по адресу:"
   change_shop: "Изменить магазин на:"
   shop_at: "Магазин сейчас на:"
-  price_breakdown: "Полная разбивка цен"
   admin_fee: "Административный сбор"
   sales_fee: "Сбор с продаж"
   packing_fee: "Оплата упаковки"
@@ -2002,6 +2008,7 @@ ru:
   calculator: "Калькулятор"
   calculator_values: "Значения"
   calculator_settings_warning: "Если Вы меняете тип калькулятора, то должны сначала сохранить его, прежде чем редактировать настройки калькулятора."
+  calculator_preferred_unit_error: "должно быть кг или фунт"
   flat_percent_per_item: "Процент (с единицы товара)"
   flat_rate_per_item: "Ставка (с единицы товара)"
   flat_rate_per_order: "Ставка (с заказа)"
@@ -2136,7 +2143,7 @@ ru:
   report_header_suburb: Город
   report_header_address: Адрес
   report_header_billing_address: Платёжный Адрес
-  report_header_relationship: Relationship
+  report_header_relationship: Отношения
   report_header_hub: Центр
   report_header_hub_address: Адрес Центра
   report_header_to_hub: В Центр
@@ -2152,13 +2159,13 @@ ru:
   report_header_ship_city: Город Доставки
   report_header_ship_postcode: Индекс Доставки
   report_header_ship_state: Область Доставки
-  report_header_billing_street: Billing Street
-  report_header_billing_street_2: Billing Street 2
-  report_header_billing_street_3: Billing Street 3
-  report_header_billing_street_4: Billing Street 4
-  report_header_billing_city: Billing City
-  report_header_billing_postcode: Billing Zip code
-  report_header_billing_state: Billing State
+  report_header_billing_street: Платежная улица
+  report_header_billing_street_2: Платежная улица 2
+  report_header_billing_street_3: Платежная улица 3
+  report_header_billing_street_4: Платежная улица 4
+  report_header_billing_city: Город платежа
+  report_header_billing_postcode: Почтовый индекс платежа
+  report_header_billing_state: Область платежа
   report_header_incoming_transport: Входящий Транспорт
   report_header_special_instructions: Специальные Инструкции
   report_header_order_number: Номер заказа
@@ -2191,7 +2198,7 @@ ru:
   report_header_producer: Производитель
   report_header_producer_suburb: Город Производителя
   report_header_unit: Единица измерения
-  report_header_group_buy_unit_quantity: Group Buy Unit Количество
+  report_header_group_buy_unit_quantity: Группа покупает количество единиц
   report_header_cost: Стоимость
   report_header_shipping_cost: Стоимость доставки
   report_header_curr_cost_per_unit: Текущ. Стоимость за единицу
@@ -2305,14 +2312,14 @@ ru:
   validation_msg_at_least_one_hub: "^Должен быть выбран хотя бы один Центр"
   validation_msg_tax_category_cant_be_blank: "^Налоговая Категория не может быть пустой"
   validation_msg_is_associated_with_an_exising_customer: "связан с существующим клиентом"
-  content_configuration_pricing_table: "(TODO: Pricing table)"
-  content_configuration_case_studies: "(TODO: Case studies)"
-  content_configuration_detail: "(TODO: Detail)"
+  content_configuration_pricing_table: "(СДЕЛАТЬ: таблица цен)"
+  content_configuration_case_studies: "(СДЕЛАТЬ: Примеры из практики)"
+  content_configuration_detail: "(СДЕЛАТЬ: Подробно)"
   enterprise_name_error: "уже использовано. Если это Ваше предприятие и Вы хотите претендовать на право владения или если Вы хотите торговать с этим Предприятием, пожалуйста, свяжитесь с текущим менеджером этого профиля по адресу %{email}."
   enterprise_owner_error: "^%{email} не разрешается владеть другими предприятиями (лимит %{enterprise_limit})."
   enterprise_role_uniqueness_error: "^Эта роль уже существует."
   enterprise_terms_and_conditions_type_error: "Разрешены только PDF файлы"
-  inventory_item_visibility_error: должен быть true или false
+  inventory_item_visibility_error: должен быть Истина или Ложь
   product_importer_file_error: "ошибка: файл не загружен"
   product_importer_spreadsheet_error: "не удалось обработать файл: неверный тип файла"
   product_importer_products_save_error: ни один из товаров не сохранён
@@ -2560,7 +2567,7 @@ ru:
           invalid: "Недействительный"
       resend_user_email_confirmation:
         resend: "Повторно отправить"
-        sending: "П\"овторная Отправка...\""
+        sending: "Повторная Отправка..."
         done: "Повторно Отправлено ✓"
         failed: "Неудачная повторная отправка ✗"
       order_cycles:
@@ -2605,6 +2612,15 @@ ru:
           в вашей корзине снизился. Вот что изменилось:
       now_out_of_stock: сейчас нет в наличии.
       only_n_remainging: "теперь осталось только %{num}."
+    shopfront:
+      variant:
+        add_to_cart: "Добавить"
+        in_cart: "в корзине"
+        quantity_in_cart: "%{quantity} в корзине"
+      bulk_buy_modal:
+        min_quantity: "Мин. количество"
+        max_quantity: "Макс количество"
+      price_breakdown: "Разбивка цен"
     variants:
       on_demand:
         'yes': "По Запросу"
@@ -2960,15 +2976,6 @@ ru:
     smtp_send_copy_to_this_addresses: "Копии всех исходящих писем отправляются на этот адрес. Для указания нескольких адресов, разделяйте запятыми"
     intercept_email_address: "Перехватить адрес электронной почты"
     intercept_email_instructions: "Переопределить получателя электронной почты и заменить его на этот адрес."
-    image_settings: "Настройки Изображения"
-    image_settings_warning: "Вам нужно будет восстановить миниатюры, если вы обновите paperclip стили. Для этого выполните: rake paperclip:refresh:thumbnails CLASS=Spree::Image."
-    attachment_default_style: Стиль вложений
-    attachment_default_url: "URL По Умолчанию Для Вложений"
-    attachment_path: "Путь К Вложениям"
-    attachment_styles: "Paperclip Стили"
-    attachment_url: "URL вложений"
-    add_new_style: "Добавить Новый Стиль"
-    image_settings_updated: "Настройки Изображения успешно обновлены."
     tax_categories: "Налоговые Категории"
     listing_tax_categories: "Список Налоговых Категорий"
     back_to_tax_categories_list: "Назад К Списку Налоговых Категорий"
@@ -3042,11 +3049,18 @@ ru:
     inventory_error_flash_for_insufficient_quantity: "Один из товаров вашей корзины стал недоступен."
     inventory: Товарная Номенклатура
     zipcode: Почтовый индекс
-    weight: Вес (за кг)
+    weight: Вес (на кг или фунт)
     error_user_destroy_with_orders: "Пользователи с выполненными заказами не могут быть удалены"
     cannot_create_payment_without_payment_methods: "Нельзя создать платеж для заказа, если не настроен ни один из способов оплаты."
     please_define_payment_methods: "Сначала определите способ оплаты."
     options: "Опции"
+    has_no_shipped_units: "не имеет отгруженных единиц"
+    successfully_created: '%{resource} был успешно создан!'
+    successfully_updated: '%{resource} был успешно обновлён!'
+    payment_processing_failed: "Платеж не может быть обработан, пожалуйста, проверьте введенные данные"
+    not_available: "Нет данных"
+    order_populator:
+      out_of_stock: '%{item} отсутствует в наличии.'
     actions:
       update: "Обновить"
     shared:
@@ -3060,7 +3074,7 @@ ru:
       payments_list:
         date_time: "Дата/Время"
         amount: "К оплате"
-        payment_method: "Payment Method"
+        payment_method: "Способ Оплаты"
         payment_state: "Состояние Платежа"
     errors:
       messages:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7ce7b4edde..f9011557c1 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -659,6 +659,9 @@ sv:
       customer_required:
         login: "Logga in"
         contact: "kontakta"
+    products:
+      summary:
+        bulk: "Grupp"
   invoice_billing_address: "Faktureringsadress"
   invoice_column_tax: "VAT"
   invoice_column_price: "Pris"
@@ -1243,7 +1246,6 @@ sv:
   shop_for_products_html: "Köp för <span class=\"turquoise\">%{enterprise}</span> produkter vid:"
   change_shop: "Ändra butik till:"
   shop_at: "Köp nu vid:"
-  price_breakdown: "Prisfördelning"
   admin_fee: "Administrationsavgift"
   sales_fee: "Försäljningsavgift"
   packing_fee: "Förpackningsvgift"
@@ -1799,6 +1801,11 @@ sv:
           kundvagn minskat. Detta har ändrats:
       now_out_of_stock: Är nu slut
       only_n_remainging: "nu  återstår endast %{num}"
+    shopfront:
+      variant:
+        add_to_cart: "Tillägga"
+      bulk_buy_modal:
+        max_quantity: "Maxkvantitet"
     variants:
       on_demand:
         'yes': "På begäran "
@@ -1923,7 +1930,6 @@ sv:
     amount: "Belopp"
     inventory: Lager
     zipcode: Postkod
-    weight: Vikt (kg)
     actions:
       update: "Uppdatera"
     shared:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 946cd1f6b8..8154b019d6 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -23,6 +23,7 @@ tr:
         variant_unit_name: "Varyant Birim Adı"
       spree/credit_card:
         base: "Kredİ kartı"
+        number: "Numara"
       order_cycle:
         orders_close_at: BİTİŞ TARİHİ
       variant_override:
@@ -1213,6 +1214,9 @@ tr:
         require_customer_html: "Buradan alışveriş yapmaya başlamak istiyorsanız, katılmak için lütfen sorun: %{contact} %{enterprise} "
       select_oc:
         select_oc_html: "Hangi ürünlerin uygun olduğunu görmek için lütfen <span class='highlighted'>ne zaman için sipariş vermek istediğinizi seçin</span> "
+    products:
+      summary:
+        bulk: "toplu"
   card_could_not_be_updated: Kart güncellenemedi
   card_could_not_be_saved: kart kaydedilemedi
   spree_gateway_error_flash_for_checkout: "Ödeme bilgilerinizde bir sorun oluştu: %{error}"
@@ -1920,7 +1924,6 @@ tr:
   shop_for_products_html: "<span class=\"turquoise\">%{enterprise}</span> ÜRÜNLERİNİ SATIN ALIN:"
   change_shop: "Dükkanı şuna değiştir:"
   shop_at: "ŞİMDİ ALIŞVERİŞ YAPIN:"
-  price_breakdown: "Fiyat dökümü"
   admin_fee: "Yönetim Ücreti"
   sales_fee: "Satış Ücreti"
   packing_fee: "Paketleme Ücreti"
@@ -2595,6 +2598,11 @@ tr:
           stok seviyesi düşürüldü. Değişiklikler:
       now_out_of_stock: artık stokta yok.
       only_n_remainging: "artık sadece %{num} kaldı."
+    shopfront:
+      variant:
+        add_to_cart: "Ekle"
+      bulk_buy_modal:
+        max_quantity: "Maks miktar"
     variants:
       on_demand:
         'yes': "Talep üzerine"
@@ -2901,15 +2909,6 @@ tr:
     smtp_send_copy_to_this_addresses: "Tüm giden postaların bir kopyasını bu adrese gönderir. Birden çok adres için virgülle ayırın."
     intercept_email_address: "Durdurma E-posta Adresi"
     intercept_email_instructions: "E-posta alıcısını geçersiz kılın ve bu adresle değiştirin."
-    image_settings: "Görüntü Ayarları"
-    image_settings_warning: "Ataç stillerini güncellerseniz küçük resimleri yeniden oluşturmanız gerekir. Bunu yapmak için rake ataç kullanın: refresh: thumbnail CLASS = Spree :: Image."
-    attachment_default_style: Ekler Stili
-    attachment_default_url: "Ekler Varsayılan URL"
-    attachment_path: "Ekler Yolu"
-    attachment_styles: "Ataç Stilleri"
-    attachment_url: "Ek URL'si"
-    add_new_style: "Yeni Stil Ekle"
-    image_settings_updated: "Görüntü Ayarları başarıyla güncellendi."
     tax_categories: "Vergi Kategorileri"
     listing_tax_categories: "Vergi Kategorileri Listeleniyor"
     back_to_tax_categories_list: "Vergi Kategorileri Listesine Geri Dön"
@@ -2983,11 +2982,13 @@ tr:
     inventory_error_flash_for_insufficient_quantity: "Sepetinizdeki bir ürün artık mevcut değil."
     inventory: Stok
     zipcode: posta kodu
-    weight: Ağırlık (kg başına)
     error_user_destroy_with_orders: "Siparişleri tamamlanmış kullanıcılar silinemez"
     cannot_create_payment_without_payment_methods: "Herhangi bir ödeme yöntemi belirlemeden bir sipariş oluşturamazsınız."
     please_define_payment_methods: "Lütfen önce ödeme bir yöntemi belirleyin."
     options: "Seçenekler"
+    successfully_created: '%{resource} BAŞARIYLA OLUŞTURULDU!'
+    successfully_updated: '%{resource} BAŞARIYLA GÜNCELLENDİ!'
+    payment_processing_failed: "Ödeme işlenemedi, lütfen girdiğiniz bilgileri kontrol edin"
     actions:
       update: "Güncelle"
     shared:
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index 5aecadbf49..cb35c08cbc 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -134,8 +134,6 @@ Spree::Core::Engine.routes.draw do
       post :testmail, :on => :collection
     end
 
-    resource :image_settings
-
     resources :zones
     resources :countries do
       resources :states
diff --git a/db/default/countries.rb b/db/default/countries.rb
new file mode 100644
index 0000000000..1df48ed11b
--- /dev/null
+++ b/db/default/countries.rb
@@ -0,0 +1,230 @@
+Spree::Country.create!([
+  { name: "Chad", iso3: "TCD", iso: "TD", iso_name: "CHAD", numcode: "148" },
+  { name: "Faroe Islands", iso3: "FRO", iso: "FO", iso_name: "FAROE ISLANDS", numcode: "234" },
+  { name: "India", iso3: "IND", iso: "IN", iso_name: "INDIA", numcode: "356" },
+  { name: "Nicaragua", iso3: "NIC", iso: "NI", iso_name: "NICARAGUA", numcode: "558" },
+  { name: "Saint Lucia", iso3: "LCA", iso: "LC", iso_name: "SAINT LUCIA", numcode: "662" },
+  { name: "Fiji", iso3: "FJI", iso: "FJ", iso_name: "FIJI", numcode: "242" },
+  { name: "Indonesia", iso3: "IDN", iso: "ID", iso_name: "INDONESIA", numcode: "360" },
+  { name: "Niger", iso3: "NER", iso: "NE", iso_name: "NIGER", numcode: "562" },
+  { name: "Saint Pierre and Miquelon", iso3: "SPM", iso: "PM", iso_name: "SAINT PIERRE AND MIQUELON", numcode: "666" },
+  { name: "Finland", iso3: "FIN", iso: "FI", iso_name: "FINLAND", numcode: "246" },
+  { name: "Nigeria", iso3: "NGA", iso: "NG", iso_name: "NIGERIA", numcode: "566" },
+  { name: "Saint Vincent and the Grenadines", iso3: "VCT", iso: "VC", iso_name: "SAINT VINCENT AND THE GRENADINES", numcode: "670" },
+  { name: "France", iso3: "FRA", iso: "FR", iso_name: "FRANCE", numcode: "250" },
+  { name: "Iran, Islamic Republic of", iso3: "IRN", iso: "IR", iso_name: "IRAN, ISLAMIC REPUBLIC OF", numcode: "364" },
+  { name: "Niue", iso3: "NIU", iso: "NU", iso_name: "NIUE", numcode: "570" },
+  { name: "Samoa", iso3: "WSM", iso: "WS", iso_name: "SAMOA", numcode: "882" },
+  { name: "French Guiana", iso3: "GUF", iso: "GF", iso_name: "FRENCH GUIANA", numcode: "254" },
+  { name: "Iraq", iso3: "IRQ", iso: "IQ", iso_name: "IRAQ", numcode: "368" },
+  { name: "San Marino", iso3: "SMR", iso: "SM", iso_name: "SAN MARINO", numcode: "674" },
+  { name: "Ireland", iso3: "IRL", iso: "IE", iso_name: "IRELAND", numcode: "372" },
+  { name: "Sao Tome and Principe", iso3: "STP", iso: "ST", iso_name: "SAO TOME AND PRINCIPE", numcode: "678" },
+  { name: "Israel", iso3: "ISR", iso: "IL", iso_name: "ISRAEL", numcode: "376" },
+  { name: "Saudi Arabia", iso3: "SAU", iso: "SA", iso_name: "SAUDI ARABIA", numcode: "682" },
+  { name: "Italy", iso3: "ITA", iso: "IT", iso_name: "ITALY", numcode: "380" },
+  { name: "Senegal", iso3: "SEN", iso: "SN", iso_name: "SENEGAL", numcode: "686" },
+  { name: "Jamaica", iso3: "JAM", iso: "JM", iso_name: "JAMAICA", numcode: "388" },
+  { name: "Japan", iso3: "JPN", iso: "JP", iso_name: "JAPAN", numcode: "392" },
+  { name: "Jordan", iso3: "JOR", iso: "JO", iso_name: "JORDAN", numcode: "400" },
+  { name: "Belgium", iso3: "BEL", iso: "BE", iso_name: "BELGIUM", numcode: "56" },
+  { name: "Belize", iso3: "BLZ", iso: "BZ", iso_name: "BELIZE", numcode: "84" },
+  { name: "Kazakhstan", iso3: "KAZ", iso: "KZ", iso_name: "KAZAKHSTAN", numcode: "398" },
+  { name: "Uganda", iso3: "UGA", iso: "UG", iso_name: "UGANDA", numcode: "800" },
+  { name: "Benin", iso3: "BEN", iso: "BJ", iso_name: "BENIN", numcode: "204" },
+  { name: "Kenya", iso3: "KEN", iso: "KE", iso_name: "KENYA", numcode: "404" },
+  { name: "Ukraine", iso3: "UKR", iso: "UA", iso_name: "UKRAINE", numcode: "804" },
+  { name: "Bermuda", iso3: "BMU", iso: "BM", iso_name: "BERMUDA", numcode: "60" },
+  { name: "Kiribati", iso3: "KIR", iso: "KI", iso_name: "KIRIBATI", numcode: "296" },
+  { name: "Mexico", iso3: "MEX", iso: "MX", iso_name: "MEXICO", numcode: "484" },
+  { name: "United Arab Emirates", iso3: "ARE", iso: "AE", iso_name: "UNITED ARAB EMIRATES", numcode: "784" },
+  { name: "Bhutan", iso3: "BTN", iso: "BT", iso_name: "BHUTAN", numcode: "64" },
+  { name: "Cuba", iso3: "CUB", iso: "CU", iso_name: "CUBA", numcode: "192" },
+  { name: "North Korea", iso3: "PRK", iso: "KP", iso_name: "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", numcode: "408" },
+  { name: "Micronesia, Federated States of", iso3: "FSM", iso: "FM", iso_name: "MICRONESIA, FEDERATED STATES OF", numcode: "583" },
+  { name: "United Kingdom", iso3: "GBR", iso: "GB", iso_name: "UNITED KINGDOM", numcode: "826" },
+  { name: "Bolivia", iso3: "BOL", iso: "BO", iso_name: "BOLIVIA", numcode: "68" },
+  { name: "Cyprus", iso3: "CYP", iso: "CY", iso_name: "CYPRUS", numcode: "196" },
+  { name: "South Korea", iso3: "KOR", iso: "KR", iso_name: "KOREA, REPUBLIC OF", numcode: "410" },
+  { name: "Moldova, Republic of", iso3: "MDA", iso: "MD", iso_name: "MOLDOVA, REPUBLIC OF", numcode: "498" },
+  { name: "United States", iso3: "USA", iso: "US", iso_name: "UNITED STATES", numcode: "840" },
+  { name: "Bosnia and Herzegovina", iso3: "BIH", iso: "BA", iso_name: "BOSNIA AND HERZEGOVINA", numcode: "70" },
+  { name: "Czech Republic", iso3: "CZE", iso: "CZ", iso_name: "CZECH REPUBLIC", numcode: "203" },
+  { name: "Kuwait", iso3: "KWT", iso: "KW", iso_name: "KUWAIT", numcode: "414" },
+  { name: "Monaco", iso3: "MCO", iso: "MC", iso_name: "MONACO", numcode: "492" },
+  { name: "Uruguay", iso3: "URY", iso: "UY", iso_name: "URUGUAY", numcode: "858" },
+  { name: "Botswana", iso3: "BWA", iso: "BW", iso_name: "BOTSWANA", numcode: "72" },
+  { name: "Denmark", iso3: "DNK", iso: "DK", iso_name: "DENMARK", numcode: "208" },
+  { name: "Guadeloupe", iso3: "GLP", iso: "GP", iso_name: "GUADELOUPE", numcode: "312" },
+  { name: "Kyrgyzstan", iso3: "KGZ", iso: "KG", iso_name: "KYRGYZSTAN", numcode: "417" },
+  { name: "Mongolia", iso3: "MNG", iso: "MN", iso_name: "MONGOLIA", numcode: "496" },
+  { name: "Philippines", iso3: "PHL", iso: "PH", iso_name: "PHILIPPINES", numcode: "608" },
+  { name: "Brazil", iso3: "BRA", iso: "BR", iso_name: "BRAZIL", numcode: "76" },
+  { name: "Djibouti", iso3: "DJI", iso: "DJ", iso_name: "DJIBOUTI", numcode: "262" },
+  { name: "Guam", iso3: "GUM", iso: "GU", iso_name: "GUAM", numcode: "316" },
+  { name: "Lao People's Democratic Republic", iso3: "LAO", iso: "LA", iso_name: "LAO PEOPLE'S DEMOCRATIC REPUBLIC", numcode: "418" },
+  { name: "Montserrat", iso3: "MSR", iso: "MS", iso_name: "MONTSERRAT", numcode: "500" },
+  { name: "Pitcairn", iso3: "PCN", iso: "PN", iso_name: "PITCAIRN", numcode: "612" },
+  { name: "Uzbekistan", iso3: "UZB", iso: "UZ", iso_name: "UZBEKISTAN", numcode: "860" },
+  { name: "Brunei Darussalam", iso3: "BRN", iso: "BN", iso_name: "BRUNEI DARUSSALAM", numcode: "96" },
+  { name: "Dominica", iso3: "DMA", iso: "DM", iso_name: "DOMINICA", numcode: "212" },
+  { name: "Guatemala", iso3: "GTM", iso: "GT", iso_name: "GUATEMALA", numcode: "320" },
+  { name: "Morocco", iso3: "MAR", iso: "MA", iso_name: "MOROCCO", numcode: "504" },
+  { name: "Poland", iso3: "POL", iso: "PL", iso_name: "POLAND", numcode: "616" },
+  { name: "Vanuatu", iso3: "VUT", iso: "VU", iso_name: "VANUATU", numcode: "548" },
+  { name: "Dominican Republic", iso3: "DOM", iso: "DO", iso_name: "DOMINICAN REPUBLIC", numcode: "214" },
+  { name: "Mozambique", iso3: "MOZ", iso: "MZ", iso_name: "MOZAMBIQUE", numcode: "508" },
+  { name: "Portugal", iso3: "PRT", iso: "PT", iso_name: "PORTUGAL", numcode: "620" },
+  { name: "Sudan", iso3: "SDN", iso: "SD", iso_name: "SUDAN", numcode: "736" },
+  { name: "Venezuela", iso3: "VEN", iso: "VE", iso_name: "VENEZUELA", numcode: "862" },
+  { name: "Ecuador", iso3: "ECU", iso: "EC", iso_name: "ECUADOR", numcode: "218" },
+  { name: "Guinea", iso3: "GIN", iso: "GN", iso_name: "GUINEA", numcode: "324" },
+  { name: "Myanmar", iso3: "MMR", iso: "MM", iso_name: "MYANMAR", numcode: "104" },
+  { name: "Puerto Rico", iso3: "PRI", iso: "PR", iso_name: "PUERTO RICO", numcode: "630" },
+  { name: "Suriname", iso3: "SUR", iso: "SR", iso_name: "SURINAME", numcode: "740" },
+  { name: "Viet Nam", iso3: "VNM", iso: "VN", iso_name: "VIET NAM", numcode: "704" },
+  { name: "Egypt", iso3: "EGY", iso: "EG", iso_name: "EGYPT", numcode: "818" },
+  { name: "Guinea-Bissau", iso3: "GNB", iso: "GW", iso_name: "GUINEA-BISSAU", numcode: "624" },
+  { name: "Namibia", iso3: "NAM", iso: "NA", iso_name: "NAMIBIA", numcode: "516" },
+  { name: "Qatar", iso3: "QAT", iso: "QA", iso_name: "QATAR", numcode: "634" },
+  { name: "Svalbard and Jan Mayen", iso3: "SJM", iso: "SJ", iso_name: "SVALBARD AND JAN MAYEN", numcode: "744" },
+  { name: "El Salvador", iso3: "SLV", iso: "SV", iso_name: "EL SALVADOR", numcode: "222" },
+  { name: "Guyana", iso3: "GUY", iso: "GY", iso_name: "GUYANA", numcode: "328" },
+  { name: "Reunion", iso3: "REU", iso: "RE", iso_name: "REUNION", numcode: "638" },
+  { name: "Haiti", iso3: "HTI", iso: "HT", iso_name: "HAITI", numcode: "332" },
+  { name: "Romania", iso3: "ROM", iso: "RO", iso_name: "ROMANIA", numcode: "642" },
+  { name: "Swaziland", iso3: "SWZ", iso: "SZ", iso_name: "SWAZILAND", numcode: "748" },
+  { name: "Holy See (Vatican City State)", iso3: "VAT", iso: "VA", iso_name: "HOLY SEE (VATICAN CITY STATE)", numcode: "336" },
+  { name: "Russian Federation", iso3: "RUS", iso: "RU", iso_name: "RUSSIAN FEDERATION", numcode: "643" },
+  { name: "Sweden", iso3: "SWE", iso: "SE", iso_name: "SWEDEN", numcode: "752" },
+  { name: "Honduras", iso3: "HND", iso: "HN", iso_name: "HONDURAS", numcode: "340" },
+  { name: "Rwanda", iso3: "RWA", iso: "RW", iso_name: "RWANDA", numcode: "646" },
+  { name: "Switzerland", iso3: "CHE", iso: "CH", iso_name: "SWITZERLAND", numcode: "756" },
+  { name: "Hong Kong", iso3: "HKG", iso: "HK", iso_name: "HONG KONG", numcode: "344" },
+  { name: "Syrian Arab Republic", iso3: "SYR", iso: "SY", iso_name: "SYRIAN ARAB REPUBLIC", numcode: "760" },
+  { name: "Taiwan", iso3: "TWN", iso: "TW", iso_name: "TAIWAN, PROVINCE OF CHINA", numcode: "158" },
+  { name: "Tajikistan", iso3: "TJK", iso: "TJ", iso_name: "TAJIKISTAN", numcode: "762" },
+  { name: "Tanzania, United Republic of", iso3: "TZA", iso: "TZ", iso_name: "TANZANIA, UNITED REPUBLIC OF", numcode: "834" },
+  { name: "Armenia", iso3: "ARM", iso: "AM", iso_name: "ARMENIA", numcode: "51" },
+  { name: "Aruba", iso3: "ABW", iso: "AW", iso_name: "ARUBA", numcode: "533" },
+  { name: "Australia", iso3: "AUS", iso: "AU", iso_name: "AUSTRALIA", numcode: "36" },
+  { name: "Thailand", iso3: "THA", iso: "TH", iso_name: "THAILAND", numcode: "764" },
+  { name: "Austria", iso3: "AUT", iso: "AT", iso_name: "AUSTRIA", numcode: "40" },
+  { name: "Madagascar", iso3: "MDG", iso: "MG", iso_name: "MADAGASCAR", numcode: "450" },
+  { name: "Togo", iso3: "TGO", iso: "TG", iso_name: "TOGO", numcode: "768" },
+  { name: "Azerbaijan", iso3: "AZE", iso: "AZ", iso_name: "AZERBAIJAN", numcode: "31" },
+  { name: "Chile", iso3: "CHL", iso: "CL", iso_name: "CHILE", numcode: "152" },
+  { name: "Malawi", iso3: "MWI", iso: "MW", iso_name: "MALAWI", numcode: "454" },
+  { name: "Tokelau", iso3: "TKL", iso: "TK", iso_name: "TOKELAU", numcode: "772" },
+  { name: "Bahamas", iso3: "BHS", iso: "BS", iso_name: "BAHAMAS", numcode: "44" },
+  { name: "China", iso3: "CHN", iso: "CN", iso_name: "CHINA", numcode: "156" },
+  { name: "Malaysia", iso3: "MYS", iso: "MY", iso_name: "MALAYSIA", numcode: "458" },
+  { name: "Tonga", iso3: "TON", iso: "TO", iso_name: "TONGA", numcode: "776" },
+  { name: "Bahrain", iso3: "BHR", iso: "BH", iso_name: "BAHRAIN", numcode: "48" },
+  { name: "Colombia", iso3: "COL", iso: "CO", iso_name: "COLOMBIA", numcode: "170" },
+  { name: "Maldives", iso3: "MDV", iso: "MV", iso_name: "MALDIVES", numcode: "462" },
+  { name: "Trinidad and Tobago", iso3: "TTO", iso: "TT", iso_name: "TRINIDAD AND TOBAGO", numcode: "780" },
+  { name: "Bangladesh", iso3: "BGD", iso: "BD", iso_name: "BANGLADESH", numcode: "50" },
+  { name: "Comoros", iso3: "COM", iso: "KM", iso_name: "COMOROS", numcode: "174" },
+  { name: "French Polynesia", iso3: "PYF", iso: "PF", iso_name: "FRENCH POLYNESIA", numcode: "258" },
+  { name: "Mali", iso3: "MLI", iso: "ML", iso_name: "MALI", numcode: "466" },
+  { name: "Norfolk Island", iso3: "NFK", iso: "NF", iso_name: "NORFOLK ISLAND", numcode: "574" },
+  { name: "Tunisia", iso3: "TUN", iso: "TN", iso_name: "TUNISIA", numcode: "788" },
+  { name: "Barbados", iso3: "BRB", iso: "BB", iso_name: "BARBADOS", numcode: "52" },
+  { name: "Congo", iso3: "COG", iso: "CG", iso_name: "CONGO", numcode: "178" },
+  { name: "Gabon", iso3: "GAB", iso: "GA", iso_name: "GABON", numcode: "266" },
+  { name: "Malta", iso3: "MLT", iso: "MT", iso_name: "MALTA", numcode: "470" },
+  { name: "Northern Mariana Islands", iso3: "MNP", iso: "MP", iso_name: "NORTHERN MARIANA ISLANDS", numcode: "580" },
+  { name: "Turkey", iso3: "TUR", iso: "TR", iso_name: "TURKEY", numcode: "792" },
+  { name: "Congo, the Democratic Republic of the", iso3: "COD", iso: "CD", iso_name: "CONGO, THE DEMOCRATIC REPUBLIC OF THE", numcode: "180" },
+  { name: "Marshall Islands", iso3: "MHL", iso: "MH", iso_name: "MARSHALL ISLANDS", numcode: "584" },
+  { name: "Norway", iso3: "NOR", iso: "NO", iso_name: "NORWAY", numcode: "578" },
+  { name: "Turkmenistan", iso3: "TKM", iso: "TM", iso_name: "TURKMENISTAN", numcode: "795" },
+  { name: "Belarus", iso3: "BLR", iso: "BY", iso_name: "BELARUS", numcode: "112" },
+  { name: "Cook Islands", iso3: "COK", iso: "CK", iso_name: "COOK ISLANDS", numcode: "184" },
+  { name: "Gambia", iso3: "GMB", iso: "GM", iso_name: "GAMBIA", numcode: "270" },
+  { name: "Martinique", iso3: "MTQ", iso: "MQ", iso_name: "MARTINIQUE", numcode: "474" },
+  { name: "Oman", iso3: "OMN", iso: "OM", iso_name: "OMAN", numcode: "512" },
+  { name: "Seychelles", iso3: "SYC", iso: "SC", iso_name: "SEYCHELLES", numcode: "690" },
+  { name: "Turks and Caicos Islands", iso3: "TCA", iso: "TC", iso_name: "TURKS AND CAICOS ISLANDS", numcode: "796" },
+  { name: "Georgia", iso3: "GEO", iso: "GE", iso_name: "GEORGIA", numcode: "268" },
+  { name: "Mauritania", iso3: "MRT", iso: "MR", iso_name: "MAURITANIA", numcode: "478" },
+  { name: "Pakistan", iso3: "PAK", iso: "PK", iso_name: "PAKISTAN", numcode: "586" },
+  { name: "Sierra Leone", iso3: "SLE", iso: "SL", iso_name: "SIERRA LEONE", numcode: "694" },
+  { name: "Tuvalu", iso3: "TUV", iso: "TV", iso_name: "TUVALU", numcode: "798" },
+  { name: "Costa Rica", iso3: "CRI", iso: "CR", iso_name: "COSTA RICA", numcode: "188" },
+  { name: "Germany", iso3: "DEU", iso: "DE", iso_name: "GERMANY", numcode: "276" },
+  { name: "Mauritius", iso3: "MUS", iso: "MU", iso_name: "MAURITIUS", numcode: "480" },
+  { name: "Palau", iso3: "PLW", iso: "PW", iso_name: "PALAU", numcode: "585" },
+  { name: "Cote D'Ivoire", iso3: "CIV", iso: "CI", iso_name: "COTE D'IVOIRE", numcode: "384" },
+  { name: "Panama", iso3: "PAN", iso: "PA", iso_name: "PANAMA", numcode: "591" },
+  { name: "Singapore", iso3: "SGP", iso: "SG", iso_name: "SINGAPORE", numcode: "702" },
+  { name: "Croatia", iso3: "HRV", iso: "HR", iso_name: "CROATIA", numcode: "191" },
+  { name: "Ghana", iso3: "GHA", iso: "GH", iso_name: "GHANA", numcode: "288" },
+  { name: "Papua New Guinea", iso3: "PNG", iso: "PG", iso_name: "PAPUA NEW GUINEA", numcode: "598" },
+  { name: "Slovakia", iso3: "SVK", iso: "SK", iso_name: "SLOVAKIA", numcode: "703" },
+  { name: "Gibraltar", iso3: "GIB", iso: "GI", iso_name: "GIBRALTAR", numcode: "292" },
+  { name: "Paraguay", iso3: "PRY", iso: "PY", iso_name: "PARAGUAY", numcode: "600" },
+  { name: "Slovenia", iso3: "SVN", iso: "SI", iso_name: "SLOVENIA", numcode: "705" },
+  { name: "Greece", iso3: "GRC", iso: "GR", iso_name: "GREECE", numcode: "300" },
+  { name: "Peru", iso3: "PER", iso: "PE", iso_name: "PERU", numcode: "604" },
+  { name: "Solomon Islands", iso3: "SLB", iso: "SB", iso_name: "SOLOMON ISLANDS", numcode: "90" },
+  { name: "Greenland", iso3: "GRL", iso: "GL", iso_name: "GREENLAND", numcode: "304" },
+  { name: "Somalia", iso3: "SOM", iso: "SO", iso_name: "SOMALIA", numcode: "706" },
+  { name: "Grenada", iso3: "GRD", iso: "GD", iso_name: "GRENADA", numcode: "308" },
+  { name: "South Africa", iso3: "ZAF", iso: "ZA", iso_name: "SOUTH AFRICA", numcode: "710" },
+  { name: "Spain", iso3: "ESP", iso: "ES", iso_name: "SPAIN", numcode: "724" },
+  { name: "Sri Lanka", iso3: "LKA", iso: "LK", iso_name: "SRI LANKA", numcode: "144" },
+  { name: "Afghanistan", iso3: "AFG", iso: "AF", iso_name: "AFGHANISTAN", numcode: "4" },
+  { name: "Albania", iso3: "ALB", iso: "AL", iso_name: "ALBANIA", numcode: "8" },
+  { name: "Algeria", iso3: "DZA", iso: "DZ", iso_name: "ALGERIA", numcode: "12" },
+  { name: "Latvia", iso3: "LVA", iso: "LV", iso_name: "LATVIA", numcode: "428" },
+  { name: "American Samoa", iso3: "ASM", iso: "AS", iso_name: "AMERICAN SAMOA", numcode: "16" },
+  { name: "Bulgaria", iso3: "BGR", iso: "BG", iso_name: "BULGARIA", numcode: "100" },
+  { name: "Lebanon", iso3: "LBN", iso: "LB", iso_name: "LEBANON", numcode: "422" },
+  { name: "Andorra", iso3: "AND", iso: "AD", iso_name: "ANDORRA", numcode: "20" },
+  { name: "Burkina Faso", iso3: "BFA", iso: "BF", iso_name: "BURKINA FASO", numcode: "854" },
+  { name: "Lesotho", iso3: "LSO", iso: "LS", iso_name: "LESOTHO", numcode: "426" },
+  { name: "Angola", iso3: "AGO", iso: "AO", iso_name: "ANGOLA", numcode: "24" },
+  { name: "Burundi", iso3: "BDI", iso: "BI", iso_name: "BURUNDI", numcode: "108" },
+  { name: "Liberia", iso3: "LBR", iso: "LR", iso_name: "LIBERIA", numcode: "430" },
+  { name: "Virgin Islands, British", iso3: "VGB", iso: "VG", iso_name: "VIRGIN ISLANDS, BRITISH", numcode: "92" },
+  { name: "Anguilla", iso3: "AIA", iso: "AI", iso_name: "ANGUILLA", numcode: "660" },
+  { name: "Cambodia", iso3: "KHM", iso: "KH", iso_name: "CAMBODIA", numcode: "116" },
+  { name: "Equatorial Guinea", iso3: "GNQ", iso: "GQ", iso_name: "EQUATORIAL GUINEA", numcode: "226" },
+  { name: "Libyan Arab Jamahiriya", iso3: "LBY", iso: "LY", iso_name: "LIBYAN ARAB JAMAHIRIYA", numcode: "434" },
+  { name: "Nauru", iso3: "NRU", iso: "NR", iso_name: "NAURU", numcode: "520" },
+  { name: "Virgin Islands, U.S.", iso3: "VIR", iso: "VI", iso_name: "VIRGIN ISLANDS, U.S.", numcode: "850" },
+  { name: "Antigua and Barbuda", iso3: "ATG", iso: "AG", iso_name: "ANTIGUA AND BARBUDA", numcode: "28" },
+  { name: "Cameroon", iso3: "CMR", iso: "CM", iso_name: "CAMEROON", numcode: "120" },
+  { name: "Liechtenstein", iso3: "LIE", iso: "LI", iso_name: "LIECHTENSTEIN", numcode: "438" },
+  { name: "Nepal", iso3: "NPL", iso: "NP", iso_name: "NEPAL", numcode: "524" },
+  { name: "Wallis and Futuna", iso3: "WLF", iso: "WF", iso_name: "WALLIS AND FUTUNA", numcode: "876" },
+  { name: "Western Sahara", iso3: "ESH", iso: "EH", iso_name: "WESTERN SAHARA", numcode: "732" },
+  { name: "Argentina", iso3: "ARG", iso: "AR", iso_name: "ARGENTINA", numcode: "32" },
+  { name: "Canada", iso3: "CAN", iso: "CA", iso_name: "CANADA", numcode: "124" },
+  { name: "Eritrea", iso3: "ERI", iso: "ER", iso_name: "ERITREA", numcode: "232" },
+  { name: "Lithuania", iso3: "LTU", iso: "LT", iso_name: "LITHUANIA", numcode: "440" },
+  { name: "Netherlands", iso3: "NLD", iso: "NL", iso_name: "NETHERLANDS", numcode: "528" },
+  { name: "Yemen", iso3: "YEM", iso: "YE", iso_name: "YEMEN", numcode: "887" },
+  { name: "Cape Verde", iso3: "CPV", iso: "CV", iso_name: "CAPE VERDE", numcode: "132" },
+  { name: "Estonia", iso3: "EST", iso: "EE", iso_name: "ESTONIA", numcode: "233" },
+  { name: "Luxembourg", iso3: "LUX", iso: "LU", iso_name: "LUXEMBOURG", numcode: "442" },
+  { name: "Netherlands Antilles", iso3: "ANT", iso: "AN", iso_name: "NETHERLANDS ANTILLES", numcode: "530" },
+  { name: "Saint Helena", iso3: "SHN", iso: "SH", iso_name: "SAINT HELENA", numcode: "654" },
+  { name: "Zambia", iso3: "ZMB", iso: "ZM", iso_name: "ZAMBIA", numcode: "894" },
+  { name: "Cayman Islands", iso3: "CYM", iso: "KY", iso_name: "CAYMAN ISLANDS", numcode: "136" },
+  { name: "Ethiopia", iso3: "ETH", iso: "ET", iso_name: "ETHIOPIA", numcode: "231" },
+  { name: "Hungary", iso3: "HUN", iso: "HU", iso_name: "HUNGARY", numcode: "348" },
+  { name: "Macao", iso3: "MAC", iso: "MO", iso_name: "MACAO", numcode: "446" },
+  { name: "New Caledonia", iso3: "NCL", iso: "NC", iso_name: "NEW CALEDONIA", numcode: "540" },
+  { name: "Zimbabwe", iso3: "ZWE", iso: "ZW", iso_name: "ZIMBABWE", numcode: "716" },
+  { name: "Central African Republic", iso3: "CAF", iso: "CF", iso_name: "CENTRAL AFRICAN REPUBLIC", numcode: "140" },
+  { name: "Falkland Islands (Malvinas)", iso3: "FLK", iso: "FK", iso_name: "FALKLAND ISLANDS (MALVINAS)", numcode: "238" },
+  { name: "Iceland", iso3: "ISL", iso: "IS", iso_name: "ICELAND", numcode: "352" },
+  { name: "Macedonia", iso3: "MKD", iso: "MK", iso_name: "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", numcode: "807" },
+  { name: "New Zealand", iso3: "NZL", iso: "NZ", iso_name: "NEW ZEALAND", numcode: "554" },
+  { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659" },
+  { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" }
+])
+Spree::Config[:default_country_id] = Spree::Country.find_by(iso: ENV.fetch("DEFAULT_COUNTRY_CODE", "US")).id
diff --git a/db/default/spree/countries.yml b/db/default/spree/countries.yml
deleted file mode 100644
index 9e24fd9e28..0000000000
--- a/db/default/spree/countries.yml
+++ /dev/null
@@ -1,1360 +0,0 @@
---- 
-countries_039: 
-  name: Chad
-  iso3: TCD
-  iso: TD
-  iso_name: CHAD
-  numcode: "148"
-countries_065: 
-  name: Faroe Islands
-  iso3: FRO
-  iso: FO
-  iso_name: FAROE ISLANDS
-  numcode: "234"
-countries_092: 
-  name: India
-  iso3: IND
-  iso: IN
-  iso_name: INDIA
-  numcode: "356"
-countries_146: 
-  name: Nicaragua
-  iso3: NIC
-  iso: NI
-  iso_name: NICARAGUA
-  numcode: "558"
-countries_172: 
-  name: Saint Lucia
-  iso3: LCA
-  iso: LC
-  iso_name: SAINT LUCIA
-  numcode: "662"
-countries_066: 
-  name: Fiji
-  iso3: FJI
-  iso: FJ
-  iso_name: FIJI
-  numcode: "242"
-countries_093: 
-  name: Indonesia
-  iso3: IDN
-  iso: ID
-  iso_name: INDONESIA
-  numcode: "360"
-countries_147: 
-  name: Niger
-  iso3: NER
-  iso: NE
-  iso_name: NIGER
-  numcode: "562"
-countries_173: 
-  name: Saint Pierre and Miquelon
-  iso3: SPM
-  iso: PM
-  iso_name: SAINT PIERRE AND MIQUELON
-  numcode: "666"
-countries_067: 
-  name: Finland
-  iso3: FIN
-  iso: FI
-  iso_name: FINLAND
-  numcode: "246"
-countries_148: 
-  name: Nigeria
-  iso3: NGA
-  iso: NG
-  iso_name: NIGERIA
-  numcode: "566"
-countries_174: 
-  name: Saint Vincent and the Grenadines
-  iso3: VCT
-  iso: VC
-  iso_name: SAINT VINCENT AND THE GRENADINES
-  numcode: "670"
-countries_068: 
-  name: France
-  iso3: FRA
-  iso: FR
-  iso_name: FRANCE
-  numcode: "250"
-countries_094: 
-  name: Iran, Islamic Republic of
-  iso3: IRN
-  iso: IR
-  iso_name: IRAN, ISLAMIC REPUBLIC OF
-  numcode: "364"
-countries_149: 
-  name: Niue
-  iso3: NIU
-  iso: NU
-  iso_name: NIUE
-  numcode: "570"
-countries_175: 
-  name: Samoa
-  iso3: WSM
-  iso: WS
-  iso_name: SAMOA
-  numcode: "882"
-countries_069: 
-  name: French Guiana
-  iso3: GUF
-  iso: GF
-  iso_name: FRENCH GUIANA
-  numcode: "254"
-countries_095: 
-  name: Iraq
-  iso3: IRQ
-  iso: IQ
-  iso_name: IRAQ
-  numcode: "368"
-countries_176: 
-  name: San Marino
-  iso3: SMR
-  iso: SM
-  iso_name: SAN MARINO
-  numcode: "674"
-countries_096: 
-  name: Ireland
-  iso3: IRL
-  iso: IE
-  iso_name: IRELAND
-  numcode: "372"
-countries_177: 
-  name: Sao Tome and Principe
-  iso3: STP
-  iso: ST
-  iso_name: SAO TOME AND PRINCIPE
-  numcode: "678"
-countries_097: 
-  name: Israel
-  iso3: ISR
-  iso: IL
-  iso_name: ISRAEL
-  numcode: "376"
-countries_178: 
-  name: Saudi Arabia
-  iso3: SAU
-  iso: SA
-  iso_name: SAUDI ARABIA
-  numcode: "682"
-countries_098: 
-  name: Italy
-  iso3: ITA
-  iso: IT
-  iso_name: ITALY
-  numcode: "380"
-countries_179: 
-  name: Senegal
-  iso3: SEN
-  iso: SN
-  iso_name: SENEGAL
-  numcode: "686"
-countries_099: 
-  name: Jamaica
-  iso3: JAM
-  iso: JM
-  iso_name: JAMAICA
-  numcode: "388"
-countries_100: 
-  name: Japan
-  iso3: JPN
-  iso: JP
-  iso_name: JAPAN
-  numcode: "392"
-countries_101: 
-  name: Jordan
-  iso3: JOR
-  iso: JO
-  iso_name: JORDAN
-  numcode: "400"
-countries_020: 
-  name: Belgium
-  iso3: BEL
-  iso: BE
-  iso_name: BELGIUM
-  numcode: "56"
-countries_021: 
-  name: Belize
-  iso3: BLZ
-  iso: BZ
-  iso_name: BELIZE
-  numcode: "84"
-countries_102: 
-  name: Kazakhstan
-  iso3: KAZ
-  iso: KZ
-  iso_name: KAZAKHSTAN
-  numcode: "398"
-countries_210: 
-  name: Uganda
-  iso3: UGA
-  iso: UG
-  iso_name: UGANDA
-  numcode: "800"
-countries_022: 
-  name: Benin
-  iso3: BEN
-  iso: BJ
-  iso_name: BENIN
-  numcode: "204"
-countries_103: 
-  name: Kenya
-  iso3: KEN
-  iso: KE
-  iso_name: KENYA
-  numcode: "404"
-countries_211: 
-  name: Ukraine
-  iso3: UKR
-  iso: UA
-  iso_name: UKRAINE
-  numcode: "804"
-countries_023: 
-  name: Bermuda
-  iso3: BMU
-  iso: BM
-  iso_name: BERMUDA
-  numcode: "60"
-countries_104: 
-  name: Kiribati
-  iso3: KIR
-  iso: KI
-  iso_name: KIRIBATI
-  numcode: "296"
-countries_130: 
-  name: Mexico
-  iso3: MEX
-  iso: MX
-  iso_name: MEXICO
-  numcode: "484"
-countries_212: 
-  name: United Arab Emirates
-  iso3: ARE
-  iso: AE
-  iso_name: UNITED ARAB EMIRATES
-  numcode: "784"
-countries_024: 
-  name: Bhutan
-  iso3: BTN
-  iso: BT
-  iso_name: BHUTAN
-  numcode: "64"
-countries_050: 
-  name: Cuba
-  iso3: CUB
-  iso: CU
-  iso_name: CUBA
-  numcode: "192"
-countries_105: 
-  name: North Korea
-  iso3: PRK
-  iso: KP
-  iso_name: KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF
-  numcode: "408"
-countries_131: 
-  name: Micronesia, Federated States of
-  iso3: FSM
-  iso: FM
-  iso_name: MICRONESIA, FEDERATED STATES OF
-  numcode: "583"
-countries_213: 
-  name: United Kingdom
-  iso3: GBR
-  iso: GB
-  iso_name: UNITED KINGDOM
-  numcode: "826"
-countries_025: 
-  name: Bolivia
-  iso3: BOL
-  iso: BO
-  iso_name: BOLIVIA
-  numcode: "68"
-countries_051: 
-  name: Cyprus
-  iso3: CYP
-  iso: CY
-  iso_name: CYPRUS
-  numcode: "196"
-countries_106: 
-  name: South Korea
-  iso3: KOR
-  iso: KR
-  iso_name: KOREA, REPUBLIC OF
-  numcode: "410"
-countries_132: 
-  name: Moldova, Republic of
-  iso3: MDA
-  iso: MD
-  iso_name: MOLDOVA, REPUBLIC OF
-  numcode: "498"
-countries_214: 
-  name: United States
-  iso3: USA
-  iso: US
-  iso_name: UNITED STATES
-  numcode: "840"
-countries_026: 
-  name: Bosnia and Herzegovina
-  iso3: BIH
-  iso: BA
-  iso_name: BOSNIA AND HERZEGOVINA
-  numcode: "70"
-countries_052: 
-  name: Czech Republic
-  iso3: CZE
-  iso: CZ
-  iso_name: CZECH REPUBLIC
-  numcode: "203"
-countries_107: 
-  name: Kuwait
-  iso3: KWT
-  iso: KW
-  iso_name: KUWAIT
-  numcode: "414"
-countries_133: 
-  name: Monaco
-  iso3: MCO
-  iso: MC
-  iso_name: MONACO
-  numcode: "492"
-countries_215: 
-  name: Uruguay
-  iso3: URY
-  iso: UY
-  iso_name: URUGUAY
-  numcode: "858"
-countries_027: 
-  name: Botswana
-  iso3: BWA
-  iso: BW
-  iso_name: BOTSWANA
-  numcode: "72"
-countries_053: 
-  name: Denmark
-  iso3: DNK
-  iso: DK
-  iso_name: DENMARK
-  numcode: "208"
-countries_080: 
-  name: Guadeloupe
-  iso3: GLP
-  iso: GP
-  iso_name: GUADELOUPE
-  numcode: "312"
-countries_108: 
-  name: Kyrgyzstan
-  iso3: KGZ
-  iso: KG
-  iso_name: KYRGYZSTAN
-  numcode: "417"
-countries_134: 
-  name: Mongolia
-  iso3: MNG
-  iso: MN
-  iso_name: MONGOLIA
-  numcode: "496"
-countries_160: 
-  name: Philippines
-  iso3: PHL
-  iso: PH
-  iso_name: PHILIPPINES
-  numcode: "608"
-countries_028: 
-  name: Brazil
-  iso3: BRA
-  iso: BR
-  iso_name: BRAZIL
-  numcode: "76"
-countries_054: 
-  name: Djibouti
-  iso3: DJI
-  iso: DJ
-  iso_name: DJIBOUTI
-  numcode: "262"
-countries_081: 
-  name: Guam
-  iso3: GUM
-  iso: GU
-  iso_name: GUAM
-  numcode: "316"
-countries_109: 
-  name: Lao People's Democratic Republic
-  iso3: LAO
-  iso: LA
-  iso_name: LAO PEOPLE'S DEMOCRATIC REPUBLIC
-  numcode: "418"
-countries_135: 
-  name: Montserrat
-  iso3: MSR
-  iso: MS
-  iso_name: MONTSERRAT
-  numcode: "500"
-countries_161: 
-  name: Pitcairn
-  iso3: PCN
-  iso: PN
-  iso_name: PITCAIRN
-  numcode: "612"
-countries_216: 
-  name: Uzbekistan
-  iso3: UZB
-  iso: UZ
-  iso_name: UZBEKISTAN
-  numcode: "860"
-countries_029: 
-  name: Brunei Darussalam
-  iso3: BRN
-  iso: BN
-  iso_name: BRUNEI DARUSSALAM
-  numcode: "96"
-countries_055: 
-  name: Dominica
-  iso3: DMA
-  iso: DM
-  iso_name: DOMINICA
-  numcode: "212"
-countries_082: 
-  name: Guatemala
-  iso3: GTM
-  iso: GT
-  iso_name: GUATEMALA
-  numcode: "320"
-countries_136: 
-  name: Morocco
-  iso3: MAR
-  iso: MA
-  iso_name: MOROCCO
-  numcode: "504"
-countries_162: 
-  name: Poland
-  iso3: POL
-  iso: PL
-  iso_name: POLAND
-  numcode: "616"
-countries_217: 
-  name: Vanuatu
-  iso3: VUT
-  iso: VU
-  iso_name: VANUATU
-  numcode: "548"
-countries_056: 
-  name: Dominican Republic
-  iso3: DOM
-  iso: DO
-  iso_name: DOMINICAN REPUBLIC
-  numcode: "214"
-countries_137: 
-  name: Mozambique
-  iso3: MOZ
-  iso: MZ
-  iso_name: MOZAMBIQUE
-  numcode: "508"
-countries_163: 
-  name: Portugal
-  iso3: PRT
-  iso: PT
-  iso_name: PORTUGAL
-  numcode: "620"
-countries_190: 
-  name: Sudan
-  iso3: SDN
-  iso: SD
-  iso_name: SUDAN
-  numcode: "736"
-countries_218: 
-  name: Venezuela
-  iso3: VEN
-  iso: VE
-  iso_name: VENEZUELA
-  numcode: "862"
-countries_057: 
-  name: Ecuador
-  iso3: ECU
-  iso: EC
-  iso_name: ECUADOR
-  numcode: "218"
-countries_083: 
-  name: Guinea
-  iso3: GIN
-  iso: GN
-  iso_name: GUINEA
-  numcode: "324"
-countries_138: 
-  name: Myanmar
-  iso3: MMR
-  iso: MM
-  iso_name: MYANMAR
-  numcode: "104"
-countries_164: 
-  name: Puerto Rico
-  iso3: PRI
-  iso: PR
-  iso_name: PUERTO RICO
-  numcode: "630"
-countries_191: 
-  name: Suriname
-  iso3: SUR
-  iso: SR
-  iso_name: SURINAME
-  numcode: "740"
-countries_219: 
-  name: Viet Nam
-  iso3: VNM
-  iso: VN
-  iso_name: VIET NAM
-  numcode: "704"
-countries_058: 
-  name: Egypt
-  iso3: EGY
-  iso: EG
-  iso_name: EGYPT
-  numcode: "818"
-countries_084: 
-  name: Guinea-Bissau
-  iso3: GNB
-  iso: GW
-  iso_name: GUINEA-BISSAU
-  numcode: "624"
-countries_139: 
-  name: Namibia
-  iso3: NAM
-  iso: NA
-  iso_name: NAMIBIA
-  numcode: "516"
-countries_165: 
-  name: Qatar
-  iso3: QAT
-  iso: QA
-  iso_name: QATAR
-  numcode: "634"
-countries_192: 
-  name: Svalbard and Jan Mayen
-  iso3: SJM
-  iso: SJ
-  iso_name: SVALBARD AND JAN MAYEN
-  numcode: "744"
-countries_059: 
-  name: El Salvador
-  iso3: SLV
-  iso: SV
-  iso_name: EL SALVADOR
-  numcode: "222"
-countries_085: 
-  name: Guyana
-  iso3: GUY
-  iso: GY
-  iso_name: GUYANA
-  numcode: "328"
-countries_166: 
-  name: Reunion
-  iso3: REU
-  iso: RE
-  iso_name: REUNION
-  numcode: "638"
-countries_086: 
-  name: Haiti
-  iso3: HTI
-  iso: HT
-  iso_name: HAITI
-  numcode: "332"
-countries_167: 
-  name: Romania
-  iso3: ROM
-  iso: RO
-  iso_name: ROMANIA
-  numcode: "642"
-countries_193: 
-  name: Swaziland
-  iso3: SWZ
-  iso: SZ
-  iso_name: SWAZILAND
-  numcode: "748"
-countries_087: 
-  name: Holy See (Vatican City State)
-  iso3: VAT
-  iso: VA
-  iso_name: HOLY SEE (VATICAN CITY STATE)
-  numcode: "336"
-countries_168: 
-  name: Russian Federation
-  iso3: RUS
-  iso: RU
-  iso_name: RUSSIAN FEDERATION
-  numcode: "643"
-countries_194: 
-  name: Sweden
-  iso3: SWE
-  iso: SE
-  iso_name: SWEDEN
-  numcode: "752"
-countries_088: 
-  name: Honduras
-  iso3: HND
-  iso: HN
-  iso_name: HONDURAS
-  numcode: "340"
-countries_169: 
-  name: Rwanda
-  iso3: RWA
-  iso: RW
-  iso_name: RWANDA
-  numcode: "646"
-countries_195: 
-  name: Switzerland
-  iso3: CHE
-  iso: CH
-  iso_name: SWITZERLAND
-  numcode: "756"
-countries_089: 
-  name: Hong Kong
-  iso3: HKG
-  iso: HK
-  iso_name: HONG KONG
-  numcode: "344"
-countries_196: 
-  name: Syrian Arab Republic
-  iso3: SYR
-  iso: SY
-  iso_name: SYRIAN ARAB REPUBLIC
-  numcode: "760"
-countries_197: 
-  name: Taiwan
-  iso3: TWN
-  iso: TW
-  iso_name: TAIWAN, PROVINCE OF CHINA
-  numcode: "158"
-countries_198: 
-  name: Tajikistan
-  iso3: TJK
-  iso: TJ
-  iso_name: TAJIKISTAN
-  numcode: "762"
-countries_199: 
-  name: Tanzania, United Republic of
-  iso3: TZA
-  iso: TZ
-  iso_name: TANZANIA, UNITED REPUBLIC OF
-  numcode: "834"
-countries_010: 
-  name: Armenia
-  iso3: ARM
-  iso: AM
-  iso_name: ARMENIA
-  numcode: "51"
-countries_011: 
-  name: Aruba
-  iso3: ABW
-  iso: AW
-  iso_name: ARUBA
-  numcode: "533"
-countries_012: 
-  id: 12
-  name: Australia
-  iso3: AUS
-  iso: AU
-  iso_name: AUSTRALIA
-  numcode: "36"
-countries_200: 
-  name: Thailand
-  iso3: THA
-  iso: TH
-  iso_name: THAILAND
-  numcode: "764"
-countries_013: 
-  name: Austria
-  iso3: AUT
-  iso: AT
-  iso_name: AUSTRIA
-  numcode: "40"
-countries_120: 
-  name: Madagascar
-  iso3: MDG
-  iso: MG
-  iso_name: MADAGASCAR
-  numcode: "450"
-countries_201: 
-  name: Togo
-  iso3: TGO
-  iso: TG
-  iso_name: TOGO
-  numcode: "768"
-countries_014: 
-  name: Azerbaijan
-  iso3: AZE
-  iso: AZ
-  iso_name: AZERBAIJAN
-  numcode: "31"
-countries_040: 
-  name: Chile
-  iso3: CHL
-  iso: CL
-  iso_name: CHILE
-  numcode: "152"
-countries_121: 
-  name: Malawi
-  iso3: MWI
-  iso: MW
-  iso_name: MALAWI
-  numcode: "454"
-countries_202: 
-  name: Tokelau
-  iso3: TKL
-  iso: TK
-  iso_name: TOKELAU
-  numcode: "772"
-countries_015: 
-  name: Bahamas
-  iso3: BHS
-  iso: BS
-  iso_name: BAHAMAS
-  numcode: "44"
-countries_041: 
-  name: China
-  iso3: CHN
-  iso: CN
-  iso_name: CHINA
-  numcode: "156"
-countries_122: 
-  name: Malaysia
-  iso3: MYS
-  iso: MY
-  iso_name: MALAYSIA
-  numcode: "458"
-countries_203: 
-  name: Tonga
-  iso3: TON
-  iso: TO
-  iso_name: TONGA
-  numcode: "776"
-countries_016: 
-  name: Bahrain
-  iso3: BHR
-  iso: BH
-  iso_name: BAHRAIN
-  numcode: "48"
-countries_042: 
-  name: Colombia
-  iso3: COL
-  iso: CO
-  iso_name: COLOMBIA
-  numcode: "170"
-countries_123: 
-  name: Maldives
-  iso3: MDV
-  iso: MV
-  iso_name: MALDIVES
-  numcode: "462"
-countries_204: 
-  name: Trinidad and Tobago
-  iso3: TTO
-  iso: TT
-  iso_name: TRINIDAD AND TOBAGO
-  numcode: "780"
-countries_017: 
-  name: Bangladesh
-  iso3: BGD
-  iso: BD
-  iso_name: BANGLADESH
-  numcode: "50"
-countries_043: 
-  name: Comoros
-  iso3: COM
-  iso: KM
-  iso_name: COMOROS
-  numcode: "174"
-countries_070: 
-  name: French Polynesia
-  iso3: PYF
-  iso: PF
-  iso_name: FRENCH POLYNESIA
-  numcode: "258"
-countries_124: 
-  name: Mali
-  iso3: MLI
-  iso: ML
-  iso_name: MALI
-  numcode: "466"
-countries_150: 
-  name: Norfolk Island
-  iso3: NFK
-  iso: NF
-  iso_name: NORFOLK ISLAND
-  numcode: "574"
-countries_205: 
-  name: Tunisia
-  iso3: TUN
-  iso: TN
-  iso_name: TUNISIA
-  numcode: "788"
-countries_018: 
-  name: Barbados
-  iso3: BRB
-  iso: BB
-  iso_name: BARBADOS
-  numcode: "52"
-countries_044: 
-  name: Congo
-  iso3: COG
-  iso: CG
-  iso_name: CONGO
-  numcode: "178"
-countries_071: 
-  name: Gabon
-  iso3: GAB
-  iso: GA
-  iso_name: GABON
-  numcode: "266"
-countries_125: 
-  name: Malta
-  iso3: MLT
-  iso: MT
-  iso_name: MALTA
-  numcode: "470"
-countries_151: 
-  name: Northern Mariana Islands
-  iso3: MNP
-  iso: MP
-  iso_name: NORTHERN MARIANA ISLANDS
-  numcode: "580"
-countries_206: 
-  name: Turkey
-  iso3: TUR
-  iso: TR
-  iso_name: TURKEY
-  numcode: "792"
-countries_045: 
-  name: Congo, the Democratic Republic of the
-  iso3: COD
-  iso: CD
-  iso_name: CONGO, THE DEMOCRATIC REPUBLIC OF THE
-  numcode: "180"
-countries_126: 
-  name: Marshall Islands
-  iso3: MHL
-  iso: MH
-  iso_name: MARSHALL ISLANDS
-  numcode: "584"
-countries_152: 
-  name: Norway
-  iso3: NOR
-  iso: "NO"
-  iso_name: NORWAY
-  numcode: "578"
-countries_207: 
-  name: Turkmenistan
-  iso3: TKM
-  iso: TM
-  iso_name: TURKMENISTAN
-  numcode: "795"
-countries_019: 
-  name: Belarus
-  iso3: BLR
-  iso: BY
-  iso_name: BELARUS
-  numcode: "112"
-countries_046: 
-  name: Cook Islands
-  iso3: COK
-  iso: CK
-  iso_name: COOK ISLANDS
-  numcode: "184"
-countries_072: 
-  name: Gambia
-  iso3: GMB
-  iso: GM
-  iso_name: GAMBIA
-  numcode: "270"
-countries_127: 
-  name: Martinique
-  iso3: MTQ
-  iso: MQ
-  iso_name: MARTINIQUE
-  numcode: "474"
-countries_153: 
-  name: Oman
-  iso3: OMN
-  iso: OM
-  iso_name: OMAN
-  numcode: "512"
-countries_180: 
-  name: Seychelles
-  iso3: SYC
-  iso: SC
-  iso_name: SEYCHELLES
-  numcode: "690"
-countries_208: 
-  name: Turks and Caicos Islands
-  iso3: TCA
-  iso: TC
-  iso_name: TURKS AND CAICOS ISLANDS
-  numcode: "796"
-countries_073: 
-  name: Georgia
-  iso3: GEO
-  iso: GE
-  iso_name: GEORGIA
-  numcode: "268"
-countries_128: 
-  name: Mauritania
-  iso3: MRT
-  iso: MR
-  iso_name: MAURITANIA
-  numcode: "478"
-countries_154: 
-  name: Pakistan
-  iso3: PAK
-  iso: PK
-  iso_name: PAKISTAN
-  numcode: "586"
-countries_181: 
-  name: Sierra Leone
-  iso3: SLE
-  iso: SL
-  iso_name: SIERRA LEONE
-  numcode: "694"
-countries_209: 
-  name: Tuvalu
-  iso3: TUV
-  iso: TV
-  iso_name: TUVALU
-  numcode: "798"
-countries_047: 
-  name: Costa Rica
-  iso3: CRI
-  iso: CR
-  iso_name: COSTA RICA
-  numcode: "188"
-countries_074: 
-  name: Germany
-  iso3: DEU
-  iso: DE
-  iso_name: GERMANY
-  numcode: "276"
-countries_129: 
-  name: Mauritius
-  iso3: MUS
-  iso: MU
-  iso_name: MAURITIUS
-  numcode: "480"
-countries_155: 
-  name: Palau
-  iso3: PLW
-  iso: PW
-  iso_name: PALAU
-  numcode: "585"
-countries_048: 
-  name: Cote D'Ivoire
-  iso3: CIV
-  iso: CI
-  iso_name: COTE D'IVOIRE
-  numcode: "384"
-countries_156: 
-  name: Panama
-  iso3: PAN
-  iso: PA
-  iso_name: PANAMA
-  numcode: "591"
-countries_182: 
-  name: Singapore
-  iso3: SGP
-  iso: SG
-  iso_name: SINGAPORE
-  numcode: "702"
-countries_049: 
-  name: Croatia
-  iso3: HRV
-  iso: HR
-  iso_name: CROATIA
-  numcode: "191"
-countries_075: 
-  name: Ghana
-  iso3: GHA
-  iso: GH
-  iso_name: GHANA
-  numcode: "288"
-countries_157: 
-  name: Papua New Guinea
-  iso3: PNG
-  iso: PG
-  iso_name: PAPUA NEW GUINEA
-  numcode: "598"
-countries_183: 
-  name: Slovakia
-  iso3: SVK
-  iso: SK
-  iso_name: SLOVAKIA
-  numcode: "703"
-countries_076: 
-  name: Gibraltar
-  iso3: GIB
-  iso: GI
-  iso_name: GIBRALTAR
-  numcode: "292"
-countries_158: 
-  name: Paraguay
-  iso3: PRY
-  iso: PY
-  iso_name: PARAGUAY
-  numcode: "600"
-countries_184: 
-  name: Slovenia
-  iso3: SVN
-  iso: SI
-  iso_name: SLOVENIA
-  numcode: "705"
-countries_077: 
-  name: Greece
-  iso3: GRC
-  iso: GR
-  iso_name: GREECE
-  numcode: "300"
-countries_159: 
-  name: Peru
-  iso3: PER
-  iso: PE
-  iso_name: PERU
-  numcode: "604"
-countries_185: 
-  name: Solomon Islands
-  iso3: SLB
-  iso: SB
-  iso_name: SOLOMON ISLANDS
-  numcode: "90"
-countries_078: 
-  name: Greenland
-  iso3: GRL
-  iso: GL
-  iso_name: GREENLAND
-  numcode: "304"
-countries_186: 
-  name: Somalia
-  iso3: SOM
-  iso: SO
-  iso_name: SOMALIA
-  numcode: "706"
-countries_079: 
-  name: Grenada
-  iso3: GRD
-  iso: GD
-  iso_name: GRENADA
-  numcode: "308"
-countries_187: 
-  name: South Africa
-  iso3: ZAF
-  iso: ZA
-  iso_name: SOUTH AFRICA
-  numcode: "710"
-countries_188: 
-  name: Spain
-  iso3: ESP
-  iso: ES
-  iso_name: SPAIN
-  numcode: "724"
-countries_189: 
-  name: Sri Lanka
-  iso3: LKA
-  iso: LK
-  iso_name: SRI LANKA
-  numcode: "144"
-countries_001: 
-  name: Afghanistan
-  iso3: AFG
-  iso: AF
-  iso_name: AFGHANISTAN
-  numcode: "4"
-countries_002: 
-  name: Albania
-  iso3: ALB
-  iso: AL
-  iso_name: ALBANIA
-  numcode: "8"
-countries_003: 
-  name: Algeria
-  iso3: DZA
-  iso: DZ
-  iso_name: ALGERIA
-  numcode: "12"
-countries_110: 
-  name: Latvia
-  iso3: LVA
-  iso: LV
-  iso_name: LATVIA
-  numcode: "428"
-countries_004: 
-  name: American Samoa
-  iso3: ASM
-  iso: AS
-  iso_name: AMERICAN SAMOA
-  numcode: "16"
-countries_030: 
-  name: Bulgaria
-  iso3: BGR
-  iso: BG
-  iso_name: BULGARIA
-  numcode: "100"
-countries_111: 
-  name: Lebanon
-  iso3: LBN
-  iso: LB
-  iso_name: LEBANON
-  numcode: "422"
-countries_005: 
-  name: Andorra
-  iso3: AND
-  iso: AD
-  iso_name: ANDORRA
-  numcode: "20"
-countries_031: 
-  name: Burkina Faso
-  iso3: BFA
-  iso: BF
-  iso_name: BURKINA FASO
-  numcode: "854"
-countries_112: 
-  name: Lesotho
-  iso3: LSO
-  iso: LS
-  iso_name: LESOTHO
-  numcode: "426"
-countries_006: 
-  name: Angola
-  iso3: AGO
-  iso: AO
-  iso_name: ANGOLA
-  numcode: "24"
-countries_032: 
-  name: Burundi
-  iso3: BDI
-  iso: BI
-  iso_name: BURUNDI
-  numcode: "108"
-countries_113: 
-  name: Liberia
-  iso3: LBR
-  iso: LR
-  iso_name: LIBERIA
-  numcode: "430"
-countries_220: 
-  name: Virgin Islands, British
-  iso3: VGB
-  iso: VG
-  iso_name: VIRGIN ISLANDS, BRITISH
-  numcode: "92"
-countries_007: 
-  name: Anguilla
-  iso3: AIA
-  iso: AI
-  iso_name: ANGUILLA
-  numcode: "660"
-countries_033: 
-  name: Cambodia
-  iso3: KHM
-  iso: KH
-  iso_name: CAMBODIA
-  numcode: "116"
-countries_060: 
-  name: Equatorial Guinea
-  iso3: GNQ
-  iso: GQ
-  iso_name: EQUATORIAL GUINEA
-  numcode: "226"
-countries_114: 
-  name: Libyan Arab Jamahiriya
-  iso3: LBY
-  iso: LY
-  iso_name: LIBYAN ARAB JAMAHIRIYA
-  numcode: "434"
-countries_140: 
-  name: Nauru
-  iso3: NRU
-  iso: NR
-  iso_name: NAURU
-  numcode: "520"
-countries_221: 
-  name: Virgin Islands, U.S.
-  iso3: VIR
-  iso: VI
-  iso_name: VIRGIN ISLANDS, U.S.
-  numcode: "850"
-countries_008: 
-  name: Antigua and Barbuda
-  iso3: ATG
-  iso: AG
-  iso_name: ANTIGUA AND BARBUDA
-  numcode: "28"
-countries_034: 
-  name: Cameroon
-  iso3: CMR
-  iso: CM
-  iso_name: CAMEROON
-  numcode: "120"
-countries_115: 
-  name: Liechtenstein
-  iso3: LIE
-  iso: LI
-  iso_name: LIECHTENSTEIN
-  numcode: "438"
-countries_141: 
-  name: Nepal
-  iso3: NPL
-  iso: NP
-  iso_name: NEPAL
-  numcode: "524"
-countries_222: 
-  name: Wallis and Futuna
-  iso3: WLF
-  iso: WF
-  iso_name: WALLIS AND FUTUNA
-  numcode: "876"
-countries_223: 
-  name: Western Sahara
-  iso3: ESH
-  iso: EH
-  iso_name: WESTERN SAHARA
-  numcode: "732"
-countries_009: 
-  name: Argentina
-  iso3: ARG
-  iso: AR
-  iso_name: ARGENTINA
-  numcode: "32"
-countries_035: 
-  name: Canada
-  iso3: CAN
-  iso: CA
-  iso_name: CANADA
-  numcode: "124"
-countries_061: 
-  name: Eritrea
-  iso3: ERI
-  iso: ER
-  iso_name: ERITREA
-  numcode: "232"
-countries_116: 
-  name: Lithuania
-  iso3: LTU
-  iso: LT
-  iso_name: LITHUANIA
-  numcode: "440"
-countries_142: 
-  name: Netherlands
-  iso3: NLD
-  iso: NL
-  iso_name: NETHERLANDS
-  numcode: "528"
-countries_224: 
-  name: Yemen
-  iso3: YEM
-  iso: YE
-  iso_name: YEMEN
-  numcode: "887"
-countries_036: 
-  name: Cape Verde
-  iso3: CPV
-  iso: CV
-  iso_name: CAPE VERDE
-  numcode: "132"
-countries_062: 
-  name: Estonia
-  iso3: EST
-  iso: EE
-  iso_name: ESTONIA
-  numcode: "233"
-countries_117: 
-  name: Luxembourg
-  iso3: LUX
-  iso: LU
-  iso_name: LUXEMBOURG
-  numcode: "442"
-countries_143: 
-  name: Netherlands Antilles
-  iso3: ANT
-  iso: AN
-  iso_name: NETHERLANDS ANTILLES
-  numcode: "530"
-countries_170: 
-  name: Saint Helena
-  iso3: SHN
-  iso: SH
-  iso_name: SAINT HELENA
-  numcode: "654"
-countries_225: 
-  name: Zambia
-  iso3: ZMB
-  iso: ZM
-  iso_name: ZAMBIA
-  numcode: "894"
-countries_037: 
-  name: Cayman Islands
-  iso3: CYM
-  iso: KY
-  iso_name: CAYMAN ISLANDS
-  numcode: "136"
-countries_063: 
-  name: Ethiopia
-  iso3: ETH
-  iso: ET
-  iso_name: ETHIOPIA
-  numcode: "231"
-countries_090: 
-  name: Hungary
-  iso3: HUN
-  iso: HU
-  iso_name: HUNGARY
-  numcode: "348"
-countries_118: 
-  name: Macao
-  iso3: MAC
-  iso: MO
-  iso_name: MACAO
-  numcode: "446"
-countries_144: 
-  name: New Caledonia
-  iso3: NCL
-  iso: NC
-  iso_name: NEW CALEDONIA
-  numcode: "540"
-countries_226: 
-  name: Zimbabwe
-  iso3: ZWE
-  iso: ZW
-  iso_name: ZIMBABWE
-  numcode: "716"
-countries_038: 
-  name: Central African Republic
-  iso3: CAF
-  iso: CF
-  iso_name: CENTRAL AFRICAN REPUBLIC
-  numcode: "140"
-countries_064: 
-  name: Falkland Islands (Malvinas)
-  iso3: FLK
-  iso: FK
-  iso_name: FALKLAND ISLANDS (MALVINAS)
-  numcode: "238"
-countries_091: 
-  name: Iceland
-  iso3: ISL
-  iso: IS
-  iso_name: ICELAND
-  numcode: "352"
-countries_119: 
-  name: Macedonia
-  iso3: MKD
-  iso: MK
-  iso_name: MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF
-  numcode: "807"
-countries_145: 
-  name: New Zealand
-  iso3: NZL
-  iso: NZ
-  iso_name: NEW ZEALAND
-  id: "145"
-  numcode: "554"
-countries_171: 
-  name: Saint Kitts and Nevis
-  iso3: KNA
-  iso: KN
-  iso_name: SAINT KITTS AND NEVIS
-  id: "171"
-  numcode: "659"
diff --git a/db/default/zones.rb b/db/default/zones.rb
new file mode 100644
index 0000000000..10dd53b1d2
--- /dev/null
+++ b/db/default/zones.rb
@@ -0,0 +1,19 @@
+unless Spree::Zone.find_by(name: "EU_VAT")
+  eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
+
+  ["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
+   "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
+   "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
+   "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
+   "Estonia"].each do |name|
+    eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+  end
+end
+
+unless Spree::Zone.find_by(name: "North America")
+  north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada")
+
+  ["United States", "Canada"].each do |name|
+    north_america.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+  end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 9afe88de4b..8d030ac050 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -20,32 +20,30 @@ end
 # We need mail_configuration to create a user account, because it sends a confirmation email.
 set_mail_configuration
 
-# -- Spree
+puts "[db:seed] Seeding Roles"
+Spree::Role.where(:name => "admin").first_or_create
+Spree::Role.where(:name => "user").first_or_create
+
+puts "[db:seed] Seeding Countries"
 unless Spree::Country.find_by(iso: ENV['DEFAULT_COUNTRY_CODE'])
-  puts "[db:seed] Seeding Spree"
-  Spree::Core::Engine.load_seed if defined?(Spree::Core)
-  Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+  require File.join(File.dirname(__FILE__), 'default', 'countries')
 end
-
 country = Spree::Country.find_by(iso: ENV['DEFAULT_COUNTRY_CODE'])
-puts "Country is #{country.to_s}"
+puts "Default country is #{country.to_s}"
 
-puts "[db:seed] loading states yaml"
-states = YAML::load_file "db/default/spree/states.yml"
-puts "States: #{states.to_s}"
-
-# -- Seeding States
 puts "[db:seed] Seeding states for " + country.name
-
+states = YAML::load_file "db/default/spree/states.yml"
 states.each do |state|
   puts "State: " + state.to_s
-
   unless Spree::State.find_by(name: state['name'])
     Spree::State.create!({ name: state['name'], abbr: state['abbr'], country: country })
   end
 end
 
-# Create users:
+puts "[db:seed] Seeding Zones"
+require File.join(File.dirname(__FILE__), 'default', 'zones')
+
+puts "[db:seed] Seeding Users"
 require File.join(File.dirname(__FILE__), 'default', 'users')
 
 DefaultStockLocation.find_or_create
diff --git a/docker-compose.yml b/docker-compose.yml
index 72d25a7d4a..87d545aec4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,7 @@ services:
     command: >
       bash -c "wait-for-it -t 30 db:5432 &&
                rm -f tmp/pids/server.pid &&
+               yarn install &&
                bundle exec rails s -p 3000 -b '0.0.0.0'"
   worker:
     tty: true
diff --git a/docker/README.md b/docker/README.md
index d08cdd32d7..8b59e9ca48 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,7 +3,7 @@
 ## What's the point?
 * Setting up the Open Food Network app on your local machine is quick and easy with the aid of Docker and Docker Compose.
 * Docker provides a common virtual environment available to all developers and resolves the infamous "but it works on my machine" problem.
-* Use the scripts in this directory to execute tasks in Docker.  Please note that these scripts are intended to be executed from this app's root directory.  These scripts allow you to bypass the need to keep typing "docker-compose run --rm web".
+* Use the scripts in this directory to execute tasks in Docker.  Please note that these scripts are intended to be executed from this app's root directory.  These scripts allow you to bypass the need to keep typing "docker-compose run web".
 
 ## Installing Docker
 * You should have at least 2 GB free on your local machine to download Docker images and create Docker containers for this app.
diff --git a/docker/cop b/docker/cop
index 948ea467d5..2df10f3522 100755
--- a/docker/cop
+++ b/docker/cop
@@ -2,10 +2,10 @@
 
 # This script runs RuboCop.
 
-echo '------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rubocop'
-echo '------------------------------------------------------'
-docker-compose run --rm web bundle exec rubocop
-echo '----------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rubocop'
-echo '----------------------------------------------------'
+echo '-------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rubocop'
+echo '-------------------------------------------------'
+docker-compose run web bundle exec rubocop
+echo '-----------------------------------------------'
+echo 'END: docker-compose run web bundle exec rubocop'
+echo '-----------------------------------------------'
diff --git a/docker/run b/docker/run
index 3975c87d32..f5f0bf870a 100755
--- a/docker/run
+++ b/docker/run
@@ -19,4 +19,4 @@ function cleanup {
 
 trap cleanup EXIT
 
-docker-compose run --rm web $@
+docker-compose run web $@
diff --git a/docker/seed b/docker/seed
index f3b519146a..7e02a16810 100755
--- a/docker/seed
+++ b/docker/seed
@@ -2,26 +2,26 @@
 
 # This is the data seeding script.
 
-echo '------------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rake db:reset'
-echo '------------------------------------------------------------'
-docker-compose run --rm web bundle exec rake db:reset
-echo '----------------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rake db:reset'
-echo '----------------------------------------------------------'
+echo '-------------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rake db:reset'
+echo '-------------------------------------------------------'
+docker-compose run web bundle exec rake db:reset
+echo '-----------------------------------------------------'
+echo 'END: docker-compose run web bundle exec rake db:reset'
+echo '-----------------------------------------------------'
 
-echo '-------------------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rake db:test:prepare'
-echo '-------------------------------------------------------------------'
-docker-compose run --rm web bundle exec rake db:test:prepare
-echo '-----------------------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rake db:test:prepare'
-echo '-----------------------------------------------------------------'
+echo '--------------------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rake db:test:prepare'
+echo '--------------------------------------------------------------'
+docker-compose run web bundle exec rake db:test:prepare
+echo '------------------------------------------------------------'
+echo 'END: docker-compose run web bundle exec rake db:test:prepare'
+echo '------------------------------------------------------------'
 
-echo '-------------------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rake ofn:sample_data'
-echo '-------------------------------------------------------------------'
-docker-compose run --rm web bundle exec rake ofn:sample_data
-echo '-----------------------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rake ofn:sample_data'
-echo '-----------------------------------------------------------------'
+echo '--------------------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rake ofn:sample_data'
+echo '--------------------------------------------------------------'
+docker-compose run web bundle exec rake ofn:sample_data
+echo '------------------------------------------------------------'
+echo 'END: docker-compose run web bundle exec rake ofn:sample_data'
+echo '------------------------------------------------------------'
diff --git a/docker/test-log b/docker/test-log
index 662747664e..4769212968 100755
--- a/docker/test-log
+++ b/docker/test-log
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-echo '-------------------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rake db:test:prepare'
-echo '-------------------------------------------------------------------'
-docker-compose run --rm web bundle exec rake db:test:prepare
-echo '-----------------------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rake db:test:prepare'
-echo '-----------------------------------------------------------------'
+echo '--------------------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rake db:test:prepare'
+echo '--------------------------------------------------------------'
+docker-compose run web bundle exec rake db:test:prepare
+echo '------------------------------------------------------------'
+echo 'END: docker-compose run web bundle exec rake db:test:prepare'
+echo '------------------------------------------------------------'
 
-echo '---------------------------------------------------------'
-echo 'BEGIN: docker-compose run --rm web bundle exec rspec spec'
-echo '---------------------------------------------------------'
-docker-compose run --rm web bundle exec rspec spec
-echo '-------------------------------------------------------'
-echo 'END: docker-compose run --rm web bundle exec rspec spec'
-echo '-------------------------------------------------------'
+echo '----------------------------------------------------'
+echo 'BEGIN: docker-compose run web bundle exec rspec spec'
+echo '----------------------------------------------------'
+docker-compose run web bundle exec rspec spec
+echo '--------------------------------------------------'
+echo 'END: docker-compose run web bundle exec rspec spec'
+echo '--------------------------------------------------'
diff --git a/engines/catalog/spec/.rubocop.yml b/engines/catalog/spec/.rubocop.yml
new file mode 100644
index 0000000000..26e3e2c99a
--- /dev/null
+++ b/engines/catalog/spec/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../../../.rubocop_specs.yml
diff --git a/engines/dfc_provider/spec/.rubocop.yml b/engines/dfc_provider/spec/.rubocop.yml
new file mode 100644
index 0000000000..26e3e2c99a
--- /dev/null
+++ b/engines/dfc_provider/spec/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../../../.rubocop_specs.yml
diff --git a/engines/order_management/spec/.rubocop.yml b/engines/order_management/spec/.rubocop.yml
new file mode 100644
index 0000000000..26e3e2c99a
--- /dev/null
+++ b/engines/order_management/spec/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../../../.rubocop_specs.yml
diff --git a/engines/web/spec/.rubocop.yml b/engines/web/spec/.rubocop.yml
new file mode 100644
index 0000000000..26e3e2c99a
--- /dev/null
+++ b/engines/web/spec/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../../../.rubocop_specs.yml
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
index f745a4438d..4324cbcf86 100644
--- a/knapsack_rspec_report.json
+++ b/knapsack_rspec_report.json
@@ -50,7 +50,6 @@
   "spec/views/spree/admin/orders/edit.html.haml_spec.rb": 1.4470489025115967,
   "spec/features/admin/configuration/tax_categories_spec.rb": 1.29876708984375,
   "spec/serializers/api/cached_enterprise_serializer_spec.rb": 1.4465532302856445,
-  "spec/features/admin/configuration/image_settings_spec.rb": 1.2370245456695557,
   "spec/controllers/spree/admin/shipping_methods_controller_spec.rb": 1.7793538570404053,
   "spec/services/cart_service_spec.rb": 3.899951696395874,
   "spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb": 1.0069975852966309,
@@ -206,7 +205,6 @@
   "spec/controllers/spree/credit_cards_controller_spec.rb": 0.3677220344543457,
   "spec/controllers/api/customers_controller_spec.rb": 0.5009043216705322,
   "spec/serializers/api/shipping_method_serializer_spec.rb": 0.418184757232666,
-  "spec/features/admin/image_settings_spec.rb": 0.3251943588256836,
   "spec/controllers/spree/admin/mail_methods_controller_spec.rb": 0.1681194305419922,
   "spec/controllers/spree/paypal_controller_spec.rb": 0.3564426898956299,
   "spec/mailers/user_mailer_spec.rb": 0.25026392936706543,
@@ -328,7 +326,6 @@
   "spec/features/admin/external_services_spec.rb": 0.3893253803253174,
   "spec/models/stock/package_spec.rb": 0.43047094345092773,
   "spec/controllers/admin/stripe_connect_settings_controller_spec.rb": 0.27138352394104004,
-  "spec/controllers/spree/admin/image_settings_controller_spec.rb": 0.2584362030029297,
   "spec/features/consumer/confirm_invitation_spec.rb": 0.3224337100982666,
   "spec/helpers/checkout_helper_spec.rb": 0.13036370277404785,
   "spec/helpers/groups_helper_spec.rb": 0.012569427490234375,
diff --git a/lib/spree/core.rb b/lib/spree/core.rb
index 5a7d98dbd2..f0943bef92 100644
--- a/lib/spree/core.rb
+++ b/lib/spree/core.rb
@@ -40,14 +40,12 @@ module Spree
   end
 end
 
-require 'spree/core/version'
 require 'spree/core/engine'
 
 require 'spree/i18n'
 require 'spree/money'
 
 require 'spree/core/delegate_belongs_to'
-require 'spree/core/ext/active_record'
 require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb
index e88920eaf6..c6978382e7 100644
--- a/lib/spree/core/controller_helpers/common.rb
+++ b/lib/spree/core/controller_helpers/common.rb
@@ -16,20 +16,6 @@ module Spree
 
           protected
 
-          # Convenience method for firing instrumentation events with the default payload hash
-          def fire_event(name, extra_payload = {})
-            ActiveSupport::Notifications.instrument(name, default_notification_payload.
-                                                            merge(extra_payload))
-          end
-
-          # Creates the hash that is sent as the payload for all notifications.
-          #   Specific notifications will add additional keys as appropriate.
-          #   This method can be overriden to provide additional data when
-          # responding to a notification
-          def default_notification_payload
-            { user: spree_current_user, order: current_order }
-          end
-
           # This can be used in views as well as controllers.
           # e.g. <% self.title = 'This is a custom title for this view' %>
           attr_writer :title
@@ -37,11 +23,7 @@ module Spree
           def title
             title_string = @title.presence || accurate_title
             if title_string.present?
-              if Spree::Config[:always_put_site_name_in_title]
-                [title_string, default_title].join(' - ')
-              else
-                title_string
-              end
+              [title_string, default_title].join(' - ')
             else
               default_title
             end
diff --git a/lib/spree/core/controller_helpers/respond_with.rb b/lib/spree/core/controller_helpers/respond_with.rb
index 6b3e7129ca..0e3e7ef56b 100644
--- a/lib/spree/core/controller_helpers/respond_with.rb
+++ b/lib/spree/core/controller_helpers/respond_with.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'spree/responder'
+
 module ActionController
   class Base
     def respond_with(*resources, &block)
diff --git a/lib/spree/product_filters.rb b/lib/spree/product_filters.rb
deleted file mode 100644
index b0b9189663..0000000000
--- a/lib/spree/product_filters.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Spree
-  module ProductFilters
-    if Enterprise.table_exists?
-      Spree::Product.scope :distributor_any,
-                           lambda { |*opts|
-                             conds = opts.map { |o| ProductFilters.distributor_filter[:conds][o] }.reject(&:nil?)
-                             Spree::Product.joins(:distributors).conditions_any(conds)
-                           }
-
-      def ProductFilters.distributor_filter
-        distributors = Enterprise.is_distributor.map(&:name).compact.uniq
-        conds = Hash[*distributors.map { |d| [d, "#{Enterprise.table_name}.name = '#{d}'"] }.flatten]
-        { name: "Group",
-          scope: :distributor_any,
-          conds: conds,
-          labels: distributors.sort.map { |k| [k, k] } }
-      end
-    end
-  end
-end
diff --git a/public/noimage/small.png b/public/noimage/small.png
index aa17b73ed8..6c88e44ca4 100644
Binary files a/public/noimage/small.png and b/public/noimage/small.png differ
diff --git a/script/release-notes-template b/script/release-notes-template
new file mode 100755
index 0000000000..d5e02d2887
--- /dev/null
+++ b/script/release-notes-template
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Lists all PRs for the next release in a neat list to copy into the release
+# template. It also opens all PRs in Firefox so that you can find the release
+# notes.
+
+git fetch upstream
+latest="$(git tag --sort="-v:refname" | head -1)"
+
+echo "Changes since last release $latest:"
+
+pr_numbers() {
+	git log "$latest.." --merges --oneline |\
+        grep -oP 'Merge pull request #\K[0-9]+(?= from)'
+}
+
+pr_numbers |\
+       while read n; do echo "https://github.com/openfoodfoundation/openfoodnetwork/pull/$n"; done |\
+       xargs firefox
+
+pr_numbers |\
+       while read n; do echo "- #$n "; done
diff --git a/spec/.rubocop.yml b/spec/.rubocop.yml
new file mode 100644
index 0000000000..5d20d5e3d1
--- /dev/null
+++ b/spec/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_from:
+  - ../.rubocop_specs.yml
diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb
index b439cc7c9c..efdb436c3a 100644
--- a/spec/controllers/admin/customers_controller_spec.rb
+++ b/spec/controllers/admin/customers_controller_spec.rb
@@ -1,172 +1,174 @@
 require 'spec_helper'
 
-describe Admin::CustomersController, type: :controller do
-  include AuthenticationHelper
+module Admin
+  describe CustomersController, type: :controller do
+    include AuthenticationHelper
 
-  describe "index" do
-    let(:enterprise) { create(:distributor_enterprise) }
-    let(:another_enterprise) { create(:distributor_enterprise) }
+    describe "index" do
+      let(:enterprise) { create(:distributor_enterprise) }
+      let(:another_enterprise) { create(:distributor_enterprise) }
 
-    context "html" do
-      before do
-        allow(controller).to receive(:spree_current_user) { enterprise.owner }
-      end
-
-      it "returns an empty @collection" do
-        spree_get :index, format: :html
-        expect(assigns(:collection)).to eq []
-      end
-    end
-
-    context "json" do
-      let!(:customer) { create(:customer, enterprise: enterprise) }
-
-      context "where I manage the enterprise" do
+      context "html" do
         before do
           allow(controller).to receive(:spree_current_user) { enterprise.owner }
         end
 
-        context "and enterprise_id is given in params" do
-          let(:params) { { format: :json, enterprise_id: enterprise.id } }
+        it "returns an empty @collection" do
+          spree_get :index, format: :html
+          expect(assigns(:collection)).to eq []
+        end
+      end
 
-          it "scopes @collection to customers of that enterprise" do
-            spree_get :index, params
-            expect(assigns(:collection)).to eq [customer]
+      context "json" do
+        let!(:customer) { create(:customer, enterprise: enterprise) }
+
+        context "where I manage the enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { enterprise.owner }
           end
 
-          it "serializes the data" do
-            expect(ActiveModel::ArraySerializer).to receive(:new)
-            spree_get :index, params
+          context "and enterprise_id is given in params" do
+            let(:params) { { format: :json, enterprise_id: enterprise.id } }
+
+            it "scopes @collection to customers of that enterprise" do
+              spree_get :index, params
+              expect(assigns(:collection)).to eq [customer]
+            end
+
+            it "serializes the data" do
+              expect(ActiveModel::ArraySerializer).to receive(:new)
+              spree_get :index, params
+            end
+          end
+
+          context "and enterprise_id is not given in params" do
+            it "returns an empty collection" do
+              spree_get :index, format: :json
+              expect(assigns(:collection)).to eq []
+            end
           end
         end
 
-        context "and enterprise_id is not given in params" do
+        context "and I do not manage the enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+          end
+
           it "returns an empty collection" do
             spree_get :index, format: :json
             expect(assigns(:collection)).to eq []
           end
         end
       end
+    end
 
-      context "and I do not manage the enterprise" do
-        before do
-          allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+    describe "update" do
+      let(:enterprise) { create(:distributor_enterprise) }
+      let(:another_enterprise) { create(:distributor_enterprise) }
+
+      context "json" do
+        let!(:customer) { create(:customer, enterprise: enterprise) }
+
+        context "where I manage the customer's enterprise" do
+          render_views
+
+          before do
+            allow(controller).to receive(:spree_current_user) { enterprise.owner }
+          end
+
+          it "allows me to update the customer" do
+            spree_put :update, format: :json, id: customer.id, customer: { email: 'new.email@gmail.com' }
+            expect(JSON.parse(response.body)["id"]).to eq customer.id
+            expect(assigns(:customer)).to eq customer
+            expect(customer.reload.email).to eq 'new.email@gmail.com'
+          end
         end
 
-        it "returns an empty collection" do
-          spree_get :index, format: :json
-          expect(assigns(:collection)).to eq []
+        context "where I don't manage the customer's enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+          end
+
+          it "prevents me from updating the customer" do
+            spree_put :update, format: :json, id: customer.id, customer: { email: 'new.email@gmail.com' }
+            expect(response).to redirect_to unauthorized_path
+            expect(assigns(:customer)).to eq nil
+            expect(customer.email).to_not eq 'new.email@gmail.com'
+          end
         end
       end
     end
-  end
 
-  describe "update" do
-    let(:enterprise) { create(:distributor_enterprise) }
-    let(:another_enterprise) { create(:distributor_enterprise) }
+    describe "create" do
+      let(:enterprise) { create(:distributor_enterprise) }
+      let(:another_enterprise) { create(:distributor_enterprise) }
 
-    context "json" do
-      let!(:customer) { create(:customer, enterprise: enterprise) }
-
-      context "where I manage the customer's enterprise" do
-        render_views
-
-        before do
-          allow(controller).to receive(:spree_current_user) { enterprise.owner }
-        end
-
-        it "allows me to update the customer" do
-          spree_put :update, format: :json, id: customer.id, customer: { email: 'new.email@gmail.com' }
-          expect(JSON.parse(response.body)["id"]).to eq customer.id
-          expect(assigns(:customer)).to eq customer
-          expect(customer.reload.email).to eq 'new.email@gmail.com'
-        end
+      def create_customer(enterprise)
+        spree_put :create, format: :json, customer: { email: 'new@example.com', enterprise_id: enterprise.id }
       end
 
-      context "where I don't manage the customer's enterprise" do
-        before do
-          allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+      context "json" do
+        context "where I manage the customer's enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { enterprise.owner }
+          end
+
+          it "allows me to create the customer" do
+            expect { create_customer enterprise }.to change(Customer, :count).by(1)
+          end
         end
 
-        it "prevents me from updating the customer" do
-          spree_put :update, format: :json, id: customer.id, customer: { email: 'new.email@gmail.com' }
-          expect(response).to redirect_to unauthorized_path
-          expect(assigns(:customer)).to eq nil
-          expect(customer.email).to_not eq 'new.email@gmail.com'
+        context "where I don't manage the customer's enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+          end
+
+          it "prevents me from creating the customer" do
+            expect { create_customer enterprise }.to change(Customer, :count).by(0)
+          end
+        end
+
+        context "where I am the admin user" do
+          before do
+            allow(controller).to receive(:spree_current_user) { create(:admin_user) }
+          end
+
+          it "allows admins to create the customer" do
+            expect { create_customer enterprise }.to change(Customer, :count).by(1)
+          end
         end
       end
     end
-  end
 
-  describe "create" do
-    let(:enterprise) { create(:distributor_enterprise) }
-    let(:another_enterprise) { create(:distributor_enterprise) }
+    describe "show" do
+      let(:enterprise) { create(:distributor_enterprise) }
+      let(:another_enterprise) { create(:distributor_enterprise) }
 
-    def create_customer(enterprise)
-      spree_put :create, format: :json, customer: { email: 'new@example.com', enterprise_id: enterprise.id }
-    end
+      context "json" do
+        let!(:customer) { create(:customer, enterprise: enterprise) }
 
-    context "json" do
-      context "where I manage the customer's enterprise" do
-        before do
-          allow(controller).to receive(:spree_current_user) { enterprise.owner }
+        context "where I manage the customer's enterprise" do
+          render_views
+
+          before do
+            allow(controller).to receive(:spree_current_user) { enterprise.owner }
+          end
+
+          it "renders the customer as json" do
+            spree_get :show, format: :json, id: customer.id
+            expect(JSON.parse(response.body)["id"]).to eq customer.id
+          end
         end
 
-        it "allows me to create the customer" do
-          expect { create_customer enterprise }.to change(Customer, :count).by(1)
-        end
-      end
+        context "where I don't manage the customer's enterprise" do
+          before do
+            allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
+          end
 
-      context "where I don't manage the customer's enterprise" do
-        before do
-          allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
-        end
-
-        it "prevents me from creating the customer" do
-          expect { create_customer enterprise }.to change(Customer, :count).by(0)
-        end
-      end
-
-      context "where I am the admin user" do
-        before do
-          allow(controller).to receive(:spree_current_user) { create(:admin_user) }
-        end
-
-        it "allows admins to create the customer" do
-          expect { create_customer enterprise }.to change(Customer, :count).by(1)
-        end
-      end
-    end
-  end
-
-  describe "show" do
-    let(:enterprise) { create(:distributor_enterprise) }
-    let(:another_enterprise) { create(:distributor_enterprise) }
-
-    context "json" do
-      let!(:customer) { create(:customer, enterprise: enterprise) }
-
-      context "where I manage the customer's enterprise" do
-        render_views
-
-        before do
-          allow(controller).to receive(:spree_current_user) { enterprise.owner }
-        end
-
-        it "renders the customer as json" do
-          spree_get :show, format: :json, id: customer.id
-          expect(JSON.parse(response.body)["id"]).to eq customer.id
-        end
-      end
-
-      context "where I don't manage the customer's enterprise" do
-        before do
-          allow(controller).to receive(:spree_current_user) { another_enterprise.owner }
-        end
-
-        it "prevents me from updating the customer" do
-          spree_get :show, format: :json, id: customer.id
-          expect(response).to redirect_to unauthorized_path
+          it "prevents me from updating the customer" do
+            spree_get :show, format: :json, id: customer.id
+            expect(response).to redirect_to unauthorized_path
+          end
         end
       end
     end
diff --git a/spec/controllers/checkout_controller_concurrency_spec.rb b/spec/controllers/checkout_controller_concurrency_spec.rb
index 266f9a4fbe..9d66c05a1f 100644
--- a/spec/controllers/checkout_controller_concurrency_spec.rb
+++ b/spec/controllers/checkout_controller_concurrency_spec.rb
@@ -48,12 +48,6 @@ describe CheckoutController, concurrency: true, type: :controller do
     # New threads start running straight away. The breakpoint is after loading
     # the order and before advancing the order's state and making payments.
     breakpoint.lock
-    expect(controller).to receive(:fire_event).with("spree.checkout.update") do
-      breakpoint.synchronize {}
-      # This is what fire_event does.
-      # I did not find out how to call the original code otherwise.
-      ActiveSupport::Notifications.instrument("spree.checkout.update")
-    end
 
     # Starting two checkout threads. The controller code will determine if
     # these two threads are synchronised correctly or run into a race condition.
diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb
index 7691bd6e72..5a439e55cb 100644
--- a/spec/controllers/spree/admin/adjustments_controller_spec.rb
+++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb
@@ -8,7 +8,7 @@ module Spree
 
     describe "setting included tax" do
       let(:order) { create(:order) }
-      let(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: Calculator::DefaultTax.new) }
+      let(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: ::Calculator::DefaultTax.new) }
 
       describe "creating an adjustment" do
         it "sets included tax to zero when no tax rate is specified" do
diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb
deleted file mode 100644
index 20bdd9dae0..0000000000
--- a/spec/controllers/spree/admin/image_settings_controller_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Admin::ImageSettingsController do
-  include AuthenticationHelper
-
-  before { controller_login_as_admin }
-
-  context "updating image settings" do
-    it "should be able to update paperclip settings" do
-      spree_put :update, preferences: { "attachment_path" => "foo/bar",
-                                        "attachment_default_url" => "baz/bar" }
-
-      expect(Spree::Config[:attachment_path]).to eq("foo/bar")
-      expect(Spree::Config[:attachment_default_url]).to eq("baz/bar")
-    end
-
-    context "paperclip styles" do
-      it "should be able to update the paperclip styles" do
-        spree_put :update, "attachment_styles" => { "thumb" => "25x25>" }
-        updated_styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        expect(updated_styles["thumb"]).to eq("25x25>")
-      end
-
-      it "should be able to add a new style" do
-        spree_put :update, "attachment_styles" => {},
-                           "new_attachment_styles" => { "1" => { "name" => "jumbo",
-                                                                 "value" => "2000x2000>" } }
-        styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        expect(styles["jumbo"]).to eq("2000x2000>")
-      end
-    end
-
-    context "amazon s3" do
-      after(:all) do
-        Spree::Image.attachment_definitions[:attachment].delete :storage
-      end
-
-      it "should be able to update s3 settings" do
-        spree_put :update, preferences:
-        {
-          "use_s3" => "1",
-          "s3_access_key" => "a_valid_key",
-          "s3_secret" => "a_secret",
-          "s3_bucket" => "some_bucket"
-        }
-        expect(Spree::Config[:use_s3]).to be_truthy
-        expect(Spree::Config[:s3_access_key]).to eq("a_valid_key")
-        expect(Spree::Config[:s3_secret]).to     eq("a_secret")
-        expect(Spree::Config[:s3_bucket]).to     eq("some_bucket")
-      end
-
-      context "headers" do
-        before(:each) { Spree::Config[:use_s3] = true }
-
-        it "should be able to update the s3 headers" do
-          spree_put :update, "preferences" => { "use_s3" => "1" },
-                             "s3_headers" => { "Cache-Control" => "max-age=1111" }
-          headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-          expect(headers["Cache-Control"]).to eq("max-age=1111")
-        end
-
-        it "should be able to add a new header" do
-          spree_put :update, "s3_headers" => {},
-                             "new_s3_headers" => { "1" => { "name" => "Charset",
-                                                            "value" => "utf-8" } }
-          headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-          expect(headers["Charset"]).to eq("utf-8")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
index 1b97a6fcd2..24decb1b9b 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
@@ -5,6 +5,7 @@ require 'spree/core/gateway_error'
 
 describe Spree::Admin::PaymentsController, type: :controller do
   include StripeHelper
+  include StripeStubs
 
   let!(:shop) { create(:enterprise) }
   let!(:user) { shop.owner }
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
index 2f327e2de2..f42cffe222 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'spree/core/gateway_error'
 
 describe Spree::Admin::PaymentsController, type: :controller do
   let!(:shop) { create(:enterprise) }
diff --git a/spec/coverage_helper.rb b/spec/coverage_helper.rb
new file mode 100644
index 0000000000..839fd1d7b0
--- /dev/null
+++ b/spec/coverage_helper.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+
+SimpleCov.minimum_coverage 54
+SimpleCov.start 'rails' do
+  add_filter '/bin/'
+  add_filter '/config/'
+  add_filter '/jobs/application_job.rb'
+  add_filter '/schemas/'
+  add_filter '/lib/generators'
+  add_filter '/spec/'
+  add_filter '/vendor/'
+  add_filter '/public'
+  add_filter '/swagger'
+  add_filter '/script'
+  add_filter '/log'
+  add_filter '/db'
+end
diff --git a/spec/factories/calculator_factory.rb b/spec/factories/calculator_factory.rb
index c713ace1ca..a05434f424 100644
--- a/spec/factories/calculator_factory.rb
+++ b/spec/factories/calculator_factory.rb
@@ -1,9 +1,9 @@
 FactoryBot.define do
-  factory :calculator, class: Spree::Calculator::FlatRate do
+  factory :calculator, class: Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 10.0) }
   end
 
-  factory :no_amount_calculator, class: Spree::Calculator::FlatRate do
+  factory :no_amount_calculator, class: Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 0) }
   end
 
diff --git a/spec/factories/stock_factory.rb b/spec/factories/stock_factory.rb
index b501401507..c288121873 100644
--- a/spec/factories/stock_factory.rb
+++ b/spec/factories/stock_factory.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :stock_package, class: Spree::Stock::Package do
+  factory :stock_package, class: OrderManagement::Stock::Package do
     ignore do
       stock_location { build(:stock_location) }
       order { create(:order_with_line_items, line_items_count: 2) }
diff --git a/spec/features/admin/configuration/general_settings_spec.rb b/spec/features/admin/configuration/general_settings_spec.rb
index e676f32801..7a9299a634 100644
--- a/spec/features/admin/configuration/general_settings_spec.rb
+++ b/spec/features/admin/configuration/general_settings_spec.rb
@@ -12,19 +12,19 @@ describe "General Settings" do
   context "visiting general settings (admin)" do
     it "should have the right content" do
       expect(page).to have_content("General Settings")
-      expect(find("#site_name").value).to eq("Spree Demo Site")
-      expect(find("#site_url").value).to eq("demo.spreecommerce.com")
+      expect(find("#site_name").value).to eq("OFN Demo Site")
+      expect(find("#site_url").value).to eq("demo.openfoodnetwork.org")
     end
   end
 
   context "editing general settings (admin)" do
     it "should be able to update the site name" do
-      fill_in "site_name", with: "Spree Demo Site99"
+      fill_in "site_name", with: "OFN Demo Site99"
       click_button "Update"
 
       assert_successful_update_message(:general_settings)
 
-      expect(find("#site_name").value).to eq("Spree Demo Site99")
+      expect(find("#site_name").value).to eq("OFN Demo Site99")
     end
 
     def assert_successful_update_message(resource)
diff --git a/spec/features/admin/configuration/image_settings_spec.rb b/spec/features/admin/configuration/image_settings_spec.rb
deleted file mode 100644
index 5c87e8e6ad..0000000000
--- a/spec/features/admin/configuration/image_settings_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe "image settings" do
-  include AuthenticationHelper
-
-  before do
-    login_as_admin_and_visit spree.admin_dashboard_path
-    click_link "Configuration"
-    click_link "Image Settings"
-  end
-
-  # Regression test for #2344
-  it "can update attachment_url" do
-    fill_in "Attachments URL", with: "foobar"
-    fill_in "Attachments Default URL", with: "barfoo"
-    fill_in "Attachments Path", with: "spec/dummy/tmp/bfaoro"
-    click_button "Update"
-
-    expect(Spree::Config[:attachment_url]).to eq("foobar")
-    expect(Spree::Config[:attachment_default_url]).to eq("barfoo")
-    expect(Spree::Config[:attachment_path]).to eq("spec/dummy/tmp/bfaoro")
-  end
-
-  # Regression test for #3069
-  context "updates style configs and uploads products" do
-    let!(:product) { create(:product) }
-    let(:file_path) { Rails.root + "spec/support/fixtures/thinking-cat.jpg" }
-
-    it "still uploads image gracefully" do
-      click_button "Update"
-
-      visit spree.new_admin_product_image_path(product)
-      attach_file('image_attachment', file_path)
-      expect {
-        click_on "Update"
-      }.to_not raise_error
-    end
-  end
-end
diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb
index 56ff8fac73..52e2db4811 100644
--- a/spec/features/admin/configuration/tax_rates_spec.rb
+++ b/spec/features/admin/configuration/tax_rates_spec.rb
@@ -10,7 +10,7 @@ describe "Tax Rates" do
     login_as_admin_and_visit spree.edit_admin_general_settings_path
   end
 
-  # Regression test for #535
+  # Regression test for Spree #535
   it "can see a tax rate in the list if the tax category has been deleted" do
     tax_rate.tax_category.update_column(:deleted_at, Time.zone.now)
     expect { click_link "Tax Rates" }.not_to raise_error
diff --git a/spec/features/admin/image_settings_spec.rb b/spec/features/admin/image_settings_spec.rb
deleted file mode 100644
index 83e584a0ce..0000000000
--- a/spec/features/admin/image_settings_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-feature '
-    As an admin
-    I want to manage image formats
-' do
-  include AuthenticationHelper
-  include WebHelper
-
-  before(:all) do
-    styles = { "mini" => "48x48>",
-               "small" => "100x100>",
-               "product" => "240x240>",
-               "large" => "600x600>" }
-
-    Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles)
-    Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-    Spree::Image.reformat_styles
-  end
-
-  scenario "setting the image format for a paperclip style" do
-    # When I go to the image settings page
-    login_as_admin_and_visit spree.edit_admin_image_settings_path
-
-    # All the styles should default to "Unchanged"
-    expect(page).to have_select 'attachment_styles_format_mini',    selected: 'Unchanged'
-    expect(page).to have_select 'attachment_styles_format_small',   selected: 'Unchanged'
-    expect(page).to have_select 'attachment_styles_format_product', selected: 'Unchanged'
-    expect(page).to have_select 'attachment_styles_format_large',   selected: 'Unchanged'
-
-    # When I change a style to "PNG" and save
-    select 'PNG', from: 'attachment_styles_format_mini'
-    click_button 'Update'
-
-    # Then the change should be saved to the image formats
-    expect(page).to have_content "Image Settings successfully updated."
-    expect(page).to have_select 'attachment_styles_format_mini', selected: 'PNG'
-
-    styles = Spree::Image.attachment_definitions[:attachment][:styles]
-    expect(styles[:mini]).to eq(['48x48>', :png])
-  end
-end
diff --git a/spec/features/admin/payments_stripe_spec.rb b/spec/features/admin/payments_stripe_spec.rb
index b296d0fc32..1a3d6047bf 100644
--- a/spec/features/admin/payments_stripe_spec.rb
+++ b/spec/features/admin/payments_stripe_spec.rb
@@ -8,6 +8,7 @@ feature '
 ' do
   include AuthenticationHelper
   include StripeHelper
+  include StripeStubs
 
   let!(:order) { create(:completed_order_with_fees) }
   let!(:stripe_payment_method) do
diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb
index 0f3f035379..8ed520362e 100644
--- a/spec/features/admin/tag_rules_spec.rb
+++ b/spec/features/admin/tag_rules_spec.rb
@@ -16,7 +16,7 @@ feature 'Tag Rules', js: true do
       expect(page).to have_content 'No tags apply to this enterprise yet'
       expect(page).to have_no_selector '.customer_tag'
       click_button '+ Add A New Tag'
-      find(:css, "tags-input .tags input").set "volunteer\n"
+      fill_in_tag "volunteer"
 
       # New FilterShippingMethods Rule
       expect(page).to have_content 'No rules apply to this tag yet'
@@ -24,7 +24,7 @@ feature 'Tag Rules', js: true do
       select2_select 'Show or Hide shipping methods at checkout', from: 'rule_type_selector'
       click_button "Add Rule"
       within(".customer_tag #tr_0") do
-        find(:css, "tags-input .tags input").set "volunteers-only\n"
+        fill_in_tag "volunteers-only"
         select2_select "NOT VISIBLE", from: "enterprise_tag_rules_attributes_0_preferred_matched_shipping_methods_visibility"
       end
 
@@ -33,7 +33,7 @@ feature 'Tag Rules', js: true do
       select2_select 'Show or Hide variants in my shop', from: 'rule_type_selector'
       click_button "Add Rule"
       within(".customer_tag #tr_1") do
-        find(:css, "tags-input .tags input").set "volunteers-only1\n"
+        fill_in_tag "volunteers-only1"
         select2_select "VISIBLE", from: "enterprise_tag_rules_attributes_1_preferred_matched_variants_visibility"
       end
 
@@ -42,7 +42,7 @@ feature 'Tag Rules', js: true do
       select2_select 'Show or Hide payment methods at checkout', from: 'rule_type_selector'
       click_button "Add Rule"
       within(".customer_tag #tr_2") do
-        find(:css, "tags-input .tags input").set "volunteers-only2\n"
+        fill_in_tag "volunteers-only2"
         select2_select "VISIBLE", from: "enterprise_tag_rules_attributes_2_preferred_matched_payment_methods_visibility"
       end
 
@@ -51,7 +51,7 @@ feature 'Tag Rules', js: true do
       select2_select 'Show or Hide order cycles in my shopfront', from: 'rule_type_selector'
       click_button "Add Rule"
       within(".customer_tag #tr_3") do
-        find(:css, "tags-input .tags input").set "volunteers-only3\n"
+        fill_in_tag "volunteers-only3"
         select2_select "NOT VISIBLE", from: "enterprise_tag_rules_attributes_3_preferred_matched_order_cycles_visibility"
       end
 
@@ -60,7 +60,7 @@ feature 'Tag Rules', js: true do
       select2_select 'Show or Hide order cycles in my shopfront', from: 'rule_type_selector'
       click_button "Add Rule"
       within(".default_rules #tr_0") do
-        find(:css, "tags-input .tags input").set "wholesale\n"
+        fill_in_tag "wholesale"
         expect(page).to have_content "not visible"
       end
 
@@ -124,20 +124,20 @@ feature 'Tag Rules', js: true do
       expect(page).to have_selector '.customer_tag .header tags-input .tag-list ti-tag-item', text: "trusted", count: 1
       all(:css, ".customer_tag .header tags-input").each do |node|
         node.find("li.tag-item a.remove-button").click
-        node.find(".tags input").set "volunteer\n"
+        within(:xpath, node.path) { fill_in_tag "volunteer", ".tags input" }
       end
 
       # DEFAULT FilterShippingMethods rule
       within ".default_rules #tr_0" do
         within "li.tag-item", text: "local ✖" do find("a.remove-button").click end
-        find(:css, "tags-input .tags input").set "volunteers-only\n"
+        fill_in_tag "volunteers-only"
         expect(page).to have_content "not visible"
       end
 
       # FilterProducts rule
       within ".customer_tag #tr_1" do
         within "li.tag-item", text: "member ✖" do find("a.remove-button").click end
-        find(:css, "tags-input .tags input").set "volunteers-only1\n"
+        fill_in_tag "volunteers-only1"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_1_preferred_matched_variants_visibility", selected: 'VISIBLE'
         select2_select 'NOT VISIBLE', from: "enterprise_tag_rules_attributes_1_preferred_matched_variants_visibility"
       end
@@ -145,7 +145,7 @@ feature 'Tag Rules', js: true do
       # FilterPaymentMethods rule
       within ".customer_tag #tr_2" do
         within "li.tag-item", text: "trusted ✖" do find("a.remove-button").click end
-        find(:css, "tags-input .tags input").set "volunteers-only2\n"
+        fill_in_tag "volunteers-only2"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_2_preferred_matched_payment_methods_visibility", selected: 'NOT VISIBLE'
         select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_2_preferred_matched_payment_methods_visibility"
       end
@@ -153,7 +153,7 @@ feature 'Tag Rules', js: true do
       # FilterOrderCycles rule
       within ".customer_tag #tr_3" do
         within "li.tag-item", text: "wholesale ✖" do find("a.remove-button").click end
-        find(:css, "tags-input .tags input").set "volunteers-only3\n"
+        fill_in_tag "volunteers-only3"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_3_preferred_matched_order_cycles_visibility", selected: 'VISIBLE'
         select2_select 'NOT VISIBLE', from: "enterprise_tag_rules_attributes_3_preferred_matched_order_cycles_visibility"
       end
@@ -161,7 +161,7 @@ feature 'Tag Rules', js: true do
       # FilterShippingMethods rule
       within ".customer_tag #tr_4" do
         within "li.tag-item", text: "local ✖" do find("a.remove-button").click end
-        find(:css, "tags-input .tags input").set "volunteers-only4\n"
+        fill_in_tag "volunteers-only4"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_4_preferred_matched_shipping_methods_visibility", selected: 'NOT VISIBLE'
         select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_4_preferred_matched_shipping_methods_visibility"
       end
diff --git a/spec/features/consumer/shopping/checkout_stripe_spec.rb b/spec/features/consumer/shopping/checkout_stripe_spec.rb
index 6c99489013..e3a32718aa 100644
--- a/spec/features/consumer/shopping/checkout_stripe_spec.rb
+++ b/spec/features/consumer/shopping/checkout_stripe_spec.rb
@@ -7,6 +7,7 @@ feature "Check out with Stripe", js: true do
   include ShopWorkflow
   include CheckoutHelper
   include StripeHelper
+  include StripeStubs
 
   let(:distributor) { create(:distributor_enterprise) }
   let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor], variants: [variant]) }
@@ -90,12 +91,12 @@ feature "Check out with Stripe", js: true do
     let!(:shipping_method) { create(:shipping_method) }
     let(:error_message) { "Card was declined: insufficient funds." }
 
-    context "with guest checkout" do
-      before do
-        stub_payment_intent_get_request
-        stub_payment_methods_post_request
-      end
+    before do
+      stub_payment_intent_get_request
+      stub_payment_methods_post_request
+    end
 
+    context "with guest checkout" do
       context "when the card is accepted" do
         before do
           stub_payment_intents_post_request order: order
@@ -126,7 +127,7 @@ feature "Check out with Stripe", js: true do
         end
       end
 
-      context "when the card needs extra SCA authorization", js: true do
+      context "when the card needs extra SCA authorization" do
         before do
           stripe_redirect_url = checkout_path(payment_intent: "pi_123")
           stub_payment_intents_post_request_with_redirect order: order,
@@ -194,5 +195,49 @@ feature "Check out with Stripe", js: true do
         end
       end
     end
+
+    context "with a logged in user" do
+      let(:user) { order.user }
+
+      before do
+        login_as user
+      end
+
+      context "saving a card and re-using it" do
+        before do
+          stub_payment_methods_post_request request: { payment_method: "pm_123", customer: "cus_A123" }, response: { pm_id: "pm_123" }
+          stub_payment_intents_post_request order: order
+          stub_successful_capture_request order: order
+          stub_customers_post_request email: user.email
+          stub_payment_method_attach_request
+        end
+
+        it "allows saving a card and re-using it" do
+          checkout_with_stripe guest_checkout: false, remember_card: true
+
+          expect(page).to have_content "Confirmed"
+          expect(order.reload.completed?).to eq true
+          expect(order.payments.first.state).to eq "completed"
+
+          # Verify card has been saved with correct stripe IDs
+          user_credit_card = order.reload.user.credit_cards.first
+          expect(user_credit_card.gateway_payment_profile_id).to eq "pm_123"
+          expect(user_credit_card.gateway_customer_profile_id).to eq "cus_A123"
+
+          # Prepare a second order
+          new_order = create(:order, user: user, order_cycle: order_cycle, distributor: distributor, bill_address_id: nil, ship_address_id: nil)
+          set_order(new_order)
+          add_product_to_cart(new_order, product, quantity: 10)
+
+          # Checkout with saved card
+          visit checkout_path
+          choose free_shipping.name
+          choose stripe_sca_payment_method.name
+          expect(page).to have_content "Use a saved card"
+          expect(page).to have_select 'selected_card', selected: "Visa x-4242 Exp:10/2050"
+          place_order
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 5a821ea9fa..0a9dec3a17 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -243,20 +243,24 @@ feature "As a consumer I want to shop with a distributor", js: true do
         it "should save group buy data to the cart and display it on shopfront reload" do
           # -- Quantity
           click_add_bulk_to_cart variant, 6
+          close_modal
           expect(page).to have_in_cart product.name
           toggle_cart
 
           expect(order.reload.line_items.first.quantity).to eq(6)
 
           # -- Max quantity
-          click_add_bulk_max_to_cart variant, 7
+          open_bulk_quantity_modal(variant)
+          click_add_bulk_max_to_cart variant, 1
 
           expect(order.reload.line_items.first.max_quantity).to eq(7)
 
           # -- Reload
           visit shop_path
-          expect(page).to have_field "variants[#{variant.id}]", with: 6
-          expect(page).to have_field "variant_attributes[#{variant.id}][max_quantity]", with: 7
+          within_variant(variant) do
+            expect(page).to have_selector "button.bulk-buy:nth-of-type(1)", text: "6"
+            expect(page).to have_selector "button.bulk-buy:nth-last-of-type(1)", text: "7"
+          end
         end
       end
     end
@@ -294,19 +298,21 @@ feature "As a consumer I want to shop with a distributor", js: true do
 
         click_add_to_cart variant, 10
 
-        expect(page).to have_field "variants[#{variant.id}]", with: '10'
+        within_variant(variant) do
+          expect(page).to have_content "10 in cart"
+        end
       end
 
       it "alerts us when we enter a quantity greater than the stock available" do
         variant.update on_hand: 5
         visit shop_path
 
-        
-        accept_alert 'Insufficient stock available, only 5 remaining' do
-          fill_in "variants[#{variant.id}]", with: '10'
-        end
+        click_add_to_cart variant, 5
 
-        expect(page).to have_field "variants[#{variant.id}]", with: '5'
+        within_variant(variant) do
+          expect(page).to have_content "5 in cart"
+          expect(page).to have_button increase_quantity_symbol, disabled: true
+        end
       end
 
       describe "when a product goes out of stock just before it's added to the cart" do
@@ -325,8 +331,13 @@ feature "As a consumer I want to shop with a distributor", js: true do
 
           # -- Page updates
           # Update amount in cart
-          expect(page).to have_field "variants[#{variant.id}]", with: '0', disabled: true
-          expect(page).to have_field "variants[#{variant2.id}]", with: ''
+          within_variant(variant) do
+            expect(page).to have_button "Add", disabled: true
+            expect(page).to have_no_content "in cart"
+          end
+          within_variant(variant2) do
+            expect(page).to have_button "Add", disabled: false
+          end
 
           # Update amount available in product list
           #   If amount falls to zero, variant should be greyed out and input disabled
@@ -352,7 +363,11 @@ feature "As a consumer I want to shop with a distributor", js: true do
             variant.update! on_hand: 0
 
             # -- Messaging
-            click_add_bulk_max_to_cart variant
+            within(".reveal-modal") do
+              page.all("button", text: increase_quantity_symbol).last.click
+            end
+            close_modal
+            wait_for_cart
 
             within(".out-of-stock-modal") do
               expect(page).to have_content "stock levels for one or more of the products in your cart have reduced"
@@ -361,12 +376,14 @@ feature "As a consumer I want to shop with a distributor", js: true do
 
             # -- Page updates
             # Update amount in cart
-            expect(page).to have_field "variant_attributes[#{variant.id}][max_quantity]", with: '0', disabled: true
+            within_variant(variant) do
+              expect(page).to have_button "Add", disabled: true
+              expect(page).to have_no_content "in cart"
+            end
 
             # Update amount available in product list
-            #   If amount falls to zero, variant should be greyed out and input disabled
+            #   If amount falls to zero, variant should be greyed out
             expect(page).to have_selector "#variant-#{variant.id}.out-of-stock"
-            expect(page).to have_selector "#variants_#{variant.id}_max[disabled='disabled']"
           end
         end
 
@@ -389,7 +406,8 @@ feature "As a consumer I want to shop with a distributor", js: true do
 
             it "does not update max_quantity" do
               click_add_bulk_to_cart variant, 2
-              click_add_bulk_max_to_cart variant, 3
+              click_add_bulk_max_to_cart variant, 1
+              close_modal
 
               variant.update! on_hand: 1
 
@@ -400,8 +418,10 @@ feature "As a consumer I want to shop with a distributor", js: true do
                 expect(page).to have_content "#{product.name} - #{variant.unit_to_display} now only has 1 remaining"
               end
 
-              expect(page).to have_field "variants[#{variant.id}]", with: '1'
-              expect(page).to have_field "variant_attributes[#{variant.id}][max_quantity]", with: '3'
+              within_variant(variant) do
+                expect(page).to have_selector "button.bulk-buy:nth-of-type(1)", text: "1"
+                expect(page).to have_selector "button.bulk-buy:nth-last-of-type(1)", text: "3"
+              end
             end
           end
         end
@@ -554,9 +574,10 @@ feature "As a consumer I want to shop with a distributor", js: true do
     end
 
     # Removes the item from the client-side cart and marks the variant as unavailable
-    expect(page).to have_field "variants[#{variant.id}]", with: '0', disabled: true
     expect(page).to have_selector "#variant-#{variant.id}.out-of-stock"
-    expect(page).to have_selector "#variants_#{variant.id}[ofn-on-hand='0']"
-    expect(page).to have_selector "#variants_#{variant.id}[disabled='disabled']"
+    within_variant(variant) do
+      expect(page).to have_button "Add", disabled: true
+      expect(page).to have_no_content "in cart"
+    end
   end
 end
diff --git a/spec/features/consumer/shopping/variant_overrides_spec.rb b/spec/features/consumer/shopping/variant_overrides_spec.rb
index 3fffbe61bc..f572ddca99 100644
--- a/spec/features/consumer/shopping/variant_overrides_spec.rb
+++ b/spec/features/consumer/shopping/variant_overrides_spec.rb
@@ -58,10 +58,9 @@ feature "shopping with variant overrides defined", js: true do
 
     it "calculates fees correctly" do
       page.find("#variant-#{product1_variant1.id} .graph-button").click
-      page.find(".price_breakdown a").click
-      expect(page).to have_selector 'li.cost div', text: with_currency(55.55)
-      expect(page).to have_selector 'li.packing-fee div', text: with_currency(5.56)
-      expect(page).to have_selector 'li.total div', text: "= #{with_currency(61.11)}"
+      expect(page).to have_selector 'li', text: "#{with_currency(55.55)} Item cost"
+      expect(page).to have_selector 'li', text: "#{with_currency(5.56)} Packing fee"
+      expect(page).to have_selector 'li', text: "= #{with_currency(61.11)}"
     end
 
     it "shows the correct prices when products are in the cart" do
diff --git a/spec/javascripts/unit/darkswarm/controllers/checkout/shop_variant_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/checkout/shop_variant_controller_spec.js.coffee
new file mode 100644
index 0000000000..8a2be1ee42
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/controllers/checkout/shop_variant_controller_spec.js.coffee
@@ -0,0 +1,91 @@
+describe "ShopVariantCtrl", ->
+  ctrl = null
+  scope = null
+
+  beforeEach ->
+    module 'Darkswarm'
+    scope =
+      $watchGroup: ->
+      variant: {
+        on_demand: true
+        product: {group_buy: false}
+        line_item: {
+          quantity: 0
+          max_quantity: 0
+        }
+      }
+
+    inject ($controller, $modal)->
+      ctrl = $controller 'ShopVariantCtrl', {$scope: scope, $modal: $modal, Cart: null}
+
+  it "adds an item to the cart", ->
+    scope.add 1
+    expect(scope.variant.line_item.quantity).toEqual 1
+
+  it "adds to the existing quantity", ->
+    scope.add 1
+    scope.add 5
+    expect(scope.variant.line_item.quantity).toEqual 6
+
+  it "adds to the max quantity", ->
+    scope.addMax 5
+    expect(scope.variant.line_item.quantity).toEqual 0
+    expect(scope.variant.line_item.max_quantity).toEqual 5
+
+  it "adds to the max quantity to be at least min quantity", ->
+    scope.variant.product.group_buy = true
+    scope.variant.line_item.max_quantity = 2
+
+    scope.add 3
+
+    expect(scope.variant.line_item.quantity).toEqual 3
+    expect(scope.variant.line_item.max_quantity).toEqual 3
+
+  it "decreases the min quantity to not exceed max quantity", ->
+    scope.variant.product.group_buy = true
+    scope.variant.line_item.quantity = 3
+    scope.variant.line_item.max_quantity = 5
+
+    scope.addMax -3
+
+    expect(scope.variant.line_item.quantity).toEqual 2
+    expect(scope.variant.line_item.max_quantity).toEqual 2
+
+  it "allows adding when variant is on demand", ->
+    expect(scope.canAdd(5000)).toEqual true
+
+  it "denies adding if variant is out of stock", ->
+    scope.variant.on_demand = false
+    scope.variant.on_hand = 0
+
+    expect(scope.canAdd(1)).toEqual false
+
+  it "denies adding if stock is limitted", ->
+    scope.variant.on_demand = false
+    scope.variant.on_hand = 5
+
+    expect(scope.canAdd(4)).toEqual true
+    expect(scope.canAdd(5)).toEqual true
+    expect(scope.canAdd(6)).toEqual false
+
+    scope.add 3
+    expect(scope.canAdd(2)).toEqual true
+    expect(scope.canAdd(3)).toEqual false
+
+  it "denies declaring max quantity before item is in cart", ->
+    expect(scope.canAddMax(1)).toEqual false
+
+  it "allows declaring max quantity when item is in cart", ->
+    scope.add 1
+    expect(scope.canAddMax(1)).toEqual true
+
+  it "denies adding if stock is limitted", ->
+    scope.variant.on_demand = false
+    scope.variant.on_hand = 5
+    scope.variant.line_item.quantity = 1
+    scope.variant.line_item.max_quantity = 1
+
+    expect(scope.canAddMax(3)).toEqual true
+    expect(scope.canAddMax(4)).toEqual true
+    expect(scope.canAddMax(5)).toEqual false
+    expect(scope.canAddMax(6)).toEqual false
diff --git a/spec/javascripts/unit/darkswarm/services/variants_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/variants_spec.js.coffee
index 2d9d1452f3..4462616655 100644
--- a/spec/javascripts/unit/darkswarm/services/variants_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/variants_spec.js.coffee
@@ -35,9 +35,6 @@ describe 'Variants service', ->
       it "initialises the total_price", ->
         expect(Variants.register(variant).line_item.total_price).toEqual 400
 
-  it "initialises base price percentage", ->
-    expect(Variants.register(variant).base_price_percentage).toEqual 81
-
   it "clears registered variants", ->
     Variants.register(variant)
     expect(Variants.variants[variant.id]).toBe variant
diff --git a/spec/lib/spree/product_filters_spec.rb b/spec/lib/spree/product_filters_spec.rb
deleted file mode 100644
index 5829d9f450..0000000000
--- a/spec/lib/spree/product_filters_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Spree::ProductFilters do
-  context "distributor filter" do
-    it "provides filtering for all distributors" do
-      3.times { create(:distributor_enterprise) }
-      Enterprise.is_distributor.sort.map { |d| [d.name, d.name] }.each do |distributor|
-        expect(Spree::ProductFilters.distributor_filter[:labels]).to include distributor
-      end
-    end
-  end
-end
diff --git a/spec/lib/stripe/credit_card_cloner_spec.rb b/spec/lib/stripe/credit_card_cloner_spec.rb
index 40854560d6..432d707676 100644
--- a/spec/lib/stripe/credit_card_cloner_spec.rb
+++ b/spec/lib/stripe/credit_card_cloner_spec.rb
@@ -6,6 +6,8 @@ require 'stripe/credit_card_cloner'
 module Stripe
   describe CreditCardCloner do
     describe "#clone" do
+      include StripeStubs
+
       let(:cloner) { Stripe::CreditCardCloner.new }
 
       let(:customer_id) { "cus_A123" }
@@ -13,7 +15,6 @@ module Stripe
       let(:new_customer_id) { "cus_A456" }
       let(:new_payment_method_id) { "pm_456" }
       let(:stripe_account_id) { "acct_456" }
-      let(:customer_response_mock) { { status: 200, body: customer_response_body } }
       let(:payment_method_response_mock) { { status: 200, body: payment_method_response_body } }
 
       let(:credit_card) { create(:credit_card, user: create(:user)) }
@@ -21,18 +22,13 @@ module Stripe
       let(:payment_method_response_body) {
         JSON.generate(id: new_payment_method_id)
       }
-      let(:customer_response_body) {
-        JSON.generate(id: new_customer_id)
-      }
 
       before do
         allow(Stripe).to receive(:api_key) { "sk_test_12345" }
 
-        stub_request(:post, "https://api.stripe.com/v1/customers")
-          .with(body: { email: credit_card.user.email },
-                headers: { 'Stripe-Account' => stripe_account_id })
-          .to_return(customer_response_mock)
-
+        stub_customers_post_request email: credit_card.user.email,
+                                   response: { customer_id: new_customer_id },
+                                   stripe_account_header: true
         stub_request(:post,
                      "https://api.stripe.com/v1/payment_methods/#{new_payment_method_id}/attach")
           .with(body: { customer: new_customer_id },
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 642ffd1406..9d1b597d26 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -48,23 +48,35 @@ describe Spree::UserMailer do
   # adapted from https://github.com/spree/spree_auth_devise/blob/70737af/spec/mailers/user_mailer_spec.rb
   describe '#reset_password_instructions' do
     describe 'message contents' do
-      before do
-        @message = described_class.reset_password_instructions(user, nil)
-      end
+      let(:message) { described_class.reset_password_instructions(user, nil) }
 
       context 'subject includes' do
         it 'translated devise instructions' do
-          expect(@message.subject).to include "Reset password instructions"
+          expect(message.subject).to include "Reset password instructions"
         end
 
         it 'Spree site name' do
-          expect(@message.subject).to include Spree::Config[:site_name]
+          expect(message.subject).to include Spree::Config[:site_name]
         end
       end
 
       context 'body includes' do
         it 'password reset url' do
-          expect(@message.body.raw_source).to include spree.edit_spree_user_password_url
+          expect(message.body.raw_source).to include spree.edit_spree_user_password_url
+        end
+      end
+
+      context 'when the language is Spanish' do
+        let(:user) { build(:user, locale: 'es') }
+
+        it 'calls with_locale method with user selected locale' do
+          expect(I18n).to receive(:with_locale).with('es')
+          message
+        end
+
+        it 'calls devise reset_password_instructions subject' do
+          expect(I18n).to receive(:t).with('spree.user_mailer.reset_password_instructions.subject')
+          message
         end
       end
     end
diff --git a/spec/models/spree/app_configuration_spec.rb b/spec/models/spree/app_configuration_spec.rb
new file mode 100644
index 0000000000..607dc8501b
--- /dev/null
+++ b/spec/models/spree/app_configuration_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::AppConfiguration do
+  let(:prefs) { Rails.application.config.spree.preferences }
+
+  it "should be available from the environment" do
+    prefs.site_name = "TEST SITE NAME"
+    expect(prefs.site_name).to eq "TEST SITE NAME"
+  end
+
+  it "should be available as Spree::Config for legacy access" do
+    Spree::Config.site_name = "Spree::Config TEST SITE NAME"
+    expect(Spree::Config.site_name).to eq "Spree::Config TEST SITE NAME"
+  end
+end
diff --git a/spec/models/spree/image_spec.rb b/spec/models/spree/image_spec.rb
deleted file mode 100644
index 1ad60cbe57..0000000000
--- a/spec/models/spree/image_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Image do
-    describe "attachment definitions" do
-      let(:name_str)  { { "mini" => "48x48>" } }
-      let(:formatted) { { mini: ["48x48>", "png"] } }
-
-      it "converts style names to symbols" do
-        expect(Image.format_styles(name_str)).to eq(mini: "48x48>")
-      end
-
-      it "converts formats to symbols" do
-        expect(Image.format_styles(formatted)).to eq(mini: ["48x48>", :png])
-      end
-    end
-  end
-end
diff --git a/spec/models/spree/line_item_spec.rb b/spec/models/spree/line_item_spec.rb
index 5aec211ee9..a3004e871a 100644
--- a/spec/models/spree/line_item_spec.rb
+++ b/spec/models/spree/line_item_spec.rb
@@ -172,7 +172,7 @@ module Spree
       end
 
       describe "finding line items with and without tax" do
-        let(:tax_rate) { create(:tax_rate, calculator: Calculator::DefaultTax.new) }
+        let(:tax_rate) { create(:tax_rate, calculator: ::Calculator::DefaultTax.new) }
         let!(:adjustment1) { create(:adjustment, originator: tax_rate, label: "TR", amount: 123, included_tax: 10.00) }
 
         before do
@@ -448,7 +448,7 @@ module Spree
     describe "tax" do
       let(:li_no_tax)   { create(:line_item) }
       let(:li_tax)      { create(:line_item) }
-      let(:tax_rate)    { create(:tax_rate, calculator: Calculator::DefaultTax.new) }
+      let(:tax_rate)    { create(:tax_rate, calculator: ::Calculator::DefaultTax.new) }
       let!(:adjustment) { create(:adjustment, adjustable: li_tax, originator: tax_rate, label: "TR", amount: 123, included_tax: 10.00) }
 
       context "checking if a line item has tax included" do
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 88d285c99a..3bc8d72e8b 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'spree/core/gateway_error'
 
 describe Spree::Order do
   include OpenFoodNetwork::EmailHelper
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index 3e0d99c5fa..20e259dfce 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -72,10 +72,10 @@ module Spree
       free_payment_method = create(:payment_method) # flat rate calculator with preferred_amount of 0
       expect(free_payment_method.compute_amount(order)).to eq 0
 
-      flat_rate_payment_method = create(:payment_method, calculator: Calculator::FlatRate.new(preferred_amount: 10))
+      flat_rate_payment_method = create(:payment_method, calculator: ::Calculator::FlatRate.new(preferred_amount: 10))
       expect(flat_rate_payment_method.compute_amount(order)).to eq 10
 
-      flat_percent_payment_method = create(:payment_method, calculator: Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10))
+      flat_percent_payment_method = create(:payment_method, calculator: ::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10))
       expect(flat_percent_payment_method.compute_amount(order)).to eq 0
 
       product = create(:product)
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 7d8229d9e8..62b714d73a 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'spree/core/gateway_error'
 
 describe Spree::Payment do
   context 'original specs from Spree' do
diff --git a/spec/models/spree/preference_spec.rb b/spec/models/spree/preference_spec.rb
new file mode 100644
index 0000000000..780434f768
--- /dev/null
+++ b/spec/models/spree/preference_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Preference do
+  it "should require a key" do
+    @preference = Spree::Preference.new
+    @preference.key = :test
+    @preference.value_type = :boolean
+    @preference.value = true
+    expect(@preference).to be_valid
+  end
+
+  describe "type coversion for values" do
+    def round_trip_preference(key, value, value_type)
+      p = Spree::Preference.new
+      p.value = value
+      p.value_type = value_type
+      p.key = key
+      p.save
+
+      Spree::Preference.find_by(key: key)
+    end
+
+    it ":boolean" do
+      value_type = :boolean
+      value = true
+      key = "boolean_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it "false :boolean" do
+      value_type = :boolean
+      value = false
+      key = "boolean_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":integer" do
+      value_type = :integer
+      value = 10
+      key = "integer_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":decimal" do
+      value_type = :decimal
+      value = 1.5
+      key = "decimal_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":string" do
+      value_type = :string
+      value = "This is a string"
+      key = "string_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":text" do
+      value_type = :text
+      value = "This is a string stored as text"
+      key = "text_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":password" do
+      value_type = :password
+      value = "This is a password"
+      key = "password_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+
+    it ":any" do
+      value_type = :any
+      value = [1, 2]
+      key = "any_key"
+      pref = round_trip_preference(key, value, value_type)
+      expect(pref.value).to eq value
+      expect(pref.value_type).to eq value_type.to_s
+    end
+  end
+end
diff --git a/spec/models/spree/preferences/configuration_spec.rb b/spec/models/spree/preferences/configuration_spec.rb
new file mode 100644
index 0000000000..32883d3fb6
--- /dev/null
+++ b/spec/models/spree/preferences/configuration_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Preferences::Configuration do
+  before :all do
+    class AppConfig < Spree::Preferences::Configuration
+      preference :color, :string, default: :blue
+    end
+    @config = AppConfig.new
+  end
+
+  it "has named methods to access preferences" do
+    @config.color = 'orange'
+    expect(@config.color).to eq 'orange'
+  end
+
+  it "uses [ ] to access preferences" do
+    @config[:color] = 'red'
+    expect(@config[:color]).to eq 'red'
+  end
+
+  it "uses set/get to access preferences" do
+    @config.set :color, 'green'
+    expect(@config.get(:color)).to eq 'green'
+  end
+end
diff --git a/spec/models/spree/preferences/preferable_spec.rb b/spec/models/spree/preferences/preferable_spec.rb
new file mode 100644
index 0000000000..3e156fce1f
--- /dev/null
+++ b/spec/models/spree/preferences/preferable_spec.rb
@@ -0,0 +1,326 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Preferences::Preferable do
+  before :all do
+    class A
+      include Spree::Preferences::Preferable
+      attr_reader :id
+
+      def initialize
+        @id = rand(999)
+      end
+
+      preference :color, :string, default: 'green', description: "My Favorite Color"
+    end
+
+    class B < A
+      preference :flavor, :string
+    end
+  end
+
+  before :each do
+    @a = A.new
+    allow(@a).to receive_messages(persisted?: true)
+    @b = B.new
+    allow(@b).to receive_messages(persisted?: true)
+
+    # ensure we're persisting as that is the default
+    #
+    store = Spree::Preferences::Store.instance
+    store.persistence = true
+  end
+
+  describe "preference definitions" do
+    it "parent should not see child definitions" do
+      expect(@a.has_preference?(:color)).to be_truthy
+      expect(@a.has_preference?(:flavor)).not_to be_truthy
+    end
+
+    it "child should have parent and own definitions" do
+      expect(@b.has_preference?(:color)).to be_truthy
+      expect(@b.has_preference?(:flavor)).to be_truthy
+    end
+
+    it "instances have defaults" do
+      expect(@a.preferred_color).to eq 'green'
+      expect(@b.preferred_color).to eq 'green'
+      expect(@b.preferred_flavor).to be_nil
+    end
+
+    it "can be asked if it has a preference definition" do
+      expect(@a.has_preference?(:color)).to be_truthy
+      expect(@a.has_preference?(:bad)).to be_falsy
+    end
+
+    it "can be asked and raises" do
+      expect {
+        @a.has_preference! :flavor
+      }.to raise_error(NoMethodError, "flavor preference not defined")
+    end
+
+    it "has a type" do
+      expect(@a.preferred_color_type).to eq :string
+      expect(@a.preference_type(:color)).to eq :string
+    end
+
+    it "has a default" do
+      expect(@a.preferred_color_default).to eq 'green'
+      expect(@a.preference_default(:color)).to eq 'green'
+    end
+
+    it "has a description" do
+      expect(@a.preferred_color_description).to eq "My Favorite Color"
+      expect(@a.preference_description(:color)).to eq "My Favorite Color"
+    end
+
+    it "raises if not defined" do
+      expect {
+        @a.get_preference :flavor
+      }.to raise_error(NoMethodError, "flavor preference not defined")
+    end
+  end
+
+  describe "preference access" do
+    it "handles ghost methods for preferences" do
+      @a.preferred_color = 'blue'
+      expect(@a.preferred_color).to eq 'blue'
+
+      @a.prefers_color = 'green'
+      expect(@a.prefers_color?).to eq 'green'
+    end
+
+    it "has genric readers" do
+      @a.preferred_color = 'red'
+      expect(@a.prefers?(:color)).to eq 'red'
+      expect(@a.preferred(:color)).to eq 'red'
+    end
+
+    it "parent and child instances have their own prefs" do
+      @a.preferred_color = 'red'
+      @b.preferred_color = 'blue'
+
+      expect(@a.preferred_color).to eq 'red'
+      expect(@b.preferred_color).to eq 'blue'
+    end
+
+    it "raises when preference not defined" do
+      expect {
+        @a.set_preference(:bad, :bone)
+      }.to raise_exception(NoMethodError, "bad preference not defined")
+    end
+
+    it "builds a hash of preferences" do
+      @b.preferred_flavor = :strawberry
+      expect(@b.preferences[:flavor]).to eq 'strawberry'
+      expect(@b.preferences[:color]).to eq 'green' # default from A
+    end
+
+    context "database fallback" do
+      before do
+        @a.instance_variable_set("@pending_preferences", {})
+      end
+
+      it "retrieves a preference from the database before falling back to default" do
+        preference = double(value: "chatreuse", key: 'a/color/123')
+        expect(Spree::Preference).to receive(:find_by).and_return(preference)
+        expect(@a.preferred_color).to eq 'chatreuse'
+      end
+
+      it "defaults if no database key exists" do
+        expect(Spree::Preference).to receive(:find_by).and_return(nil)
+        expect(@a.preferred_color).to eq 'green'
+      end
+    end
+
+    context "converts integer preferences to integer values" do
+      before do
+        A.preference :is_integer, :integer
+      end
+
+      it "with strings" do
+        @a.set_preference(:is_integer, '3')
+        expect(@a.preferences[:is_integer]).to eq 3
+
+        @a.set_preference(:is_integer, '')
+        expect(@a.preferences[:is_integer]).to eq 0
+      end
+    end
+
+    context "converts decimal preferences to BigDecimal values" do
+      before do
+        A.preference :if_decimal, :decimal
+      end
+
+      it "returns a BigDecimal" do
+        @a.set_preference(:if_decimal, 3.3)
+        expect(@a.preferences[:if_decimal].class).to eq BigDecimal
+      end
+
+      it "with strings" do
+        @a.set_preference(:if_decimal, '3.3')
+        expect(@a.preferences[:if_decimal]).to eq 3.3
+
+        @a.set_preference(:if_decimal, '')
+        expect(@a.preferences[:if_decimal]).to eq 0.0
+      end
+    end
+
+    context "converts boolean preferences to boolean values" do
+      before do
+        A.preference :is_boolean, :boolean, default: true
+      end
+
+      it "with strings" do
+        @a.set_preference(:is_boolean, '0')
+        expect(@a.preferences[:is_boolean]).to be_falsy
+        @a.set_preference(:is_boolean, 'f')
+        expect(@a.preferences[:is_boolean]).to be_falsy
+        @a.set_preference(:is_boolean, 't')
+        expect(@a.preferences[:is_boolean]).to be_truthy
+      end
+
+      it "with integers" do
+        @a.set_preference(:is_boolean, 0)
+        expect(@a.preferences[:is_boolean]).to be_falsy
+        @a.set_preference(:is_boolean, 1)
+        expect(@a.preferences[:is_boolean]).to be_truthy
+      end
+
+      it "with an empty string" do
+        @a.set_preference(:is_boolean, '')
+        expect(@a.preferences[:is_boolean]).to be_falsy
+      end
+
+      it "with an empty hash" do
+        @a.set_preference(:is_boolean, [])
+        expect(@a.preferences[:is_boolean]).to be_falsy
+      end
+    end
+
+    context "converts any preferences to any values" do
+      before do
+        A.preference :product_ids, :any, default: []
+        A.preference :product_attributes, :any, default: {}
+      end
+
+      it "with array" do
+        expect(@a.preferences[:product_ids]).to eq []
+        @a.set_preference(:product_ids, [1, 2])
+        expect(@a.preferences[:product_ids]).to eq [1, 2]
+      end
+
+      it "with hash" do
+        expect(@a.preferences[:product_attributes]).to eq({})
+        @a.set_preference(:product_attributes, { id: 1, name: 2 })
+        attributes_hash = { id: 1, name: 2 }
+        expect(@a.preferences[:product_attributes]).to eq attributes_hash
+      end
+    end
+  end
+
+  describe "persisted preferables" do
+    before(:all) do
+      class CreatePrefTest < ActiveRecord::Migration
+        def self.up
+          create_table :pref_tests do |t|
+            t.string :col
+          end
+        end
+
+        def self.down
+          drop_table :pref_tests
+        end
+      end
+
+      @migration_verbosity = ActiveRecord::Migration.verbose
+      ActiveRecord::Migration.verbose = false
+      CreatePrefTest.migrate(:up)
+
+      class PrefTest < ActiveRecord::Base
+        preference :pref_test_pref, :string, default: 'abc'
+        preference :pref_test_any, :any, default: []
+      end
+    end
+
+    after(:all) do
+      CreatePrefTest.migrate(:down)
+      ActiveRecord::Migration.verbose = @migration_verbosity
+    end
+
+    before(:each) do
+      @pt = PrefTest.create
+    end
+
+    describe "pending preferences for new activerecord objects" do
+      it "saves preferences after record is saved" do
+        pr = PrefTest.new
+        pr.set_preference(:pref_test_pref, 'XXX')
+        expect(pr.get_preference(:pref_test_pref)).to eq 'XXX'
+        pr.save!
+        expect(pr.get_preference(:pref_test_pref)).to eq 'XXX'
+      end
+
+      it "saves preferences for serialized object" do
+        pr = PrefTest.new
+        pr.set_preference(:pref_test_any, [1, 2])
+        expect(pr.get_preference(:pref_test_any)).to eq [1, 2]
+        pr.save!
+        expect(pr.get_preference(:pref_test_any)).to eq [1, 2]
+      end
+    end
+
+    describe "requires a valid id" do
+      it "for cache_key" do
+        pref_test = PrefTest.new
+        expect(pref_test.preference_cache_key(:pref_test_pref)).to be_nil
+
+        pref_test.save
+        expect(pref_test.preference_cache_key(:pref_test_pref)).to_not be_nil
+      end
+
+      it "but returns default values" do
+        pref_test = PrefTest.new
+        expect(pref_test.get_preference(:pref_test_pref)).to eq 'abc'
+      end
+
+      it "adds prefs in a pending hash until after_create" do
+        pref_test = PrefTest.new
+        expect(pref_test).to receive(:add_pending_preference).with(:pref_test_pref, 'XXX')
+        pref_test.set_preference(:pref_test_pref, 'XXX')
+      end
+    end
+
+    it "clear preferences" do
+      @pt.set_preference(:pref_test_pref, 'xyz')
+      expect(@pt.preferred_pref_test_pref).to eq 'xyz'
+      @pt.clear_preferences
+      expect(@pt.preferred_pref_test_pref).to eq 'abc'
+    end
+
+    it "clear preferences when record is deleted" do
+      @pt.save!
+      @pt.preferred_pref_test_pref = 'lmn'
+      @pt.save!
+      @pt.destroy
+      @pt1 = PrefTest.new(col: 'aaaa')
+      @pt1.id = @pt.id
+      @pt1.save!
+      expect(@pt1.get_preference(:pref_test_pref)).to_not eq 'lmn'
+      expect(@pt1.get_preference(:pref_test_pref)).to eq 'abc'
+    end
+  end
+
+  it "builds cache keys" do
+    expect(@a.preference_cache_key(:color)).to match %r{a/color/\d+}
+  end
+
+  it "can add and remove preferences" do
+    A.preference :test_temp, :boolean, default: true
+    expect(@a.preferred_test_temp).to be_truthy
+    A.remove_preference :test_temp
+    expect(@a.has_preference?(:test_temp)).to be_falsy
+    expect(@a.respond_to?(:preferred_test_temp)).to be_falsy
+  end
+end
diff --git a/spec/models/spree/preferences/store_spec.rb b/spec/models/spree/preferences/store_spec.rb
new file mode 100644
index 0000000000..7d5995e97a
--- /dev/null
+++ b/spec/models/spree/preferences/store_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Spree::Preferences::Store do
+  before :each do
+    @store = Spree::Preferences::StoreInstance.new
+  end
+
+  it "sets and gets a key" do
+    @store.set :test, 1, :integer
+    expect(@store.exist?(:test)).to be_truthy
+    expect(@store.get(:test)).to eq 1
+  end
+
+  it "can set and get false values when cache return nil" do
+    @store.set :test, false, :boolean
+    expect(@store.get(:test)).to be_falsy
+  end
+
+  it "will return db value when cache is emtpy and cache the db value" do
+    preference = Spree::Preference.where(key: 'test').first_or_initialize
+    preference.value = '123'
+    preference.value_type = 'string'
+    preference.save
+
+    Rails.cache.clear
+    expect(@store.get(:test)).to eq '123'
+    expect(Rails.cache.read(:test)).to eq '123'
+  end
+
+  it "should return and cache fallback value when supplied" do
+    Rails.cache.clear
+    expect(@store.get(:test, false)).to be_falsy
+    expect(Rails.cache.read(:test)).to be_falsy
+  end
+
+  it "should return and cache fallback value when persistence is disabled (i.e. on bootstrap)" do
+    Rails.cache.clear
+    allow(@store).to receive_messages(should_persist?: false)
+    expect(@store.get(:test, true)).to be_truthy
+    expect(Rails.cache.read(:test)).to be_truthy
+  end
+
+  it "should return nil when key can't be found and fallback value is not supplied" do
+    expect(@store.get(:random_key)).to be_nil
+  end
+end
diff --git a/spec/models/spree/tax_rate_spec.rb b/spec/models/spree/tax_rate_spec.rb
index 61938c5d0f..65b4cfd552 100644
--- a/spec/models/spree/tax_rate_spec.rb
+++ b/spec/models/spree/tax_rate_spec.rb
@@ -5,7 +5,7 @@ module Spree
     describe "selecting tax rates to apply to an order" do
       let!(:zone) { create(:zone_with_member) }
       let!(:order) { create(:order, distributor: hub, bill_address: create(:address)) }
-      let!(:tax_rate) { create(:tax_rate, included_in_price: true, calculator: Calculator::FlatRate.new(preferred_amount: 0.1), zone: zone) }
+      let!(:tax_rate) { create(:tax_rate, included_in_price: true, calculator: ::Calculator::FlatRate.new(preferred_amount: 0.1), zone: zone) }
 
       describe "when the order's hub charges sales tax" do
         let(:hub) { create(:distributor_enterprise, charges_sales_tax: true) }
@@ -33,7 +33,7 @@ module Spree
     end
 
     describe "ensuring that tax rate is marked as tax included_in_price" do
-      let(:tax_rate) { create(:tax_rate, included_in_price: false, calculator: Calculator::DefaultTax.new) }
+      let(:tax_rate) { create(:tax_rate, included_in_price: false, calculator: ::Calculator::DefaultTax.new) }
 
       it "sets included_in_price to true" do
         tax_rate.send(:with_tax_included_in_price) do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 539b7a31ab..19fdc49943 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,6 +20,7 @@ require 'rspec/rails'
 require 'capybara'
 require 'database_cleaner'
 require 'rspec/retry'
+require 'coverage_helper'
 require 'paper_trail/frameworks/rspec'
 
 require 'webdrivers'
diff --git a/spec/support/request/shop_workflow.rb b/spec/support/request/shop_workflow.rb
index 9e64ea19cc..b1ede3ae8c 100644
--- a/spec/support/request/shop_workflow.rb
+++ b/spec/support/request/shop_workflow.rb
@@ -6,12 +6,6 @@ module ShopWorkflow
   end
 
   def wait_for_cart
-    # Wait for debounce
-    #
-    # The auto-submit on these specific form elements (add to cart) now has a small built-in
-    # waiting period before submitting the data...
-    sleep 0.6
-
     within find_body do
       # We ignore visibility in case the cart dropdown is not open.
       within '.cart-sidebar', visible: false do
@@ -30,7 +24,7 @@ module ShopWorkflow
   end
 
   def have_price(price)
-    have_selector ".price", text: price
+    have_selector ".variant-price", text: price
   end
 
   def add_enterprise_fee(enterprise_fee)
@@ -50,46 +44,38 @@ module ShopWorkflow
   end
 
   # Add an item to the cart
-  #
-  # At the moment, the user enters the quantity into an input field.
-  # But with the coming mobile-friendly UX, the user will click a button to
-  # add an item, hence the naming.
-  #
-  # This is temporary code. The duplication will be removed by the mobile
-  # product listings feature. This has been backported to avoid merge
-  # conflicts and to make the current build more stable.
   def click_add_to_cart(variant = nil, quantity = 1)
     within_variant(variant) do
-      input = page.find("input")
-      new_quantity = input.value.to_i + quantity
-      fill_in input[:name], with: new_quantity
+      click_button "Add"
+      (quantity - 1).times { click_button increase_quantity_symbol }
     end
     wait_for_cart
   end
 
   def click_remove_from_cart(variant = nil, quantity = 1)
     within_variant(variant) do
-      input = page.find("input")
-      new_quantity = input.value.to_i - quantity
-      fill_in input[:name], with: new_quantity
+      quantity.times { click_button decrease_quantity_symbol }
     end
     wait_for_cart
   end
 
   def click_add_bulk_to_cart(variant = nil, quantity = 1)
     within_variant(variant) do
-      input = page.find("input")
-      new_quantity = input.value.to_i + quantity
-      fill_in input[:name], with: new_quantity
+      click_button "Add"
+    end
+    within(".reveal-modal") do
+      (quantity - 1).times do
+        first(:button, increase_quantity_symbol).click
+      end
     end
     wait_for_cart
   end
 
   def click_add_bulk_max_to_cart(variant = nil, quantity = 1)
-    within_variant(variant) do
-      input = page.find(:field, "variant_attributes[#{variant.id}][max_quantity]")
-      new_quantity = input.value.to_i + quantity
-      fill_in input[:name], with: new_quantity
+    within(".reveal-modal") do
+      quantity.times do
+        page.all("button", text: increase_quantity_symbol).last.click
+      end
     end
     wait_for_cart
   end
@@ -102,6 +88,20 @@ module ShopWorkflow
     end
   end
 
+  def open_bulk_quantity_modal(variant)
+    within_variant(variant) do
+      page.first("button.bulk-buy").click
+    end
+  end
+
+  def increase_quantity_symbol
+    "＋"
+  end
+
+  def decrease_quantity_symbol
+    "－"
+  end
+
   def toggle_accordion(name)
     find("dd a", text: name).click
   end
diff --git a/spec/support/request/stripe_helper.rb b/spec/support/request/stripe_helper.rb
index ef71652b1a..ef552a0586 100644
--- a/spec/support/request/stripe_helper.rb
+++ b/spec/support/request/stripe_helper.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module StripeHelper
-  def checkout_with_stripe
+  def checkout_with_stripe(guest_checkout: true, remember_card: false)
     visit checkout_path
-    checkout_as_guest
-
+    checkout_as_guest if guest_checkout
     fill_out_form(
       free_shipping.name,
       stripe_sca_payment_method.name,
       save_default_addresses: false
     )
     fill_out_card_details
+    check "Remember this card?" if remember_card
     place_order
   end
 
@@ -34,100 +34,4 @@ module StripeHelper
     allow(Stripe).to receive(:publishable_key) { "pk_test_12345" }
     Spree::Config.set(stripe_connect_enabled: true)
   end
-
-  def stub_payment_intents_post_request(order:, response: {}, stripe_account_header: true)
-    stub = stub_request(:post, "https://api.stripe.com/v1/payment_intents")
-      .with(basic_auth: ["sk_test_12345", ""], body: /.*#{order.number}/)
-    stub = stub.with(headers: { 'Stripe-Account' => 'abc123' }) if stripe_account_header
-    stub.to_return(payment_intent_authorize_response_mock(response))
-  end
-
-  def stub_payment_intents_post_request_with_redirect(order:, redirect_url:)
-    stub_request(:post, "https://api.stripe.com/v1/payment_intents")
-      .with(basic_auth: ["sk_test_12345", ""], body: /.*#{order.number}/)
-      .to_return(payment_intent_redirect_response_mock(redirect_url))
-  end
-
-  def stub_payment_intent_get_request(response: {}, stripe_account_header: true)
-    stub = stub_request(:get, "https://api.stripe.com/v1/payment_intents/pi_123")
-    stub = stub.with(headers: { 'Stripe-Account' => 'abc123' }) if stripe_account_header
-    stub.to_return(payment_intent_authorize_response_mock(response))
-  end
-
-  def stub_payment_methods_post_request(response: {})
-    stub_request(:post, "https://api.stripe.com/v1/payment_methods")
-      .with(body: { payment_method: "pm_123" },
-            headers: { 'Stripe-Account' => 'abc123' })
-      .to_return(hub_payment_method_response_mock(response))
-  end
-
-  def stub_successful_capture_request(order:, response: {})
-    stub_capture_request(order, payment_successful_capture_mock(response))
-  end
-
-  def stub_failed_capture_request(order:, response: {})
-    stub_capture_request(order, payment_failed_capture_mock(response))
-  end
-
-  def stub_capture_request(order, response_mock)
-    stub_request(:post, "https://api.stripe.com/v1/payment_intents/pi_123/capture")
-      .with(body: { amount_to_capture: Spree::Money.new(order.total).cents },
-            headers: { 'Stripe-Account' => 'abc123' })
-      .to_return(response_mock)
-  end
-
-  def stub_refund_request
-    stub_request(:post, "https://api.stripe.com/v1/charges/ch_1234/refunds")
-      .with(body: { amount: 2000, expand: ["charge"] },
-            headers: { 'Stripe-Account' => 'abc123' })
-      .to_return(payment_successful_refund_mock)
-  end
-
-  private
-
-  def payment_intent_authorize_response_mock(options)
-    { status: options[:code] || 200,
-      body: JSON.generate(id: "pi_123",
-                          object: "payment_intent",
-                          amount: 2000,
-                          amount_received: 2000,
-                          status: options[:intent_status] || "requires_capture",
-                          last_payment_error: nil,
-                          charges: { data: [{ id: "ch_1234", amount: 2000 }] }) }
-  end
-
-  def payment_intent_redirect_response_mock(redirect_url)
-    { status: 200, body: JSON.generate(id: "pi_123",
-                                       object: "payment_intent",
-                                       next_source_action: {
-                                         type: "authorize_with_url",
-                                         authorize_with_url: { url: redirect_url }
-                                       },
-                                       status: "requires_source_action") }
-  end
-
-  def payment_successful_capture_mock(options)
-    { status: options[:code] || 200,
-      body: JSON.generate(object: "payment_intent",
-                          amount: 2000,
-                          charges: { data: [{ id: "ch_1234", amount: 2000 }] }) }
-  end
-
-  def payment_failed_capture_mock(options)
-    { status: options[:code] || 402,
-      body: JSON.generate(error: { message:
-                                     options[:message] || "payment-method-failure" }) }
-  end
-
-  def hub_payment_method_response_mock(options)
-    { status: options[:code] || 200,
-      body: JSON.generate(id: "pm_456", customer: "cus_A123") }
-  end
-
-  def payment_successful_refund_mock
-    { status: 200,
-      body: JSON.generate(object: "refund",
-                          amount: 2000,
-                          charge: "ch_1234") }
-  end
 end
diff --git a/spec/support/request/stripe_stubs.rb b/spec/support/request/stripe_stubs.rb
new file mode 100644
index 0000000000..909604b9ae
--- /dev/null
+++ b/spec/support/request/stripe_stubs.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+module StripeStubs
+  def stub_payment_intents_post_request(order:, response: {}, stripe_account_header: true)
+    stub = stub_request(:post, "https://api.stripe.com/v1/payment_intents")
+      .with(basic_auth: ["sk_test_12345", ""], body: /.*#{order.number}/)
+    stub = stub.with(headers: { 'Stripe-Account' => 'abc123' }) if stripe_account_header
+    stub.to_return(payment_intent_authorize_response_mock(response))
+  end
+
+  def stub_payment_intents_post_request_with_redirect(order:, redirect_url:)
+    stub_request(:post, "https://api.stripe.com/v1/payment_intents")
+      .with(basic_auth: ["sk_test_12345", ""], body: /.*#{order.number}/)
+      .to_return(payment_intent_redirect_response_mock(redirect_url))
+  end
+
+  def stub_payment_intent_get_request(response: {}, stripe_account_header: true)
+    stub = stub_request(:get, "https://api.stripe.com/v1/payment_intents/pi_123")
+    stub = stub.with(headers: { 'Stripe-Account' => 'abc123' }) if stripe_account_header
+    stub.to_return(payment_intent_authorize_response_mock(response))
+  end
+
+  def stub_payment_methods_post_request(request: { payment_method: "pm_123" }, response: {})
+    stub_request(:post, "https://api.stripe.com/v1/payment_methods")
+      .with(body: request,
+            headers: { 'Stripe-Account' => 'abc123' })
+      .to_return(hub_payment_method_response_mock(response))
+  end
+
+  # Attaches the payment method to the customer in the hub's stripe account
+  def stub_payment_method_attach_request
+    stub_request(:post,
+                 "https://api.stripe.com/v1/payment_methods/pm_123/attach")
+      .with(body: { customer: "cus_A123" })
+      .to_return(hub_payment_method_response_mock({ pm_id: "pm_123" }))
+  end
+
+  # Stubs the customers call to both the main stripe account and the connected account
+  def stub_customers_post_request(email:, response: {}, stripe_account_header: false)
+    stub = stub_request(:post, "https://api.stripe.com/v1/customers")
+      .with(body: { email: email })
+    stub = stub.with(headers: { 'Stripe-Account' => 'acct_456' }) if stripe_account_header
+    stub.to_return(customers_response_mock(response))
+  end
+
+  def stub_successful_capture_request(order:, response: {})
+    stub_capture_request(order, payment_successful_capture_mock(response))
+  end
+
+  def stub_failed_capture_request(order:, response: {})
+    stub_capture_request(order, payment_failed_capture_mock(response))
+  end
+
+  def stub_capture_request(order, response_mock)
+    stub_request(:post, "https://api.stripe.com/v1/payment_intents/pi_123/capture")
+      .with(body: { amount_to_capture: Spree::Money.new(order.total).cents },
+            headers: { 'Stripe-Account' => 'abc123' })
+      .to_return(response_mock)
+  end
+
+  def stub_refund_request
+    stub_request(:post, "https://api.stripe.com/v1/charges/ch_1234/refunds")
+      .with(body: { amount: 2000, expand: ["charge"] },
+            headers: { 'Stripe-Account' => 'abc123' })
+      .to_return(payment_successful_refund_mock)
+  end
+
+  private
+
+  def payment_intent_authorize_response_mock(options)
+    { status: options[:code] || 200,
+      body: JSON.generate(id: "pi_123",
+                          object: "payment_intent",
+                          amount: 2000,
+                          amount_received: 2000,
+                          status: options[:intent_status] || "requires_capture",
+                          last_payment_error: nil,
+                          charges: { data: [{ id: "ch_1234", amount: 2000 }] }) }
+  end
+
+  def payment_intent_redirect_response_mock(redirect_url)
+    { status: 200, body: JSON.generate(id: "pi_123",
+                                       object: "payment_intent",
+                                       next_source_action: {
+                                         type: "authorize_with_url",
+                                         authorize_with_url: { url: redirect_url }
+                                       },
+                                       status: "requires_source_action") }
+  end
+
+  def payment_successful_capture_mock(options)
+    { status: options[:code] || 200,
+      body: JSON.generate(object: "payment_intent",
+                          amount: 2000,
+                          charges: { data: [{ id: "ch_1234", amount: 2000 }] }) }
+  end
+
+  def payment_failed_capture_mock(options)
+    { status: options[:code] || 402,
+      body: JSON.generate(error: { message:
+                                     options[:message] || "payment-method-failure" }) }
+  end
+
+  def hub_payment_method_response_mock(options)
+    { status: options[:code] || 200,
+      body: JSON.generate(id: options[:pm_id] || "pm_456", customer: "cus_A123") }
+  end
+
+  def customers_response_mock(options)
+    customer_id = options[:customer_id] || "cus_A123"
+    { status: 200,
+      body: JSON.generate(id: customer_id,
+                          sources: { data: [id: customer_id] }) }
+  end
+
+  def payment_successful_refund_mock
+    { status: 200,
+      body: JSON.generate(object: "refund",
+                          amount: 2000,
+                          charge: "ch_1234") }
+  end
+end
diff --git a/spec/support/request/ui_component_helper.rb b/spec/support/request/ui_component_helper.rb
index 1230517d38..f493bcc3ce 100644
--- a/spec/support/request/ui_component_helper.rb
+++ b/spec/support/request/ui_component_helper.rb
@@ -54,6 +54,10 @@ module UIComponentHelper
     end
   end
 
+  def close_modal
+    find("a.close-reveal-modal").click
+  end
+
   def have_reset_password
     have_content "An email with instructions on resetting your password has been sent!"
   end
diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb
index 14fa21dac0..26e8c7ea14 100644
--- a/spec/support/request/web_helper.rb
+++ b/spec/support/request/web_helper.rb
@@ -111,6 +111,8 @@ module WebHelper
     page.find(:xpath, '//body')
       .find(:css, '.select2-drop-active .select2-result-label', text: options[:select_text] || value)
       .click
+
+    expect(page).to have_select2 options[:from], selected: options[:select_text] || value
   end
 
   def open_select2(selector)
@@ -134,6 +136,13 @@ module WebHelper
     page.evaluate_script("#{angular_scope(controller)}.scope().RequestMonitor.loading == false")
   end
 
+  def fill_in_tag(tag_name, selector = "tags-input .tags input")
+    expect(page).to have_selector selector
+    find(:css, selector).send_keys ""
+    find(:css, selector).set "#{tag_name}\n"
+    expect(page).to have_selector ".tag-list .tag-item span", text: tag_name
+  end
+
   private
 
   # Takes an optional angular controller name eg: "LineItemsCtrl",
diff --git a/vendor/assets/javascripts/jsuri.js b/vendor/assets/javascripts/jsuri.js
new file mode 100644
index 0000000000..dcf60f9796
--- /dev/null
+++ b/vendor/assets/javascripts/jsuri.js
@@ -0,0 +1,2 @@
+/*! jsUri v1.1.1 | https://github.com/derek-watson/jsUri */
+var Query=function(a){"use strict";var b=function(a){var b=[],c,d,e,f;if(typeof a=="undefined"||a===null||a==="")return b;a.indexOf("?")===0&&(a=a.substring(1)),d=a.toString().split(/[&;]/);for(c=0;c<d.length;c++)e=d[c],f=e.split("="),b.push([f[0],f[1]]);return b},c=b(a),d=function(){var a="",b,d;for(b=0;b<c.length;b++)d=c[b],a.length>0&&(a+="&"),a+=d.join("=");return a.length>0?"?"+a:a},e=function(a){a=decodeURIComponent(a),a=a.replace("+"," ");return a},f=function(a){var b,d;for(d=0;d<c.length;d++){b=c[d];if(e(a)===e(b[0]))return b[1]}},g=function(a){var b=[],d,f;for(d=0;d<c.length;d++)f=c[d],e(a)===e(f[0])&&b.push(f[1]);return b},h=function(a,b){var d=[],f,g,h,i;for(f=0;f<c.length;f++)g=c[f],h=e(g[0])===e(a),i=e(g[1])===e(b),(arguments.length===1&&!h||arguments.length===2&&!h&&!i)&&d.push(g);c=d;return this},i=function(a,b,d){arguments.length===3&&d!==-1?(d=Math.min(d,c.length),c.splice(d,0,[a,b])):arguments.length>0&&c.push([a,b]);return this},j=function(a,b,d){var f=-1,g,j;if(arguments.length===3){for(g=0;g<c.length;g++){j=c[g];if(e(j[0])===e(a)&&decodeURIComponent(j[1])===e(d)){f=g;break}}h(a,d).addParam(a,b,f)}else{for(g=0;g<c.length;g++){j=c[g];if(e(j[0])===e(a)){f=g;break}}h(a),i(a,b,f)}return this};return{getParamValue:f,getParamValues:g,deleteParam:h,addParam:i,replaceParam:j,toString:d}},Uri=function(a){"use strict";var b=!1,c=function(a){var c={strict:/^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,loose:/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/},d=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],e={name:"queryKey",parser:/(?:^|&)([^&=]*)=?([^&]*)/g},f=c[b?"strict":"loose"].exec(a),g={},h=14;while(h--)g[d[h]]=f[h]||"";g[e.name]={},g[d[12]].replace(e.parser,function(a,b,c){b&&(g[e.name][b]=c)});return g},d=c(a||""),e=new Query(d.query),f=function(a){typeof a!="undefined"&&(d.protocol=a);return d.protocol},g=null,h=function(a){typeof a!="undefined"&&(g=a);return g===null?d.source.indexOf("//")!==-1:g},i=function(a){typeof a!="undefined"&&(d.userInfo=a);return d.userInfo},j=function(a){typeof a!="undefined"&&(d.host=a);return d.host},k=function(a){typeof a!="undefined"&&(d.port=a);return d.port},l=function(a){typeof a!="undefined"&&(d.path=a);return d.path},m=function(a){typeof a!="undefined"&&(e=new Query(a));return e},n=function(a){typeof a!="undefined"&&(d.anchor=a);return d.anchor},o=function(a){f(a);return this},p=function(a){h(a);return this},q=function(a){i(a);return this},r=function(a){j(a);return this},s=function(a){k(a);return this},t=function(a){l(a);return this},u=function(a){m(a);return this},v=function(a){n(a);return this},w=function(a){return m().getParamValue(a)},x=function(a){return m().getParamValues(a)},y=function(a,b){arguments.length===2?m().deleteParam(a,b):m().deleteParam(a);return this},z=function(a,b,c){arguments.length===3?m().addParam(a,b,c):m().addParam(a,b);return this},A=function(a,b,c){arguments.length===3?m().replaceParam(a,b,c):m().replaceParam(a,b);return this},B=function(){var a="",b=function(a){return a!==null&&a!==""};b(f())?(a+=f(),f().indexOf(":")!==f().length-1&&(a+=":"),a+="//"):h()&&b(j())&&(a+="//"),b(i())&&b(j())&&(a+=i(),i().indexOf("@")!==i().length-1&&(a+="@")),b(j())&&(a+=j(),b(k())&&(a+=":"+k())),b(l())?a+=l():b(j())&&(b(m().toString())||b(n()))&&(a+="/"),b(m().toString())&&(m().toString().indexOf("?")!==0&&(a+="?"),a+=m().toString()),b(n())&&(n().indexOf("#")!==0&&(a+="#"),a+=n());return a},C=function(){return new Uri(B())};return{protocol:f,hasAuthorityPrefix:h,userInfo:i,host:j,port:k,path:l,query:m,anchor:n,setProtocol:o,setHasAuthorityPrefix:p,setUserInfo:q,setHost:r,setPort:s,setPath:t,setQuery:u,setAnchor:v,getQueryParamValue:w,getQueryParamValues:x,deleteQueryParam:y,addQueryParam:z,replaceQueryParam:A,toString:B,clone:C}},jsUri=Uri;
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/normalize.css b/vendor/assets/stylesheets/normalize.css
new file mode 100644
index 0000000000..57b5d2679a
--- /dev/null
+++ b/vendor/assets/stylesheets/normalize.css
@@ -0,0 +1,375 @@
+/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/*
+ * Corrects `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/*
+ * Corrects `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+}
+
+/*
+ * Prevents modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/*
+ * Addresses styling for `hidden` attribute not present in IE 8/9.
+ */
+
+[hidden] {
+    display: none;
+}
+
+/* ==========================================================================
+   Base
+   ========================================================================== */
+
+/*
+ * 1. Sets default font family to sans-serif.
+ * 2. Prevents iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+    font-family: sans-serif; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/*
+ * Removes default margin.
+ */
+
+body {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Links
+   ========================================================================== */
+
+/*
+ * Addresses `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/*
+ * Improves readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+    outline: 0;
+}
+
+/* ==========================================================================
+   Typography
+   ========================================================================== */
+
+/*
+ * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
+ * Safari 5, and Chrome.
+ */
+
+h1 {
+    font-size: 2em;
+}
+
+/*
+ * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/*
+ * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+    font-weight: bold;
+}
+
+/*
+ * Addresses styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/*
+ * Addresses styling not present in IE 8/9.
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+
+/*
+ * Corrects font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, serif;
+    font-size: 1em;
+}
+
+/*
+ * Improves readability of pre-formatted text in all browsers.
+ */
+
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/*
+ * Sets consistent quote types.
+ */
+
+q {
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/*
+ * Addresses inconsistent and variable font size in all browsers.
+ */
+
+small {
+    font-size: 80%;
+}
+
+/*
+ * Prevents `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+/* ==========================================================================
+   Embedded content
+   ========================================================================== */
+
+/*
+ * Removes border when inside `a` element in IE 8/9.
+ */
+
+img {
+    border: 0;
+}
+
+/*
+ * Corrects overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+/* ==========================================================================
+   Figures
+   ========================================================================== */
+
+/*
+ * Addresses margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Forms
+   ========================================================================== */
+
+/*
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/*
+ * 1. Corrects color not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/*
+ * 1. Corrects font family not being inherited in all browsers.
+ * 2. Corrects font size not being inherited in all browsers.
+ * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
+ */
+
+button,
+input,
+select,
+textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
+
+/*
+ * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+    line-height: normal;
+}
+
+/*
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Corrects inability to style clickable `input` types in iOS.
+ * 3. Improves usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
+
+/*
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+input[disabled] {
+    cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to `content-box` in IE 8/9.
+ * 2. Removes excess padding in IE 8/9.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/*
+ * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/*
+ * Removes inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+/*
+ * Removes inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/*
+ * 1. Removes default vertical scrollbar in IE 8/9.
+ * 2. Improves readability and alignment in all browsers.
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+   Tables
+   ========================================================================== */
+
+/*
+ * Remove most spacing between table cells.
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
diff --git a/vendor/assets/stylesheets/skeleton.css b/vendor/assets/stylesheets/skeleton.css
new file mode 100644
index 0000000000..049db0863f
--- /dev/null
+++ b/vendor/assets/stylesheets/skeleton.css
@@ -0,0 +1,242 @@
+/*
+* Skeleton V1.2
+* Copyright 2011, Dave Gamache
+* www.getskeleton.com
+* Free to use under the MIT license.
+* http://www.opensource.org/licenses/mit-license.php
+* 6/20/2012
+*/
+
+
+/* Table of Contents
+==================================================
+    #Base 960 Grid
+    #Tablet (Portrait)
+    #Mobile (Portrait)
+    #Mobile (Landscape)
+    #Clearing */
+
+
+
+/* #Base 960 Grid
+================================================== */
+
+    .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
+    .container .column,
+    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
+    .row                                        { margin-bottom: 20px; }
+
+    /* Nested Column Classes */
+    .column.alpha, .columns.alpha               { margin-left: 0; }
+    .column.omega, .columns.omega               { margin-right: 0; }
+
+    /* Base Grid */
+    .container .one.column,
+    .container .one.columns                     { width: 40px;  }
+    .container .two.columns                     { width: 100px; }
+    .container .three.columns                   { width: 160px; }
+    .container .four.columns                    { width: 220px; }
+    .container .five.columns                    { width: 280px; }
+    .container .six.columns                     { width: 340px; }
+    .container .seven.columns                   { width: 400px; }
+    .container .eight.columns                   { width: 460px; }
+    .container .nine.columns                    { width: 520px; }
+    .container .ten.columns                     { width: 580px; }
+    .container .eleven.columns                  { width: 640px; }
+    .container .twelve.columns                  { width: 700px; }
+    .container .thirteen.columns                { width: 760px; }
+    .container .fourteen.columns                { width: 820px; }
+    .container .fifteen.columns                 { width: 880px; }
+    .container .sixteen.columns                 { width: 940px; }
+
+    .container .one-third.column                { width: 300px; }
+    .container .two-thirds.column               { width: 620px; }
+
+    /* Offsets */
+    .container .offset-by-one                   { padding-left: 60px;  }
+    .container .offset-by-two                   { padding-left: 120px; }
+    .container .offset-by-three                 { padding-left: 180px; }
+    .container .offset-by-four                  { padding-left: 240px; }
+    .container .offset-by-five                  { padding-left: 300px; }
+    .container .offset-by-six                   { padding-left: 360px; }
+    .container .offset-by-seven                 { padding-left: 420px; }
+    .container .offset-by-eight                 { padding-left: 480px; }
+    .container .offset-by-nine                  { padding-left: 540px; }
+    .container .offset-by-ten                   { padding-left: 600px; }
+    .container .offset-by-eleven                { padding-left: 660px; }
+    .container .offset-by-twelve                { padding-left: 720px; }
+    .container .offset-by-thirteen              { padding-left: 780px; }
+    .container .offset-by-fourteen              { padding-left: 840px; }
+    .container .offset-by-fifteen               { padding-left: 900px; }
+
+
+
+/* #Tablet (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 768px */
+
+    @media only screen and (min-width: 768px) and (max-width: 959px) {
+        .container                                  { width: 768px; }
+        .container .column,
+        .container .columns                         { margin-left: 10px; margin-right: 10px;  }
+        .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
+        .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
+        .alpha.omega                                { margin-left: 0; margin-right: 0; }
+
+        .container .one.column,
+        .container .one.columns                     { width: 28px; }
+        .container .two.columns                     { width: 76px; }
+        .container .three.columns                   { width: 124px; }
+        .container .four.columns                    { width: 172px; }
+        .container .five.columns                    { width: 220px; }
+        .container .six.columns                     { width: 268px; }
+        .container .seven.columns                   { width: 316px; }
+        .container .eight.columns                   { width: 364px; }
+        .container .nine.columns                    { width: 412px; }
+        .container .ten.columns                     { width: 460px; }
+        .container .eleven.columns                  { width: 508px; }
+        .container .twelve.columns                  { width: 556px; }
+        .container .thirteen.columns                { width: 604px; }
+        .container .fourteen.columns                { width: 652px; }
+        .container .fifteen.columns                 { width: 700px; }
+        .container .sixteen.columns                 { width: 748px; }
+
+        .container .one-third.column                { width: 236px; }
+        .container .two-thirds.column               { width: 492px; }
+
+        /* Offsets */
+        .container .offset-by-one                   { padding-left: 48px; }
+        .container .offset-by-two                   { padding-left: 96px; }
+        .container .offset-by-three                 { padding-left: 144px; }
+        .container .offset-by-four                  { padding-left: 192px; }
+        .container .offset-by-five                  { padding-left: 240px; }
+        .container .offset-by-six                   { padding-left: 288px; }
+        .container .offset-by-seven                 { padding-left: 336px; }
+        .container .offset-by-eight                 { padding-left: 384px; }
+        .container .offset-by-nine                  { padding-left: 432px; }
+        .container .offset-by-ten                   { padding-left: 480px; }
+        .container .offset-by-eleven                { padding-left: 528px; }
+        .container .offset-by-twelve                { padding-left: 576px; }
+        .container .offset-by-thirteen              { padding-left: 624px; }
+        .container .offset-by-fourteen              { padding-left: 672px; }
+        .container .offset-by-fifteen               { padding-left: 720px; }
+    }
+
+
+/*  #Mobile (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 320px */
+
+    @media only screen and (max-width: 767px) {
+        .container { width: 300px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column  { width: 300px; }
+
+        /* Offsets */
+        .container .offset-by-one,
+        .container .offset-by-two,
+        .container .offset-by-three,
+        .container .offset-by-four,
+        .container .offset-by-five,
+        .container .offset-by-six,
+        .container .offset-by-seven,
+        .container .offset-by-eight,
+        .container .offset-by-nine,
+        .container .offset-by-ten,
+        .container .offset-by-eleven,
+        .container .offset-by-twelve,
+        .container .offset-by-thirteen,
+        .container .offset-by-fourteen,
+        .container .offset-by-fifteen { padding-left: 0; }
+
+    }
+
+
+/* #Mobile (Landscape)
+================================================== */
+
+    /* Note: Design for a width of 480px */
+
+    @media only screen and (min-width: 480px) and (max-width: 767px) {
+        .container { width: 420px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column { width: 420px; }
+    }
+
+
+/* #Clearing
+================================================== */
+
+    /* Self Clearing Goodness */
+    .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
+
+    /* Use clearfix class on parent to clear nested columns,
+    or wrap each row of columns in a <div class="row"> */
+    .clearfix:before,
+    .clearfix:after,
+    .row:before,
+    .row:after {
+      content: '\0020';
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0; }
+    .row:after,
+    .clearfix:after {
+      clear: both; }
+    .row,
+    .clearfix {
+      zoom: 1; }
+
+    /* You can also use a <br class="clear" /> to clear columns */
+    .clear {
+      clear: both;
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0;
+    }
\ No newline at end of file