diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..13946ec
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'acts_as_list'
+gem 'activemodel-serializers-xml'
\ No newline at end of file
diff --git a/app/controllers/custom_workflows_controller.rb b/app/controllers/custom_workflows_controller.rb
index 592f56a..e17bd6d 100644
--- a/app/controllers/custom_workflows_controller.rb
+++ b/app/controllers/custom_workflows_controller.rb
@@ -1,8 +1,32 @@
 class CustomWorkflowsController < ApplicationController
 
   layout 'admin'
-  before_filter :require_admin
-  before_filter :find_workflow, :only => [:show, :edit, :update, :destroy, :export, :change_status]
+  before_action :require_admin
+  before_action :find_workflow, only: [:show, :edit, :update, :destroy, :export, :change_status, :reorder]
+
+  def reorder
+    from = @workflow.position
+    to = params[:custom_workflow][:position].to_i
+    CustomWorkflow.transaction do
+      CustomWorkflow.find_each do |wf|
+        if wf.position == from
+          wf.update_attribute :position, to
+        elsif wf.position >= to && wf.position < from
+          # Move up
+          wf.update_attribute :position, wf.position + 1
+        elsif wf.position <= to && wf.position > from
+          # Move down
+          wf.update_attribute :position, wf.position - 1
+        end
+      end
+    end
+    respond_to do |format|
+      format.html
+      format.js {
+        render inline: "location.replace('#{custom_workflows_path}');"
+      }
+    end
+  end
 
   def index
     @workflows = CustomWorkflow.includes(:projects).all
@@ -52,14 +76,30 @@ class CustomWorkflowsController < ApplicationController
   end
 
   def create
-    @workflow = CustomWorkflow.new(params[:custom_workflow])
+    @workflow = CustomWorkflow.new
+    @workflow.before_save = params[:custom_workflow][:before_save]
+    @workflow.after_save = params[:custom_workflow][:after_save]
+    @workflow.name = params[:custom_workflow][:name]
+    @workflow.description = params[:custom_workflow][:description]
+    @workflow.position = CustomWorkflow.count + 1
+    @workflow.is_for_all = params[:custom_workflow][:is_for_all].present?
+    @workflow.author = params[:custom_workflow][:author]
+    @workflow.active = params[:custom_workflow][:active]
+    @workflow.observable = params[:custom_workflow][:observable]
+    @workflow.shared_code = params[:custom_workflow][:shared_code]
+    @workflow.before_add = params[:custom_workflow][:before_add]
+    @workflow.after_add = params[:custom_workflow][:after_add]
+    @workflow.before_remove = params[:custom_workflow][:before_remove]
+    @workflow.after_remove = params[:custom_workflow][:after_remove]
+    @workflow.before_destroy = params[:custom_workflow][:before_destroy]
+    @workflow.after_destroy = params[:custom_workflow][:after_destroy]
     respond_to do |format|
       if params.has_key?(:commit) && @workflow.save
         flash[:notice] = l(:notice_successful_create)
         cookies[:custom_workflows_author] = @workflow.author
         format.html { redirect_to(custom_workflows_path) }
       else
-        format.html { render :action => "new" }
+        format.html { render action: :new }
       end
     end
   end
@@ -70,26 +110,38 @@ class CustomWorkflowsController < ApplicationController
         flash[:notice] = l(:notice_successful_status_change)
         format.html { redirect_to(custom_workflows_path) }
       else
-        format.html { render :action => :edit }
+        format.html { render action: :edit }
       end
     end
   end
 
   def update
     respond_to do |format|
-      @workflow.assign_attributes(params[:custom_workflow])
+      @workflow.before_save = params[:custom_workflow][:before_save]
+      @workflow.after_save = params[:custom_workflow][:after_save]
+      @workflow.name = params[:custom_workflow][:name]
+      @workflow.description = params[:custom_workflow][:description]
+      @workflow.is_for_all = params[:custom_workflow][:is_for_all].present?
+      @workflow.author = params[:custom_workflow][:author]
+      @workflow.active = params[:custom_workflow][:active]
+      @workflow.shared_code = params[:custom_workflow][:shared_code]
+      @workflow.before_add = params[:custom_workflow][:before_add]
+      @workflow.after_add = params[:custom_workflow][:after_add]
+      @workflow.before_remove = params[:custom_workflow][:before_remove]
+      @workflow.after_remove = params[:custom_workflow][:after_remove]
+      @workflow.before_destroy = params[:custom_workflow][:before_destroy]
+      @workflow.after_destroy = params[:custom_workflow][:after_destroy]
       if params.has_key?(:commit) && @workflow.save
         flash[:notice] = l(:notice_successful_update)
         format.html { redirect_to(custom_workflows_path) }
       else
-        format.html { render :action => :edit }
+        format.html { render action: :edit }
       end
     end
   end
 
   def destroy
     @workflow.destroy
-
     respond_to do |format|
       flash[:notice] = l(:notice_successful_delete)
       format.html { redirect_to(custom_workflows_path) }
diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb
index 52c1586..86e1212 100644
--- a/app/models/custom_workflow.rb
+++ b/app/models/custom_workflow.rb
@@ -14,7 +14,6 @@ class CustomWorkflow < ActiveRecord::Base
   COLLECTION_OBSERVABLES = [:group_users, :issue_attachments, :project_attachments, :wiki_page_attachments]
   SINGLE_OBSERVABLES = [:issue, :user, :group, :attachment, :project, :wiki_content, :time_entry, :version]
 
-  attr_protected :id
   has_and_belongs_to_many :projects
   acts_as_list
 
@@ -104,7 +103,7 @@ class CustomWorkflow < ActiveRecord::Base
 
   def validate_syntax_for(object, event)
     object.instance_eval(read_attribute(event)) if respond_to?(event) && read_attribute(event)
-  rescue WorkflowError => e
+  rescue WorkflowError => _
   rescue Exception => e
     errors.add event, :invalid_script, :error => e
   end
diff --git a/app/views/custom_workflows/_form.html.erb b/app/views/custom_workflows/_form.html.erb
index 6c8b84a..3ee7cfe 100644
--- a/app/views/custom_workflows/_form.html.erb
+++ b/app/views/custom_workflows/_form.html.erb
@@ -9,7 +9,7 @@
                       CustomWorkflow::OBSERVABLES.collect {|o| [l("custom_workflow_observable_#{o}"), o]}, {},
                       :onchange => 'this.form.submit()',
                       :disabled => !@workflow.new_record? %></p>
-      <p><%= f.text_area :description, :cols => 40, :rows => 5 %></p>
+      <p><%= f.text_area :description, cols: 40, rows: 5 , class: 'wiki-edit' %></p>
       <% if @workflow.has_projects_association? %>
         <p><%= f.check_box :is_for_all, :onclick => "checkAndDisable('custom_workflow_enabled_projects', this.checked);", :label => :field_enabled_for_all_projects %></p>
       <% end %>
@@ -44,69 +44,73 @@
   <% when :shared %>
     <%= f.text_area :shared_code, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
   <% when *CustomWorkflow::COLLECTION_OBSERVABLES %>
-    <%= render :layout => 'layouts/collapsible',
-               :locals => {
-                   :collapsed => (not (@workflow.before_add.present? or @workflow.after_add.present? or @workflow.errors[:base].present?)),
-                   :label => l(:label_add_workflows)} do %>
-      <div class="splitcontent">
-        <div class="splitcontentleft">
-          <%= f.text_area :before_add, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
-        </div>
-        <div class="splitcontentright">
-          <%= f.text_area :after_add, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+    <% collapsed = (not (@workflow.before_add.present? or @workflow.after_add.present? or @workflow.errors[:base].present?)) %>
+    <fieldset class="collapsible <%= collapsed ? 'collapsed' : '' %>">
+      <legend onclick="toggleFieldset(this);"><%= l(:label_add_workflows) %></legend>
+      <div style="<%= collapsed ? 'display: none' : '' %>">
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <%= f.text_area :before_add, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
+          <div class="splitcontentright">
+            <%= f.text_area :after_add, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
         </div>
       </div>
-    <% end %>
-    <%= render :layout => 'layouts/collapsible',
-               :locals => {
-                   :collapsed => (not (@workflow.before_remove.present? or @workflow.after_remove.present?)),
-                   :label => l(:label_remove_workflows)} do %>
-      <div class="splitcontent">
-        <div class="splitcontentleft">
-          <%= f.text_area :before_remove, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
-        </div>
-        <div class="splitcontentright">
-          <%= f.text_area :after_remove, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+    </fieldset>
+    <% collapsed = (not (@workflow.before_remove.present? or @workflow.after_remove.present?)) %>
+    <fieldset class="collapsible <%= collapsed ? 'collapsed' : '' %>">
+      <legend onclick="toggleFieldset(this);"><%= l(:label_remove_workflows) %></legend>
+      <div style="<%= collapsed ? 'display: none' : '' %>">
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <%= f.text_area :before_remove, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
+          <div class="splitcontentright">
+            <%= f.text_area :after_remove, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
         </div>
       </div>
-    <% end %>
+    </fieldset>
   <% when *CustomWorkflow::SINGLE_OBSERVABLES %>
-    <%= render :layout => 'layouts/collapsible',
-               :locals => {
-                   :collapsed => (not (@workflow.before_save.present? or @workflow.after_save.present? or @workflow.errors[:base].present?)),
-                   :label => l(:label_save_workflows)} do %>
-      <div class="splitcontent">
-        <div class="splitcontentleft">
-          <%= f.text_area :before_save, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
-          <% if observable == :issue %>
-            <em class="info"><%= l(:text_custom_workflow_before_save_note) %></em>
-          <% end %>
-        </div>
-        <div class="splitcontentright">
-          <%= f.text_area :after_save, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
-          <% if observable == :issue %>
-            <em class="info"><%= l(:text_custom_workflow_after_save_note) %></em>
-          <% end %>
+    <% collapsed = (not (@workflow.before_save.present? or @workflow.after_save.present? or @workflow.errors[:base].present?)) %>
+    <fieldset class="collapsible <%= collapsed ? 'collapsed' : '' %>">
+      <legend onclick="toggleFieldset(this);"><%= l(:label_save_workflows) %></legend>
+      <div style="<%= collapsed ? 'display: none' : '' %>">
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <%= f.text_area :before_save, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+            <% if observable == :issue %>
+              <em class="info"><%= l(:text_custom_workflow_before_save_note) %></em>
+            <% end %>
+          </div>
+          <div class="splitcontentright">
+            <%= f.text_area :after_save, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+            <% if observable == :issue %>
+              <em class="info"><%= l(:text_custom_workflow_after_save_note) %></em>
+            <% end %>
+          </div>
         </div>
       </div>
-    <% end %>
-    <%= render :layout => 'layouts/collapsible',
-               :locals => {
-                   :collapsed => (not (@workflow.before_destroy.present? or @workflow.after_destroy.present?)),
-                   :label => l(:label_destroy_workflows)} do %>
-      <div class="splitcontent">
-        <div class="splitcontentleft">
-          <%= f.text_area :before_destroy, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
-        </div>
-        <div class="splitcontentright">
-          <%= f.text_area :after_destroy, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+    </fieldset>
+    <% collapsed = (not (@workflow.before_destroy.present? or @workflow.after_destroy.present?)) %>
+    <fieldset class="collapsible <%= collapsed ? 'collapsed' : '' %>">
+      <legend onclick="toggleFieldset(this);"><%= l(:label_destroy_workflows) %></legend>
+      <div style="<%= collapsed ? 'display: none' : '' %>">
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <%= f.text_area :before_destroy, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
+          <div class="splitcontentright">
+            <%= f.text_area :after_destroy, :cols => 40, :rows => 20, :wrap => 'off', :class => 'custom_workflow_script' %>
+          </div>
         </div>
       </div>
-    <% end %>
+    </fieldset>
   <% end %>
 </fieldset>
 
-<script type="text/javascript">
+<script>
     jQuery('.custom_workflow_script').taboverride(2, true);
     function checkAndDisable(id, checked) {
         if (checked) {
diff --git a/app/views/custom_workflows/index.html.erb b/app/views/custom_workflows/index.html.erb
index 25d86fc..339747d 100644
--- a/app/views/custom_workflows/index.html.erb
+++ b/app/views/custom_workflows/index.html.erb
@@ -38,7 +38,9 @@
           <%= workflow.projects.map(&:name).join(", ") %>
         <% end %>
       </td>
-      <td align="center" nowrap><%= reorder_links("custom_workflow", {:action => 'update', :id => workflow, :commit => true}) %></td>
+      <td align="center" nowrap>
+        <%= reorder_handle(workflow, url: url_for(action: 'reorder', id: workflow) ) %>
+      </td>
       <td class="buttons">
         <% if workflow.active? %>
           <%= link_to(l(:button_custom_workflow_deactivate), custom_workflow_status_path(workflow, :active => false), :class => 'icon icon-inactive', :method => :post) %>
@@ -73,4 +75,8 @@
       <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
     </p>
   <% end %>
-</div>
\ No newline at end of file
+</div>
+
+<%= javascript_tag do %>
+  $(function() { $("table.custom-workflows tbody").positionedItems(); });
+<% end %>
diff --git a/app/views/layouts/_collapsible.html.erb b/app/views/layouts/_collapsible.html.erb
deleted file mode 100644
index 7372a01..0000000
--- a/app/views/layouts/_collapsible.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<fieldset class="collapsible <%= collapsed ? 'collapsed' : '' %>">
-  <legend onclick="toggleFieldset(this);"><%= label %></legend>
-  <div style="<%= collapsed ? 'display: none' : '' %>">
-      <%= yield %>
-  </div>
-</fieldset>
diff --git a/app/views/projects/settings/_custom_workflow.html.erb b/app/views/projects/settings/_custom_workflow.html.erb
index 8fed50c..85474f4 100644
--- a/app/views/projects/settings/_custom_workflow.html.erb
+++ b/app/views/projects/settings/_custom_workflow.html.erb
@@ -1,4 +1,4 @@
-<%= form_for @project do |f| %>
+<%= form_for @project do %>
   <%= hidden_field_tag :tab, 'custom_workflow' %>
   <%= hidden_field_tag 'project[custom_workflow_ids][]', '' %>
   <fieldset>
diff --git a/assets/javascripts/tab_override.js b/assets/javascripts/tab_override.js
index ffab1e4..53878f2 100644
--- a/assets/javascripts/tab_override.js
+++ b/assets/javascripts/tab_override.js
@@ -6,7 +6,7 @@
   };
 
   function TabOverride(element, tabSize, autoIndent) {
-    var ta = document.createElement('textarea');
+    let ta = document.createElement('textarea');
     ta.value = '\n';
 
     this.newline = ta.value;
@@ -43,12 +43,11 @@
      * @function
      */
     setTabSize:function (size) {
-      var i;
       if (!size) { // size is 0 or not specified (or falsy)
         this.aTab = '\t';
       } else if (typeof size === 'number' && size > 0) {
         this.aTab = '';
-        for (i = 0; i < size; i += 1) {
+        for (let i = 0; i < size; i += 1) {
           this.aTab += ' ';
         }
       }
@@ -64,7 +63,7 @@
      * @private
      */
     overrideKeyPress:function (e) {
-      var key = e.keyCode;
+      let key = e.keyCode;
       if ((key === 9 || (key === 13 && this.autoIndent && !this.inWhitespace)) && !e.ctrlKey && !e.altKey) {
         e.preventDefault();
       }
@@ -78,7 +77,7 @@
      * @private
      */
     overrideKeyDown:function (e) {
-      var key = e.keyCode, // the key code for the key that was pressed
+      let key = e.keyCode, // the key code for the key that was pressed
         tab, // the string representing a tab
         tabLen, // the length of a tab
         text, // initial text in the textarea
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
new file mode 100644
index 0000000..d6e3ad4
--- /dev/null
+++ b/config/locales/cs.yml
@@ -0,0 +1,104 @@
+cs:
+  project_module_custom_workflows_module: Uživatelské procesy
+  permission_manage_project_workflow: Spravovat uživatelské procesy
+
+  label_custom_workflow: Uživatelský proces
+  label_custom_workflow_plural: Uživatelské procesy
+  label_custom_workflow_new: Vytvořit uživatelský proces
+  label_workflow_scripts: Skript procesu
+  label_enabled_projects: Povoleno pro projekt(y)
+  label_custom_workflow_export: Export
+  label_custom_workflow_import: Importovat proces
+  label_save_workflows: Uložení sledovaných objektů
+  label_destroy_workflows: Smazání sledovaných objektů
+  label_add_workflows: Přidání sledovaných objektů do sezanmu
+  label_remove_workflows: Odstranění sledovaných objektů za seznamu
+
+  button_import: Import
+  button_custom_workflow_activate: Aktivovat
+  button_custom_workflow_deactivate: Deaktivovat
+
+  field_after_save: Skript spuštěný po uložení sledovaného objektu
+  field_before_save: Skript spuštěný před uložením sledovaného objektu
+  field_after_destroy: Skript spuštěný po smazání sledovaného objektu
+  field_before_destroy: Skript spuštěný před smazáním sledovaného objektu
+  field_after_add: Skript spuštěný po přidání sledovaného objektu do seznamu
+  field_before_add: Skript spuštěný před přidáním sledovaného objektu do seznamu
+  field_after_remove: Skript spuštěný po odstranění sledovaného objektu ze seznamu
+  field_before_remove: Skript spuštěný před odstraněním sledovaného objektu ze seznamu
+  field_shared_code: Sdílený kód
+  field_observable: Sledovaný objekt
+  field_is_enabled: Povoleno
+  field_enabled_for_all_projects: Povoleno pro všechny projekty
+  field_custom_workflow_author: Autorův e-mail
+  field_custom_workflow_file: Select the XML file previously exported process
+  field_custom_workflow_active: Aktivní
+  field_custom_workflow:
+    script: Skript
+
+  notice_successful_import: Uživatelský proces byl úspěšně naimportován
+  notice_successful_status_change: Status byl úspěšně změněn
+  error_failed_import: Chyba při importu uživatelského procesu (Neznámý formát? Podívejte se do logu.)
+
+  activerecord:
+    errors:
+      messages:
+        invalid_script: "obsahuje chyby: %{error}"
+        custom_workflow_error: Chyba uživatelského procesu (kontaktujte administrátora)
+        new_status_invalid: "změna z '%{old_status}' na '%{new_status}' není povolena"
+        scripts_absent: Musí být definován alespoň jeden skript
+
+  text_select_project_custom_workflows: Vyberte uživatelský skript projektu
+  text_custom_workflow_before_save_note: "Zde můžete měnit vlastnosti úkolu. Ve skriptu nevytvářejte ani neměňte
+    související úkoly. Pro ukončení skriptu chybou použijte: `raise WorkflowError, 'Zpráva uživateli'`."
+  text_custom_workflow_after_save_note: Zde můžete aktualizovat nebo vytvářet souvissející úkoly. Mějte na paměti, že
+    tento skript bude také vykonán pro nově vytvořené úkoly. Takže nezapomeňte udělat vhodné kontroly pro zabránění
+    rekurzivnímu volání.
+  text_custom_workflow_issue_code_note: Skripty jsou vykonávány v rámci objektu úkolu stejně jako volání `before_save`
+    a `after_save` funkcí. Takže lze použít přímo vlastností úkolů. Proměnné (@variable) jsou rovněž dostupné a lze jich
+    použít.
+  text_custom_workflow_shared_code_note: Tento kód bude spuštěn pře jakýmkoli jiným procesem a může obsahovat sdílený
+    kód, např. funkce a třídy, které jsou potřeba v jiných procesech
+  text_custom_workflow_user_code_note: Skripty jsou vykonávány v rámci objektu uživatel, když se objekt mění (maže).
+    Můžete přímo použít metody a vlastnosti objektu.
+  text_custom_workflow_group_code_note: Skripty jsou vykonávány v rámci objektu skupina, když se objekt mění (maže).
+    Můžete přímo použít metody a vlastnosti objektu.
+  text_custom_workflow_group_users_code_note: Tyto skripty jsou vykonávány, když je uživatel přidán nebo odebrán ze
+    skupiny. Pro přístup k objektům použijte proměnné @user a @group.
+  text_custom_workflow_attachment_code_note: Skripty jsou vykonávány v rámci objektu příloha, když se tento objekt mění
+    (maže se). Můžete přímo použít metody a vlastnosti objektu. Mějte na paměti, že se to týká všech typů příloh
+    (u úkolů, dokumentů, wiki stránek atd.), takže byste měli zkontrolovat proměnnou 'container_type' pro určení,
+    o jakou přílohu se jedná.
+  text_custom_workflow_issue_attachments_code_note: Tento skripty se vykonávají když je příloha přidána nebo odebrába
+    z úkolu. Můžete použít proměnné @issue a @attachment pro přístup k těmto objektům ve skriptu.
+  text_custom_workflow_project_code_note: SSkripty jsou vykonávány v rámci objektu projekt, když se objekt mění (maže).
+    Můžete přímo použít metody a vlastnosti objektu.
+  text_custom_workflow_project_attachments_code_note: Tyto skripty jsou vykonávány, když se přidává nebo se maže soubor
+    u projektu. Můžete použít proměnné @project a @attachment pro přístup k těmto objektům ve skriptu.
+  text_custom_workflow_wiki_content_code_note: Tyto kripty jsou vykonávány v rámci objektu Wiki, když se mění nebo se
+    maže. Můžete přímo použít metody a vlastnosti objektu.
+  text_custom_workflow_wiki_page_attachments_code_note: Tyto skripty jsou vykonávány, když se přidává nebo se maže
+    příloha u wiki stránky. Můžete použít proměnné @page a @attachment pro přístup k těmto objektům ve skriptu.
+  text_custom_workflow_time_entry_code_note: Skripty jsou vykonávány v rámci objektu časový záznam, kdyže se mění nebo
+    se maže. Můžete přímo použít metody a vlastnosti objektu.
+  text_custom_workflow_version_code_note: Skripty jsou vykonávány v rámci objektu verze, když se mění nebo se maže.
+    Můžete přímo použít metody a vlastnosti objektu.
+
+  text_no_enabled_projects: Žádné projekty
+  text_custom_workflow_author: Bude zahrnuto do exportovaného XML
+  text_custom_workflow_disabled: zakázáno administrátorem
+  text_custom_workflow_is_for_all: povoleno pro všechny projekty
+
+  custom_workflow_observable_shared: <sdílený kód>
+  custom_workflow_observable_issue: Úkol
+  custom_workflow_observable_issue_attachments: Přílohy úkolů
+  custom_workflow_observable_group: Skupina
+  custom_workflow_observable_user: Uživatel
+  custom_workflow_observable_attachment: Příloha
+  custom_workflow_observable_project: Projekt
+  custom_workflow_observable_project_attachments: Soubory
+  custom_workflow_observable_wiki_content: Wiki
+  custom_workflow_observable_wiki_page_attachments: Přílohy na wiki
+  custom_workflow_observable_group_users: Uživatelé skupin
+  custom_workflow_observable_time_entry: Časový záznam
+  custom_workflow_observable_version: Verze
diff --git a/config/locales/pt-br.yml b/config/locales/pt-BR.yml
similarity index 100%
rename from config/locales/pt-br.yml
rename to config/locales/pt-BR.yml
diff --git a/config/routes.rb b/config/routes.rb
index d5d0df0..1e008c3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,4 +4,5 @@ RedmineApp::Application.routes.draw do
   post '/custom_workflows/:id', :to => 'custom_workflows#update'
   get '/custom_workflows/:id/export', :to => 'custom_workflows#export', :as => 'export_custom_workflow'
   post '/custom_workflows/:id/change_status', :to => 'custom_workflows#change_status', :as => 'custom_workflow_status'
+  put '/custom_workflows/:id/reorder', :to => 'custom_workflows#reorder'
 end
diff --git a/db/migrate/20110915084858_create_custom_workflows.rb b/db/migrate/20110915084858_create_custom_workflows.rb
index 0f2f9f1..cc27614 100644
--- a/db/migrate/20110915084858_create_custom_workflows.rb
+++ b/db/migrate/20110915084858_create_custom_workflows.rb
@@ -1,5 +1,5 @@
-class CreateCustomWorkflows < ActiveRecord::Migration
-  def self.up
+class CreateCustomWorkflows < ActiveRecord::Migration[4.2]
+  def change
     create_table :custom_workflows, :force => true do |t|
       t.references :project
       t.text :script, :null => true, :default => nil
@@ -8,7 +8,4 @@ class CreateCustomWorkflows < ActiveRecord::Migration
     add_index :custom_workflows, [:project_id], :unique => true
   end
 
-  def self.down
-    drop_table :custom_workflows
-  end
 end
diff --git a/db/migrate/20120601054047_alter_custom_workflows.rb b/db/migrate/20120601054047_alter_custom_workflows.rb
index d67ef21..0df20ae 100644
--- a/db/migrate/20120601054047_alter_custom_workflows.rb
+++ b/db/migrate/20120601054047_alter_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AlterCustomWorkflows < ActiveRecord::Migration
+class AlterCustomWorkflows < ActiveRecord::Migration[4.2]
   def self.up
     remove_column :custom_workflows, :project_id
     remove_column :custom_workflows, :is_enabled
@@ -7,6 +7,4 @@ class AlterCustomWorkflows < ActiveRecord::Migration
     add_column :custom_workflows, :position, :integer, :null => false, :default => 1
   end
 
-  def self.down
-  end
 end
diff --git a/db/migrate/20120601054557_create_custom_workflows_projects.rb b/db/migrate/20120601054557_create_custom_workflows_projects.rb
index 8e0e4c8..0d532bd 100644
--- a/db/migrate/20120601054557_create_custom_workflows_projects.rb
+++ b/db/migrate/20120601054557_create_custom_workflows_projects.rb
@@ -1,5 +1,5 @@
-class CreateCustomWorkflowsProjects < ActiveRecord::Migration
-  def self.up
+class CreateCustomWorkflowsProjects < ActiveRecord::Migration[4.2]
+  def change
     create_table :custom_workflows_projects, :force => true, :id => false do |t|
       t.references :project
       t.references :custom_workflow
@@ -8,7 +8,4 @@ class CreateCustomWorkflowsProjects < ActiveRecord::Migration
     add_index :custom_workflows_projects, [:custom_workflow_id]
   end
 
-  def self.down
-    drop_table :custom_workflows_projects
-  end
 end
diff --git a/db/migrate/20120628060102_change_custom_workflows_description_type.rb b/db/migrate/20120628060102_change_custom_workflows_description_type.rb
index 262678c..177d71c 100644
--- a/db/migrate/20120628060102_change_custom_workflows_description_type.rb
+++ b/db/migrate/20120628060102_change_custom_workflows_description_type.rb
@@ -1,8 +1,6 @@
-class ChangeCustomWorkflowsDescriptionType < ActiveRecord::Migration
+class ChangeCustomWorkflowsDescriptionType < ActiveRecord::Migration[4.2]
   def self.up
     change_column :custom_workflows, :description, :text, :null => true, :default => nil
   end
 
-  def self.down
-  end
 end
diff --git a/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb b/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb
index 7211212..dcc231f 100644
--- a/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb
+++ b/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddAfterSaveToCustomWorkflows < ActiveRecord::Migration
+class AddAfterSaveToCustomWorkflows < ActiveRecord::Migration[4.2]
   def self.up
     rename_column :custom_workflows, :script, :before_save
     change_column :custom_workflows, :before_save, :text, :null => true
diff --git a/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb b/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb
index 716315f..e5dcbee 100644
--- a/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb
+++ b/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb
@@ -1,8 +1,5 @@
-class AddIsForAllToCustomWorkflows < ActiveRecord::Migration
-  def self.up
+class AddIsForAllToCustomWorkflows < ActiveRecord::Migration[4.2]
+  def change
     add_column :custom_workflows, :is_for_all, :boolean, :null => false, :default => false
   end
-  def self.down
-    remove_column :custom_workflows, :is_for_all
-  end
 end
diff --git a/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb b/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb
index 1d4d947..4d2b75b 100644
--- a/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb
+++ b/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb
@@ -1,8 +1,6 @@
-class MakeAfterSaveAndBeforeSaveNullable < ActiveRecord::Migration
+class MakeAfterSaveAndBeforeSaveNullable < ActiveRecord::Migration[4.2]
   def up
     change_column :custom_workflows, :before_save, :text, :null => true, :default => nil
     change_column :custom_workflows, :after_save, :text, :null => true, :default => nil
   end
-  def down
-  end
 end
diff --git a/db/migrate/20150522134437_set_position_field_nullable.rb b/db/migrate/20150522134437_set_position_field_nullable.rb
index 95b73fc..69927c8 100644
--- a/db/migrate/20150522134437_set_position_field_nullable.rb
+++ b/db/migrate/20150522134437_set_position_field_nullable.rb
@@ -1,7 +1,5 @@
-class SetPositionFieldNullable < ActiveRecord::Migration
+class SetPositionFieldNullable < ActiveRecord::Migration[4.2]
   def up
     change_column :custom_workflows, :position, :integer, :null => true
   end
-  def down
-  end
 end
diff --git a/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb b/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb
index 76be796..7b38bbe 100644
--- a/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb
+++ b/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddAuthorAndTimestampsToCustomWorkflows < ActiveRecord::Migration
+class AddAuthorAndTimestampsToCustomWorkflows < ActiveRecord::Migration[4.2]
   def change
     add_column :custom_workflows, :author, :string, :null => true
     add_timestamps :custom_workflows
diff --git a/db/migrate/20150526132244_create_example_workflow.rb b/db/migrate/20150526132244_create_example_workflow.rb
index fd37ffc..7987d11 100644
--- a/db/migrate/20150526132244_create_example_workflow.rb
+++ b/db/migrate/20150526132244_create_example_workflow.rb
@@ -1,4 +1,4 @@
-class CreateExampleWorkflow < ActiveRecord::Migration
+class CreateExampleWorkflow < ActiveRecord::Migration[4.2]
   def self.up
     CustomWorkflow.reset_column_information
     old = CustomWorkflow.where(:name => 'Duration/Done Ratio/Status correlation').first
diff --git a/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb b/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb
index 0dfb9bc..f8cf375 100644
--- a/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb
+++ b/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddActiveFieldToCustomWorkflows < ActiveRecord::Migration
+class AddActiveFieldToCustomWorkflows < ActiveRecord::Migration[4.2]
   def change
     add_column :custom_workflows, :active, :boolean, :null => false, :default => true
   end
diff --git a/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb b/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb
index d563472..f1091f4 100644
--- a/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb
+++ b/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddObservableFieldToCustomWorkflows < ActiveRecord::Migration
+class AddObservableFieldToCustomWorkflows < ActiveRecord::Migration[4.2]
   def change
     add_column :custom_workflows, :observable, :string, :null => false, :default => 'issue'
   end
diff --git a/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb b/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb
index 472336b..0ab66d2 100644
--- a/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb
+++ b/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddAdditionalScriptFieldsToCustomWorkflows < ActiveRecord::Migration
+class AddAdditionalScriptFieldsToCustomWorkflows < ActiveRecord::Migration[4.2]
   def change
     add_column :custom_workflows, :shared_code, :text, :null => true
     add_column :custom_workflows, :before_add, :text, :null => true
diff --git a/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb b/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb
index 9a5d33f..579c218 100644
--- a/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb
+++ b/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb
@@ -1,4 +1,4 @@
-class AddBeforeAndAfterDestroyToCustomWorkflows < ActiveRecord::Migration
+class AddBeforeAndAfterDestroyToCustomWorkflows < ActiveRecord::Migration[4.2]
   def change
     add_column :custom_workflows, :before_destroy, :text, :null => true
     add_column :custom_workflows, :after_destroy, :text, :null => true
diff --git a/init.rb b/init.rb
index 8248f92..29f4221 100644
--- a/init.rb
+++ b/init.rb
@@ -7,21 +7,23 @@ Redmine::Plugin.register :redmine_custom_workflows do
   version '0.1.6'
   url 'http://www.redmine.org/plugins/custom-workflows'
 
+  requires_redmine version_or_higher: '4.0.0'
+
   menu :admin_menu, :custom_workflows, {:controller => 'custom_workflows', :action => 'index'},
-       :if => Proc.new { User.current.admin? }, :caption => :label_custom_workflow_plural
+       :if => Proc.new { User.current.admin? }, :caption => :label_custom_workflow_plural,
+	:html => {:class => 'icon icon-workflows'}
 
   permission :manage_project_workflow, {}, :require => :member
 end
 
 require 'redmine_custom_workflows/hooks'
 
+require File.dirname(__FILE__) + '/lib/redmine_custom_workflows/projects_helper_patch'
+
 Rails.application.config.to_prepare do
   unless Project.include?(RedmineCustomWorkflows::ProjectPatch)
     Project.send(:include, RedmineCustomWorkflows::ProjectPatch)
   end
-  unless ProjectsHelper.include?(RedmineCustomWorkflows::ProjectsHelperPatch)
-    ProjectsHelper.send(:include, RedmineCustomWorkflows::ProjectsHelperPatch)
-  end
   unless Attachment.include?(RedmineCustomWorkflows::AttachmentPatch)
     Attachment.send(:include, RedmineCustomWorkflows::AttachmentPatch)
   end
@@ -52,4 +54,4 @@ Rails.application.config.to_prepare do
   unless ActionView::Base.include?(RedmineCustomWorkflows::Helper)
     ActionView::Base.send(:include, RedmineCustomWorkflows::Helper)
   end
-end
\ No newline at end of file
+end
diff --git a/lib/redmine_custom_workflows/mailer_patch.rb b/lib/redmine_custom_workflows/mailer_patch.rb
index 863ed23..5ad5a7b 100644
--- a/lib/redmine_custom_workflows/mailer_patch.rb
+++ b/lib/redmine_custom_workflows/mailer_patch.rb
@@ -8,7 +8,7 @@ module RedmineCustomWorkflows
     end
 
     module InstanceMethods
-      def custom_email(headers={})
+      def self.deliver_custom_email(headers={})
         user = headers.delete :user
         headers[:to] = user.mail if user
         text_body = headers.delete :text_body
diff --git a/lib/redmine_custom_workflows/projects_helper_patch.rb b/lib/redmine_custom_workflows/projects_helper_patch.rb
index 458e54f..af8f4b6 100644
--- a/lib/redmine_custom_workflows/projects_helper_patch.rb
+++ b/lib/redmine_custom_workflows/projects_helper_patch.rb
@@ -1,20 +1,14 @@
 module RedmineCustomWorkflows
   module ProjectsHelperPatch
 
-    def self.included(base)
-      base.send(:include, InstanceMethods)
-      base.class_eval do
-        alias_method_chain :project_settings_tabs, :custom_workflows
-      end
+    def project_settings_tabs
+      tabs = super 
+      tabs << {:name => 'custom_workflows', :action => :manage_project_workflow, :partial => 'projects/settings/custom_workflow',
+               :label => :label_custom_workflow_plural} if User.current.allowed_to?(:manage_project_workflow, @project)
+      tabs
     end
 
-    module InstanceMethods
-      def project_settings_tabs_with_custom_workflows
-        tabs = project_settings_tabs_without_custom_workflows
-        tabs << {:name => 'custom_workflows', :action => :manage_project_workflow, :partial => 'projects/settings/custom_workflow',
-                 :label => :label_custom_workflow_plural} if User.current.allowed_to?(:manage_project_workflow, @project)
-        tabs
-      end
-    end
   end
-end
\ No newline at end of file
+end
+
+ProjectsHelper.send(:prepend, RedmineCustomWorkflows::ProjectsHelperPatch)