diff --git a/emacs/.emacs.d/Cask b/emacs/.emacs.d/Cask
index a6754ba..5ca4207 100644
--- a/emacs/.emacs.d/Cask
+++ b/emacs/.emacs.d/Cask
@@ -77,6 +77,7 @@
 (depends-on "rainbow-delimiters")
 (depends-on "rainbow-mode")
 (depends-on "request")
+(depends-on "rinari")
 (depends-on "rust-mode")
 (depends-on "scss-mode")
 (depends-on "smex")
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index bd32799..3dea91e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1147,37 +1147,30 @@ from myaethon2.core.decorators import (
 
   (prodigy-define-service
     :name "Picturefix mollie-bank"
-    :command "bundle"
-    :args '("exec" "mollie-bank")
+    :command "mollie-bank"
     :cwd "~/projects/work/photension/picturefix"
-    :path '("~/.rbenv/shims")
     :tags '(work)
     :kill-signal 'sigkill)
 
   (prodigy-define-service
     :name "Picturefix"
-    :command "bundle"
-    :args '("exec" "rails" "s")
+    :command "rails"
+    :args '("server")
     :cwd "~/projects/work/photension/picturefix"
-    :path '("~/.rbenv/shims")
     :tags '(work)
     :kill-signal 'sigkill)
 
   (prodigy-define-service
     :name "Picturefix sidekiq"
-    :command "bundle"
-    :args '("exec" "sidekiq")
+    :command "sidekiq"
     :cwd "~/projects/work/photension/picturefix"
-    :path '("~/.rbenv/shims")
     :tags '(work)
     :kill-signal 'sigkill)
 
   (prodigy-define-service
     :name "Picturefix mailcatcher"
-    :command "bundle"
-    :args '("exec" "mailcatcher")
+    :command "mailcatcher"
     :cwd "~/projects/work/photension/picturefix"
-    :path '("~/.rbenv/shims")
     :tags '(work)
     :kill-signal 'sigkill))
 
@@ -1453,6 +1446,9 @@ from myaethon2.core.decorators import (
     (require 'colemak-evil))
   (global-evil-surround-mode))
 
+(with-eval-after-load 'ruby
+  (global-rinari-mode))
+
 (when (equal system-name "drd")
   (load "eap-autoloads"))
 
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 79b19fe..2f27d67 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -11,8 +11,6 @@ INFOPATH="$INFOPATH:/usr/share/info"
 INFOPATH="$INFOPATH:/usr/local/share/info"
 export INFOPATH
 
-systemctl --user import-environment PATH INFOPATH
-
 DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/`id -u`/bus"
 export DBUS_SESSION_BUS_ADDRESS
 
@@ -22,3 +20,6 @@ fi
 
 # Load RVM into a shell session as a func
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
+systemctl --user import-environment PATH INFOPATH GEM_HOME GEM_PATH \
+          MY_RUBY_HOME IRBRC RUBYOPT gemset