diff --git a/spacemacs/private/ruby-min-rails/README.org b/spacemacs/private/ruby-min-rails/README.org
deleted file mode 100644
index ad210f0..0000000
--- a/spacemacs/private/ruby-min-rails/README.org
+++ /dev/null
@@ -1,88 +0,0 @@
-#+TITLE: Ruby on Rails contribution layer for Spacemacs
-
-[[file:img/ror.png]]
-
-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#code-navigation][Code Navigation]]
-     - [[#refactoring][Refactoring]]
-     - [[#run-commands][RUN commands]]
-     - [[#ex-commands][Ex-commands]]
-
-* Description
-
-This layer aims at providing support for the Ruby on Rails framework.
-
-* Install
-
-To use this contribution add it to your =~/.spacemacs=
-
-#+BEGIN_SRC emacs-lisp
-  (setq-default dotspacemacs-configuration-layers '(ruby-on-rails))
-#+END_SRC
-
-* Key bindings
-
-** Code Navigation
-
-| Key binding   | Description                                                     |
-|---------------+-----------------------------------------------------------------|
-| ~SPC m r f a~ | find localization file                                          |
-| ~SPC m r f c~ | find controller                                                 |
-| ~SPC m r f e~ | find environment file                                           |
-| ~SPC m r f f~ | find feature                                                    |
-| ~SPC m r f h~ | find helper                                                     |
-| ~SPC m r f i~ | find initializer                                                |
-| ~SPC m r f j~ | find javascript file                                            |
-| ~SPC m r f l~ | find library                                                    |
-| ~SPC m r f m~ | find model                                                      |
-| ~SPC m r f n~ | find migration                                                  |
-| ~SPC m r f o~ | find log                                                        |
-| ~SPC m r f p~ | find spec file                                                  |
-| ~SPC m r f r~ | find rake task                                                  |
-| ~SPC m r f s~ | find stylesheet file                                            |
-| ~SPC m r f t~ | find test                                                       |
-| ~SPC m r f u~ | find fixture                                                    |
-| ~SPC m r f v~ | find view                                                       |
-| ~SPC m r f y~ | find layout                                                     |
-| ~SPC m r f @~ | find mailer                                                     |
-| ~SPC m r g c~ | go to current controller                                        |
-| ~SPC m r g d~ | go to DB schema                                                 |
-| ~SPC m r g e~ | go to DB seeds                                                  |
-| ~SPC m r g h~ | go to current helper                                            |
-| ~SPC m r g j~ | go to current javascript                                        |
-| ~SPC m r g g~ | go to Gemfile                                                   |
-| ~SPC m r g m~ | go to current model                                             |
-| ~SPC m r g n~ | go to current migration                                         |
-| ~SPC m r g p~ | go to current spec                                              |
-| ~SPC m r g r~ | go to routes                                                    |
-| ~SPC m r g s~ | go to current stylesheet                                        |
-| ~SPC m r g t~ | go to current test                                              |
-| ~SPC m r g u~ | go to current fixture                                           |
-| ~SPC m r g v~ | go to current view                                              |
-| ~SPC m r g z~ | go to spec helper                                               |
-| ~SPC m r g .~ | go to file at point (faster but less powerful than ~SPC m g g~) |
-
-** Refactoring
-
-| Key binding   | Description                 |
-|---------------+-----------------------------|
-| ~SPC m r R x~ | extract region into partial |
-
-** RUN commands
-
-| Key binding   | Description          |
-|---------------+----------------------|
-| ~SPC m r c c~ | run rails generator  |
-| ~SPC m r i~   | start rails console  |
-| ~SPC m r s r~ | reload Rails project |
-| ~SPC m r r :~ | run rake task        |
-| ~SPC m r x s~ | start rails server   |
-
-** Ex-commands
-
-| Key binding | Description                             |
-|-------------+-----------------------------------------|
-| ~:A~        | Switch between implementation and tests |
diff --git a/spacemacs/private/ruby-min-rails/img/ror.png b/spacemacs/private/ruby-min-rails/img/ror.png
deleted file mode 100644
index b514a56..0000000
Binary files a/spacemacs/private/ruby-min-rails/img/ror.png and /dev/null differ
diff --git a/spacemacs/private/ruby-min-rails/packages.el b/spacemacs/private/ruby-min-rails/packages.el
deleted file mode 100644
index 2a3c008..0000000
--- a/spacemacs/private/ruby-min-rails/packages.el
+++ /dev/null
@@ -1,80 +0,0 @@
-;;; packages.el --- Ruby on Rails Layer packages File for Spacemacs
-;;
-;; Copyright (c) 2012-2014 Sylvain Benner
-;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
-;;
-;; Author: Sylvain Benner <sylvain.benner@gmail.com>
-;; URL: https://github.com/syl20bnr/spacemacs
-;;
-;; This file is not part of GNU Emacs.
-;;
-;;; License: GPLv3
-
-(setq ruby-on-rails-packages
-  '(
-    feature-mode
-    projectile-rails
-    ))
-
-(defun ruby-on-rails/init-projectile-rails ()
-  (use-package projectile-rails
-    :defer t
-    :init
-    (progn
-      (add-hook 'projectile-mode-hook 'projectile-rails-on))
-    :config
-    (progn
-      (spacemacs|diminish projectile-rails-mode " ⇋" " RoR")
-
-      ;; Find files
-      (evil-leader/set-key-for-mode 'ruby-mode
-        "mrfa" 'projectile-rails-find-locale
-        "mrfc" 'projectile-rails-find-controller
-        "mrfe" 'projectile-rails-find-environment
-        "mrff" 'projectile-rails-find-feature
-        "mrfh" 'projectile-rails-find-helper
-        "mrfi" 'projectile-rails-find-initializer
-        "mrfj" 'projectile-rails-find-javascript
-        "mrfl" 'projectile-rails-find-lib
-        "mrfm" 'projectile-rails-find-model
-        "mrfn" 'projectile-rails-find-migration
-        "mrfo" 'projectile-rails-find-log
-        "mrfp" 'projectile-rails-find-spec
-        "mrfr" 'projectile-rails-find-rake-task
-        "mrfs" 'projectile-rails-find-stylesheet
-        "mrft" 'projectile-rails-find-test
-        "mrfu" 'projectile-rails-find-fixture
-        "mrfv" 'projectile-rails-find-view
-        "mrfy" 'projectile-rails-find-layout
-        "mrf@" 'projectile-rails-find-mailer
-        ;; Goto file
-        "mrgc" 'projectile-rails-find-current-controller
-        "mrgd" 'projectile-rails-goto-schema
-        "mrge" 'projectile-rails-goto-seeds
-        "mrgh" 'projectile-rails-find-current-helper
-        "mrgj" 'projectile-rails-find-current-javascript
-        "mrgg" 'projectile-rails-goto-gemfile
-        "mrgm" 'projectile-rails-find-current-model
-        "mrgn" 'projectile-rails-find-current-migration
-        "mrgp" 'projectile-rails-find-current-spec
-        "mrgr" 'projectile-rails-goto-routes
-        "mrgs" 'projectile-rails-find-current-stylesheet
-        "mrgt" 'projectile-rails-find-current-test
-        "mrgu" 'projectile-rails-find-current-fixture
-        "mrgv" 'projectile-rails-find-current-view
-        "mrgz" 'projectile-rails-goto-spec-helper
-        "mrg." 'projectile-rails-goto-file-at-point
-        ;; Rails external commands
-        "mrcc" 'projectile-rails-generate
-        "mri" 'projectile-rails-console
-        "mrr:" 'projectile-rails-rake
-        "mrxs" 'projectile-rails-server
-        ;; Refactoring 'projectile-rails-mode
-        "mrRx" 'projectile-rails-extract-region)
-      ;; Ex-commands
-      (evil-ex-define-cmd "A" 'projectile-toggle-between-implementation-and-test))))
-
-(defun ruby-on-rails/init-feature-mode ()
-  "Initialize Cucumber feature mode"
-  (use-package feature-mode
-    :mode (("\\.feature\\'" . feature-mode))))
diff --git a/spacemacs/private/ruby-min/config.el b/spacemacs/private/ruby-min/config.el
deleted file mode 100644
index 1cd9d87..0000000
--- a/spacemacs/private/ruby-min/config.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(spacemacs|defvar-company-backends ruby-mode)
-
-(defvar ruby-version-manager 'rvm
-  "If non nil defines the Ruby version manager (i.e. rbenv, rvm)")
-
-(defvar ruby-enable-ruby-on-rails-support t
-  "If non nil we'll load support for Rails (haml, features, navigation)")
diff --git a/spacemacs/private/ruby-min/packages.el b/spacemacs/private/ruby-min/packages.el
deleted file mode 100644
index 97a7aba..0000000
--- a/spacemacs/private/ruby-min/packages.el
+++ /dev/null
@@ -1,193 +0,0 @@
-(setq ruby-min-packages
-  '(
-    bundler
-    company
-    ruby-mode
-    minitest
-    flycheck
-    robe
-    ruby-test-mode
-    ruby-tools
-    rvm))
-
-(when ruby-version-manager
-  (add-to-list 'ruby-min-packages ruby-version-manager))
-
-(when ruby-enable-ruby-on-rails-support
-  (add-to-list 'ruby-min-packages 'haml-mode)
-  (add-to-list 'ruby-min-packages 'feature-mode)
-  (add-to-list 'ruby-min-packages 'projectile-rails))
-
-(defun ruby-min/init-rbenv ()
-  "Initialize RBENV mode"
-  (use-package rbenv
-    :defer t
-    :init (global-rbenv-mode)
-    :config (add-hook 'ruby-mode-hook
-                      (lambda () (rbenv-use-corresponding)))))
-
-(defun ruby-min/init-rvm ()
-  "Initialize RVM mode"
-  (use-package rvm
-    :defer t
-    :init (rvm-use-default)
-    :config (add-hook 'ruby-mode-hook
-                      (lambda () (rvm-activate-corresponding-ruby)))))
-
-(defun ruby-min/init-ruby-mode ()
-  "Initialize Ruby Mode"
-  (use-package ruby-mode
-    :mode (("\\(Rake\\|Thor\\|Guard\\|Gem\\|Cap\\|Vagrant\\|Berks\\|Pod\\|Puppet\\)file\\'" . ruby-mode)
-           ("\\.\\(rb\\|rabl\\|ru\\|builder\\|rake\\|thor\\|gemspec\\|jbuilder\\)\\'" . ruby-mode))
-    :config
-    (progn
-      (setq enh-ruby-deep-indent-paren nil
-            enh-ruby-hanging-paren-deep-indent-level 2)
-      (sp-with-modes '(ruby-mode ruby-mode)
-        (sp-local-pair "{" "}"
-                       :pre-handlers '(sp-ruby-pre-handler)
-                       :post-handlers '(sp-ruby-post-handler (spacemacs/smartparens-pair-newline-and-indent "RET"))
-                       :suffix "")))))
-
-(defun ruby-min/post-init-flycheck ()
-  (progn
-    (add-hook 'ruby-mode-hook 'flycheck-mode)
-    (setq-default flycheck-disabled-checkers '(ruby-rubylint))))
-
-(defun ruby-min/init-ruby-tools ()
-  (use-package ruby-tools
-    :defer t
-    :init
-    (add-hook 'ruby-mode-hook 'ruby-tools-mode)
-    :config
-    (spacemacs|hide-lighter ruby-tools-mode)))
-
-(defun ruby-min/init-bundler ()
-  (use-package bundler
-    :defer t
-    :init
-    (progn
-      (evil-leader/set-key-for-mode 'ruby-mode "mbc" 'bundle-check)
-      (evil-leader/set-key-for-mode 'ruby-mode "mbi" 'bundle-install)
-      (evil-leader/set-key-for-mode 'ruby-mode "mbs" 'bundle-console)
-      (evil-leader/set-key-for-mode 'ruby-mode "mbu" 'bundle-update)
-      (evil-leader/set-key-for-mode 'ruby-mode "mbx" 'bundle-exec))))
-
-(defun ruby-min/init-projectile-rails ()
-  (use-package projectile-rails
-    :defer t
-    :init
-    (progn
-      (add-hook 'ruby-mode-hook 'projectile-rails-on))
-    :config
-    (progn
-      (spacemacs|diminish projectile-rails-mode " ?" " RoR")
-
-      ;; Find files
-      (evil-leader/set-key-for-mode 'ruby-mode
-        "mrfa" 'projectile-rails-find-locale
-        "mrfc" 'projectile-rails-find-controller
-        "mrfe" 'projectile-rails-find-environment
-        "mrff" 'projectile-rails-find-feature
-        "mrfh" 'projectile-rails-find-helper
-        "mrfi" 'projectile-rails-find-initializer
-        "mrfj" 'projectile-rails-find-javascript
-        "mrfl" 'projectile-rails-find-lib
-        "mrfm" 'projectile-rails-find-model
-        "mrfn" 'projectile-rails-find-migration
-        "mrfo" 'projectile-rails-find-log
-        "mrfp" 'projectile-rails-find-spec
-        "mrfr" 'projectile-rails-find-rake-task
-        "mrfs" 'projectile-rails-find-stylesheet
-        "mrft" 'projectile-rails-find-test
-        "mrfu" 'projectile-rails-find-fixture
-        "mrfv" 'projectile-rails-find-view
-        "mrfy" 'projectile-rails-find-layout
-        "mrf@" 'projectile-rails-find-mailer
-        ;; Goto file
-        "mrgc" 'projectile-rails-find-current-controller
-        "mrgd" 'projectile-rails-goto-schema
-        "mrge" 'projectile-rails-goto-seeds
-        "mrgh" 'projectile-rails-find-current-helper
-        "mrgj" 'projectile-rails-find-current-javascript
-        "mrgg" 'projectile-rails-goto-gemfile
-        "mrgm" 'projectile-rails-find-current-model
-        "mrgn" 'projectile-rails-find-current-migration
-        "mrgp" 'projectile-rails-find-current-spec
-        "mrgr" 'projectile-rails-goto-routes
-        "mrgs" 'projectile-rails-find-current-stylesheet
-        "mrgt" 'projectile-rails-find-current-test
-        "mrgu" 'projectile-rails-find-current-fixture
-        "mrgv" 'projectile-rails-find-current-view
-        "mrgz" 'projectile-rails-goto-spec-helper
-        "mrg." 'projectile-rails-goto-file-at-point
-        ;; Rails external commands
-        "mrcc" 'projectile-rails-generate
-        "mri" 'projectile-rails-console
-        "mrr:" 'projectile-rails-rake
-        "mrxs" 'projectile-rails-server
-        ;; Refactoring 'projectile-rails-mode
-        "mrRx" 'projectile-rails-extract-region)
-      ;; Ex-commands
-      (evil-ex-define-cmd "A" 'projectile-toggle-between-implementation-and-test))))
-
-(defun ruby-min/init-robe ()
-  "Initialize Robe mode"
-  (use-package robe
-    :defer t
-    :init
-    (progn
-      (add-hook 'ruby-mode-hook 'robe-mode)
-      (when (configuration-layer/layer-usedp 'auto-completion)
-        (push 'company-robe company-backends-ruby-mode)))
-    :config
-    (progn
-      (spacemacs|hide-lighter robe-mode)
-      ;; robe mode specific
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "mgg" 'robe-jump)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "mhd" 'robe-doc)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "mrsr" 'robe-rails-refresh)
-      ;; inf-enh-ruby-mode
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "msf" 'ruby-send-definition)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "msF" 'ruby-send-definition-and-go)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "msi" 'robe-start)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "msr" 'ruby-send-region)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "msR" 'ruby-send-region-and-go)
-      (evil-leader/set-key-for-mode 'enh-ruby-mode "mss" 'ruby-switch-to-inf))))
-
-(defun ruby-min/init-yaml-mode ()
-  "Initialize YAML mode"
-  (use-package yaml-mode
-    :mode (("Procfile\\'" . yaml-mode))))
-
-(defun ruby-min/init-feature-mode ()
-  "Initialize Cucumber feature mode"
-  (use-package feature-mode
-    :mode (("\\.feature\\'" . feature-mode))))
-
-(defun ruby-min/init-haml-mode ()
-  (use-package haml-mode
-    :defer t))
-
-(defun ruby-min/init-minitest ()
-  (use-package minitest
-    :defer t
-    :config
-    (setq minitest-use-bundler nil)))
-
-(defun ruby-min/init-ruby-test-mode ()
-  "Define keybindings for ruby test mode"
-  (use-package ruby-test-mode
-    :defer t
-    :init (add-hook 'ruby-mode-hook 'ruby-test-mode)
-    :config
-    (progn
-      (spacemacs|hide-lighter ruby-test-mode)
-      (evil-leader/set-key-for-mode 'ruby-mode "mtb" 'ruby-test-run)
-      (evil-leader/set-key-for-mode 'ruby-mode "mtt" 'ruby-test-run-at-point))))
-
-(when (configuration-layer/layer-usedp 'auto-completion)
-  (defun ruby-min/post-init-company ()
-    (spacemacs|add-company-hook ruby-mode)
-    (eval-after-load 'company-dabbrev-code
-      '(push 'ruby-mode company-dabbrev-code-modes))))
diff --git a/spacemacs/spacemacs b/spacemacs/spacemacs
index 68a190e..749920d 100644
--- a/spacemacs/spacemacs
+++ b/spacemacs/spacemacs
@@ -24,15 +24,14 @@
      org
      syntax-checking
      go
-     ruby-min
-     ruby-min-rails
+     ruby
+     ruby-on-rails
      html
      restclient
      javascript
      lua
      (git :variables
           git-magit-status-fullscreen t)
-     puppet
      ansible
      dockerfile
      emacs-lisp
@@ -43,9 +42,16 @@
      haskell
      yaml
      deft
+
+     ;; haskell config
+     (haskell :variables haskell-enable-shm-support t)
+     (haskell :variables haskell-enable-hindent-style "gibiansky")
+     ;; ruby config
+     (ruby :variables ruby-version-manager 'rvm)
+     (ruby :variables ruby-test-runner 'rspec)
      )
    ;; A list of packages and/or extensions that will not be install and loaded.
-   dotspacemacs-excluded-packages '()
+   dotspacemacs-excluded-packages '(ruby-rubylint)
    ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
    ;; are declared in a layer which is not a member of
    ;; the list `dotspacemacs-configuration-layers'
@@ -58,6 +64,7 @@
   "Initialization function.
 This function is called at the very startup of Spacemacs initialization
 before layers configuration."
+
   ;; This setq-default sexp is an exhaustive list of all the supported
   ;; spacemacs settings.
   (setq-default
@@ -164,12 +171,14 @@ before layers configuration."
   ;; disable smartparens highlighting
   (setq sp-highlight-pair-overlay nil)
   (setq sp-highlight-wrap-overlay nil)
+
   (setq sp-highlight-wrap-tag-overlay nil))
 
 (defun dotspacemacs/config ()
   "Configuration function.
  This function is called at the very end of Spacemacs initialization after
 layers configuration."
+  (setq-default flycheck-disabled-checkers '(ruby-rubylint))
   (global-hl-line-mode -1) ; Disable current line highlight
   (setq powerline-default-separator 'arrow)
   ;; highlight long lines
@@ -196,8 +205,6 @@ layers configuration."
   (custom-set-faces
     '(font-lock-constant-face ((t (:foreground "#cb4b16" :weight unspecified)))))
 
-  (setq ruby-version-manager "rvm")
-  (setq ruby-enable-ruby-on-rails-support t)
   ;; js customisations
   (setq-default js2-basic-offset 2)
   (setq javascript-indent-level 2)
@@ -215,12 +222,6 @@ layers configuration."
   ;; disable directory matching by ido
   (setq ido-auto-merge-work-directories-length -1)
 
-  ;; haskell config
-  (setq-default dotspacemacs-configuration-layers
-   '(
-     (haskell :variables haskell-enable-shm-support t)
-     (haskell :variables haskell-enable-hindent-style "gibiansky")))
-
   ;; deft notes location
   (setq deft-directory "~/Dropbox/Notes")
   (setq deft-use-filename-as-title t)