diff --git a/Gemfile b/Gemfile
index c850d3a..9a3e858 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,18 +1,20 @@
 source 'https://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree', '~> 2.3.0'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable'
+version = 'master'
+gem 'spree', github: 'spree/spree', version
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: version
+
 gem 'mysql2'
 
 group :assets do
-  gem 'coffee-rails', '4.0.1'
+  gem 'coffee-rails', '~> 4.0.0'
   gem 'sass-rails', '~> 4.0.2'
 end
 
 group :test do
   gem 'minitest'
-  gem 'rspec-rails', '~> 2.10'
+  gem 'rspec-rails', '~> 3.3'
   gem 'shoulda-matchers', '2.2.0'
   gem 'simplecov', :require => false
   gem 'database_cleaner'
diff --git a/Versionfile b/Versionfile
deleted file mode 100644
index 5db83aa..0000000
--- a/Versionfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is used to designate compatibilty with different versions of Spree
-# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details
-
-# Examples
-#
-# '1.2.x'  => { :branch => 'master' }
-# '1.1.x'  => { :branch => '1-1-stable' }
-# '1.0.x'  => { :branch => '1-0-stable' }
-# '0.70.x' => { :branch => '0-70-stable' }
-# '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' }
-
diff --git a/app/assets/javascripts/admin/spree_bank_transfer.js b/app/assets/javascripts/spree/backend/spree_bank_transfer.js
similarity index 100%
rename from app/assets/javascripts/admin/spree_bank_transfer.js
rename to app/assets/javascripts/spree/backend/spree_bank_transfer.js
diff --git a/app/assets/javascripts/store/spree_bank_transfer.js.erb b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb
similarity index 53%
rename from app/assets/javascripts/store/spree_bank_transfer.js.erb
rename to app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb
index 55acc06..a283977 100644
--- a/app/assets/javascripts/store/spree_bank_transfer.js.erb
+++ b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb
@@ -1,6 +1,7 @@
-//= require jquery.ui.datepicker
+//= require jquery-ui/widgets/datepicker
+
 $(document).ready(function() {
-  $('#banktransfer_instructions').click(function(event) {
+  $('#banktransfer_instructions').on("click", function(event) {
     newwindow = window.open($(this).attr('href'), 'bank transfer', 'left=20,top=20,width=650,height=750,toolbar=0,resizable=0,scrollbars=1');
     if (window.focus) {
       newwindow.focus();
@@ -8,14 +9,21 @@ $(document).ready(function() {
     return false;
   });
 
-  $('[name="payment[deposited_on]"]').datepicker({dateFormat: '<%= Spree.t(:js_format, :scope => "date_picker", :default => "yy/mm/dd") %>'});
+  var options = $.extend(
+    {}, // empty object
+    $.datepicker.regional['<%= I18n.default_locale %>'], // I18n locale
+    {dateFormat: '<%= Spree.t(:js_format, :scope => "date_picker", :default => "yy/mm/dd") %>', 
+     firstDay: '<%= Spree.t(:first_day, :scope => "date_picker", :default => "0") %>'}
+  );
+  $.datepicker.setDefaults(options);
+  $('[name="payment[deposited_on]"]').datepicker();
 
-  $('.add_bt_details').click(function() {
+  $('.add_bt_details').on("click", function() {
     $(this).hide();
     $('.bt_payment_form').show();
   });
 
-  $('.bt_payment_form input[type="submit"]').click(function(event) {
+  $('.bt_payment_form input[type="submit"]').on("click", function(event) {
     var empty_fields = $('.required_field').filter(function() { return !$(this).val().trim().length }), empty_fields_names = []
     if ($(empty_fields).length) {
       $(empty_fields).each(function() {
@@ -27,4 +35,5 @@ $(document).ready(function() {
       return false;
     }
   });
-});
\ No newline at end of file
+});
+
diff --git a/app/assets/stylesheets/admin/spree_bank_transfer.css b/app/assets/stylesheets/spree/backend/spree_bank_transfer.css
similarity index 100%
rename from app/assets/stylesheets/admin/spree_bank_transfer.css
rename to app/assets/stylesheets/spree/backend/spree_bank_transfer.css
diff --git a/app/assets/stylesheets/store/spree_bank_transfer.css b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css
similarity index 65%
rename from app/assets/stylesheets/store/spree_bank_transfer.css
rename to app/assets/stylesheets/spree/frontend/spree_bank_transfer.css
index 6774745..e63e51b 100644
--- a/app/assets/stylesheets/store/spree_bank_transfer.css
+++ b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css
@@ -1,7 +1,11 @@
 /*
-*= require jquery.ui.datepicker
+ *= require jquery-ui
+ *= require jquery-ui/datepicker
 */
-
+.ui-datepicker { 
+  width: 18em; /* fix calendar width */
+  padding: .2em .2em 0; 
+} 
 .bt_payment_form { margin-left: -10px; }
 .bt_payment_form table { border-collapse: inherit; }
 .bt_payment_form [type="submit"] { margin-left: 10px; }
diff --git a/app/controllers/spree/payments_controller.rb b/app/controllers/spree/payments_controller.rb
index e4ff2f3..a6d5b72 100644
--- a/app/controllers/spree/payments_controller.rb
+++ b/app/controllers/spree/payments_controller.rb
@@ -1,7 +1,7 @@
 module Spree
   class PaymentsController < Spree::StoreController
-    before_filter :authenticate_spree_user!
-    before_filter :find_payment
+    before_action :authenticate_spree_user!
+    before_action :find_payment
 
     def update
       payment_details = PaymentDetails.new(@payment, payment_params)
diff --git a/app/helpers/.DS_Store b/app/helpers/.DS_Store
deleted file mode 100644
index fc50dc1..0000000
Binary files a/app/helpers/.DS_Store and /dev/null differ
diff --git a/app/helpers/spree/.DS_Store b/app/helpers/spree/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/app/helpers/spree/.DS_Store and /dev/null differ
diff --git a/app/helpers/spree/admin/banks_helper.rb b/app/helpers/spree/admin/banks_helper.rb
index 0905e56..10503cc 100644
--- a/app/helpers/spree/admin/banks_helper.rb
+++ b/app/helpers/spree/admin/banks_helper.rb
@@ -10,6 +10,10 @@ def action_to_toggle_bank_status(bank)
         bank.active? ? Spree.t(:deactivate) : Spree.t(:activate)
       end
 
+      def action_text_to_toggle_bank_status(bank)
+        bank.active? ? 'remove-sign' : 'ok-sign'
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb
new file mode 100644
index 0000000..f15b486
--- /dev/null
+++ b/app/helpers/spree/admin/navigation_helper_decorator.rb
@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    module NavigationHelper
+
+      def link_to_with_icon(icon_name, text, url, options = {})
+        options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
+        options[:class] += ' no-text' if options[:no_text]
+        options[:title] = text if options[:no_text]
+        text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
+        text = text.gsub('\'', '"')
+        options.delete(:no_text)
+        if icon_name
+          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
+          text.insert(0, icon + ' ')
+        end
+        link_to(text.html_safe, url, options)
+      end
+
+    end
+  end
+end      
\ No newline at end of file
diff --git a/app/models/.DS_Store b/app/models/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/app/models/.DS_Store and /dev/null differ
diff --git a/app/models/spree/.DS_Store b/app/models/spree/.DS_Store
deleted file mode 100644
index 7087bc0..0000000
Binary files a/app/models/spree/.DS_Store and /dev/null differ
diff --git a/app/overrides/add_bank_details_form_to_order_show.rb b/app/overrides/add_bank_details_form_to_order_show.rb
index 92b51b7..e6e4ec4 100644
--- a/app/overrides/add_bank_details_form_to_order_show.rb
+++ b/app/overrides/add_bank_details_form_to_order_show.rb
@@ -2,32 +2,5 @@
   :virtual_path => 'spree/shared/_order_details',
   :name => 'add_bank_details_form_to_order_show',
   :insert_bottom => ".payment-info",
-  :text => %q{
-    <% if bank_transfer_payment = @order.payments.from_bank_transfer.first %>
-      <% unless bank_transfer_payment.details_submitted? %>
-        <br>
-        <%= link_to Spree.t(:add_details), "javascript:void(0);", :class => 'button add_bt_details' %>
-      <% end %>
-      <%= form_for bank_transfer_payment, :html => { :class => "bt_payment_form #{bank_transfer_payment.details_submitted? ? '' : 'hidden'}" } do |f| %>
-        <table>
-          <tr>
-            <td><%= Spree.t(:deposited_on) %></td><td><%= f.text_field :deposited_on, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Deposited on' %></td>
-          </tr>
-          <tr>
-            <td><%= Spree.t(:bank_name) %></td><td><%= f.text_field :bank_name, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Bank name' %></td>
-          </tr>
-          <tr>
-            <td><%= Spree.t(:account_no) %></td><td><%= f.text_field :account_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Account No.' %></td>
-          </tr>
-          <tr>
-            <td><%= Spree.t(:transaction_reference_no) %></td><td><%= f.text_field :transaction_reference_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Transaction Reference No.' %></td>
-          </tr>
-        </table>
-        <br>
-        <% unless bank_transfer_payment.details_submitted? %>
-          <%= f.submit "Submit", :confirm => Spree.t(:confirm_details_submit)  %>
-        <% end %>
-      <% end %>
-    <% end %>
-  }
+  :partial => "spree/orders/bank_transfer_form"
 )
diff --git a/app/overrides/add_banks_to_admin_configuration_sidebar.rb b/app/overrides/add_banks_to_admin_configuration_sidebar.rb
index f699c2c..3dd198c 100644
--- a/app/overrides/add_banks_to_admin_configuration_sidebar.rb
+++ b/app/overrides/add_banks_to_admin_configuration_sidebar.rb
@@ -1,8 +1,8 @@
 Deface::Override.new(
-  :virtual_path => 'spree/admin/shared/_configuration_menu',
+  :virtual_path => 'spree/admin/shared/sub_menu/_configuration',
   :name => 'add_banks_to_admin_configuration_sidebar',
   :insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
   :text => %q{
-    <%= configurations_sidebar_menu_item Spree.t(:banks), admin_banks_path %>
+    <%= configurations_sidebar_menu_item(Spree.t(:banks), admin_banks_path) %>
     }
 )
\ No newline at end of file
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/app/views/.DS_Store and /dev/null differ
diff --git a/app/views/spree/admin/banks/_form.html.erb b/app/views/spree/admin/banks/_form.html.erb
index 9db5e86..e8f417a 100644
--- a/app/views/spree/admin/banks/_form.html.erb
+++ b/app/views/spree/admin/banks/_form.html.erb
@@ -1,31 +1,26 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @bank } %>
+<div data-hook="admin_banks_form_fields">
+  <div class="row">
+    <%= f.field_container :name, :class => ['form-group'] do %>
+      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+      <%= f.error_message_on :name, :class => 'fullwidth title' %>
+      <%= f.text_field :name, :class => 'form-control' %>
+    <% end %>
 
-<%= form_for [:admin, @bank] do |f| %>
-  <div data-hook="admin_inside_bank_form" class="row">
-    <div class="alpha five columns">
-      <%= f.field_container :name do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-        <%= f.error_message_on :name, :class => 'fullwidth title' %>
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
-
-      <%= f.field_container :account_no do %>
-        <%= f.label :account_no, Spree.t(:account_no) %><span class="required">*</span><br />
-        <%= f.text_field :account_no, :class => 'fullwidth' %>
-      <% end %>
+    <%= f.field_container :account_no, :class => ['form-group'] do %>
+      <%= f.label :account_no, Spree.t(:account_no) %><span class="required">*</span><br />
+      <%= f.text_field :account_no, :class => 'form-control' %>
+    <% end %>
 
-      <%= f.field_container :additional_details do %>
-        <%= f.label :additional_details, Spree.t(:additional_details) %><br />
-        <%= f.text_area :additional_details, :rows => 10, :class => 'fullwidth' %>
-      <% end %>
+    <%= f.field_container :additional_details, :class => ['form-group'] do %>
+      <%= f.label :additional_details, Spree.t(:additional_details) %><br />
+      <%= f.text_area :additional_details, :rows => 10, :class => 'form-control' %>
+    <% end %>
 
-      <%= f.field_container :active do %>
+    <%= f.field_container :active, :class => ['checkbox'] do %>
+      <%= f.label :active do %>
         <%= f.check_box :active %>
-        <%= f.label :active, Spree.t(:active) %>
+        <%= Spree.t(:active) %>
       <% end %>
-
-      <%= f.submit %>
-
-    </div>
+    <% end %>
   </div>
-<% end %>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/spree/admin/banks/edit.html.erb b/app/views/spree/admin/banks/edit.html.erb
index f3066c5..73e9ccc 100644
--- a/app/views/spree/admin/banks/edit.html.erb
+++ b/app/views/spree/admin/banks/edit.html.erb
@@ -1,2 +1,14 @@
-<h1><%= Spree.t(:edit_bank) %></h1>
-<%= render :partial => 'form' %>
\ No newline at end of file
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Bank.model_name.human) %> / <%= @bank.name %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %>
+
+<%= form_for @bank, :url => admin_bank_path(@bank) do |f| %>
+  <fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div data-hook="buttons" class="actions">
+      <%= button Spree.t('actions.update'), 'save' %>
+    </div>
+  </fieldset>
+<% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/banks/index.html.erb b/app/views/spree/admin/banks/index.html.erb
index eaacfa6..c6251ea 100644
--- a/app/views/spree/admin/banks/index.html.erb
+++ b/app/views/spree/admin/banks/index.html.erb
@@ -1,37 +1,50 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_banks) %>
+  <%= plural_resource_name(Spree::Bank) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_bank), new_admin_bank_path %>
-  </li>
+  <%= button_link_to Spree.t(:new_bank), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_bank_link' %>
 <% end %>
 
-<%= paginate @banks %>
+<% if @banks.any? %>
 
-<table class='index'>
-  <thead>
-    <tr>
-      <th><%= Spree.t(:bank_name) %></th>
-      <th><%= Spree.t(:account_no) %></th>
-      <th><%= Spree.t(:additional_details) %></th>
-      <th><%= Spree.t(:status) %></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @banks.each do |bank| %>
-      <tr class="<%= cycle('odd', 'even') %>">
-        <td class="align-center"><%= bank.name %></td>
-        <td class="align-center"><%= bank.account_no %></td>
-        <td class="align-center"><%= bank.additional_details %></td>
-        <td class="align-center" id='active-status-<%= bank.id %>'><%= bank_status(bank) %></td>
-        <td class="actions"><%= link_to action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), :remote => true, :method => :put %></td>
-        <td class="actions"><%= link_to_edit bank, :no_text => true, :class => 'edit' %></td>
+  <table class="table" id='listing_banks'>
+    <thead>
+      <tr data-hook="admin_banks_index_headers">
+        <th><%= Spree.t(:bank_name) %></th>
+        <th><%= Spree.t(:account_no) %></th>
+        <th><%= Spree.t(:additional_details) %></th>
+        <th><%= Spree.t(:status) %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
\ No newline at end of file
+    </thead>
+    <tbody>
+      <% @banks.each do |bank|%>
+        <tr id="<%= spree_dom_id bank %>" data-hook="admin_banks_index_rows">
+          <td><%= bank.name %></td>
+          <td><%= bank.account_no %></td>
+          <td><%= bank.additional_details %></td>
+          <td id='active-status-<%= bank.id %>'><%= bank_status(bank) %></td>
+          <td data-hook="admin_banks_index_row_status" id='toggle-status-<%= bank.id %>' class="actions actions-2 text-right">
+            <% action_class = bank.active ? "btn-danger" : "btn-success" %>
+            <% btn_class = 'btn ' + action_class + ' btn-sm' %>
+            <% status = bank.active ? "active" : "inactive" %>
+            <% bank_id = 'bank-' + bank[:id].to_s %>
+            <%= link_to_with_icon(action_text_to_toggle_bank_status(bank), action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %>
+          </td>
+          <td data-hook="admin_banks_index_row_actions" class="actions actions-2 text-right">            
+            <%= link_to_edit(bank, :no_text => true) if can? :edit, bank %>
+            <%= link_to_delete(bank, :no_text => true) if can? :delete, bank %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Bank)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Bank %>!
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/banks/new.html.erb b/app/views/spree/admin/banks/new.html.erb
index b931d40..501d2f3 100644
--- a/app/views/spree/admin/banks/new.html.erb
+++ b/app/views/spree/admin/banks/new.html.erb
@@ -1,13 +1,18 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_bank) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_banks_list), admin_banks_path, :icon => 'icon-arrow-left' %>
-  </li>  
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_banks_list), admin_banks_path, :class => 'btn btn-primary' %>
 <% end %>
 
-<%= render :partial => 'form' %>    
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %>
+
+<%= form_for [:admin, @bank] do |f| %>
+  <fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/banks/toggle_activation.js.erb b/app/views/spree/admin/banks/toggle_activation.js.erb
index f0c08fb..92e88ea 100644
--- a/app/views/spree/admin/banks/toggle_activation.js.erb
+++ b/app/views/spree/admin/banks/toggle_activation.js.erb
@@ -1,6 +1,10 @@
 <% if @success %>
   $('#active-status-<%= @bank.id %>').text('<%= bank_status(@bank) %>')
-  $('a[href="<%= toggle_activation_admin_bank_path(@bank) %>"]').text('<%= action_to_toggle_bank_status(@bank) %>')
+  <% action_class = @bank.active ? "btn-danger" : "btn-success" %>
+  <% btn_class = "btn " + action_class + " btn-sm" %>
+  <% status = @bank.active ? "active" : "inactive" %>
+  <% bank_id = "bank-" + @bank[:id].to_s %>
+  $('#toggle-status-<%= @bank.id %>').html('<%= link_to_with_icon(action_text_to_toggle_bank_status(@bank), action_to_toggle_bank_status(@bank), toggle_activation_admin_bank_path(@bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %>')
 <% else %>
   alert('<%= @bank.errors.full_messages.to_sentence %>')
 <% end %>
\ No newline at end of file
diff --git a/app/views/spree/checkout/.DS_Store b/app/views/spree/checkout/.DS_Store
deleted file mode 100644
index 4848190..0000000
Binary files a/app/views/spree/checkout/.DS_Store and /dev/null differ
diff --git a/app/views/spree/checkout/payment/_banktransfer.html.erb b/app/views/spree/checkout/payment/_banktransfer.html.erb
deleted file mode 100644
index 84eb6a2..0000000
--- a/app/views/spree/checkout/payment/_banktransfer.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% if (banks = Spree::Bank.active).any? %>
-  <table>
-    <tr>
-      <th><%= Spree.t(:bank_name) %></th>
-      <th><%= Spree.t(:account_no) %></th>
-      <th><%= Spree.t(:additional_details) %></th>
-    </tr>
-    <% banks.each do |bank| %>
-      <tr>
-        <td><%= bank.name %></td>
-        <td><%= bank.account_no %></td>
-        <td><%= bank.additional_details %></td>
-      </tr>
-    <% end %>
-  </table>
-<% end %>
\ No newline at end of file
diff --git a/app/views/spree/checkout/payment/_banktransfer.slim b/app/views/spree/checkout/payment/_banktransfer.slim
new file mode 100644
index 0000000..f416ef0
--- /dev/null
+++ b/app/views/spree/checkout/payment/_banktransfer.slim
@@ -0,0 +1,11 @@
+- if (banks = Spree::Bank.active).any?
+  table.table
+    tr
+      th = Spree.t(:bank_name)
+      th = Spree.t(:account_no)
+      th = Spree.t(:additional_details)
+    - banks.each do |bank|
+      tr
+        td = bank.name
+        td = bank.account_no
+        td = bank.additional_details
\ No newline at end of file
diff --git a/app/views/spree/orders/_bank_transfer_form.html.erb b/app/views/spree/orders/_bank_transfer_form.html.erb
new file mode 100644
index 0000000..d7ca1ad
--- /dev/null
+++ b/app/views/spree/orders/_bank_transfer_form.html.erb
@@ -0,0 +1,31 @@
+<% if bank_transfer_payment = @order.payments.from_bank_transfer.first %>
+  <% unless bank_transfer_payment.details_submitted? %>
+    <br>
+    <%= link_to Spree.t(:add_details), "javascript:void(0);", :class => 'button add_bt_details' %>
+  <% end %>
+  <%= form_for bank_transfer_payment, :html => { :class => "bt_payment_form", :style => "#{bank_transfer_payment.details_submitted? ? '' : 'display:none;'}" } do |f| %>
+    <table>
+      <tr>
+        <td><%= Spree.t(:deposited_on) %></td><td><%= f.text_field :deposited_on, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Deposited on' %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:bank_name) %></td><td><%= f.text_field :bank_name, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Bank name' %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:account_no) %></td><td><%= f.text_field :account_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Account No.' %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:transaction_reference_no) %></td><td><%= f.text_field :transaction_reference_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Transaction Reference No.' %></td>
+      </tr>
+    </table>
+    <br>
+    <% unless bank_transfer_payment.details_submitted? %>
+      <%= f.submit "Submit", :confirm => Spree.t(:confirm_details_submit)  %>
+    <% end %>
+  <% end %>
+<% end %>
+
+
+<% if I18n.locale != :en %>
+  <%= javascript_include_tag "jquery-ui/datepicker-#{I18n.locale}" %>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
new file mode 100644
index 0000000..1eb3990
--- /dev/null
+++ b/config/locales/pt.yml
@@ -0,0 +1,24 @@
+pt:
+  spree:
+    account_no: N.º Conta
+    add_details: Adicionar detalhes
+    additional_details: Detalhes Adicionais
+    back_to_banks_list: Voltar à lista de Bancos
+    banks: Bancos
+    bank_name: Nome do Banco
+    confirm_details_submit: Tem a certeza que pretende submeter estes detalhes? Não será possível editar estes detalhes após envio. Confirme escolhendo "OK".
+    deactivate: Desactivar
+    deposited_on: Depositado em
+    how_bank_transfer_works: Como funciona a Transferência Bancária?
+    listing_banks: A listar Bancos
+    new_bank: Novo Banco
+    only_show_orders_with_bank_transfer_payment_reference_number: Mostrar apenas encomendas pagas por Transferência Bancária
+    payment_not_found: Pagamento não encontrado
+    payment_successfully_updated: Pagamento actualizado com sucesso
+    payment_reference_details: Detalhes de Pagamento por Transferência Bancária
+    transaction_reference_no: N.º da Transacção Bancária
+  activerecord:
+    models:
+      spree/bank:
+        one: Banco
+        other: Bancos
diff --git a/lib/generators/spree_bank_transfer/.DS_Store b/lib/generators/spree_bank_transfer/.DS_Store
deleted file mode 100644
index 8980aa3..0000000
Binary files a/lib/generators/spree_bank_transfer/.DS_Store and /dev/null differ
diff --git a/lib/generators/spree_bank_transfer/install/install_generator.rb b/lib/generators/spree_bank_transfer/install/install_generator.rb
index 4ecb700..0626331 100644
--- a/lib/generators/spree_bank_transfer/install/install_generator.rb
+++ b/lib/generators/spree_bank_transfer/install/install_generator.rb
@@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require store/spree_bank_transfer\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require admin/spree_bank_transfer\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require spree/frontend/spree_bank_transfer\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require spree/backend/spree_bank_transfer\n"
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require store/spree_bank_transfer\n", :before => /\*\//, :verbose => true
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require admin/spree_bank_transfer\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_bank_transfer\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_bank_transfer\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations
diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec
index 00593c6..5db479e 100644
--- a/spree_bank_transfer.gemspec
+++ b/spree_bank_transfer.gemspec
@@ -1,8 +1,8 @@
 # encoding: UTF-8
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
-  s.name        = 'spree-bank-transfer'
-  s.version     = '2.3.0'
+  s.name        = 'spree_bank_transfer'
+  s.version     = '3.1.1'
   s.summary     = 'Spree extension to create bank transfer payment method.'
   s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.'
   s.required_ruby_version = '>= 1.9.3'
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.3.0'
+  s.add_dependency 'spree_core', '>= 3.1.0', '< 4.0'
 
 end