diff --git a/keybindings.el b/keybindings.el
index b08248a..e627e20 100644
--- a/keybindings.el
+++ b/keybindings.el
@@ -40,14 +40,21 @@
 
 ;; eproject related keybindings
 (when (require 'eproject nil 'noerror)
-  (global-set-key (kbd "C-c C-f") 'eproject-find-file)
-  (global-set-key (kbd "C-x C-t") 'eproject-find-file))
+  (global-set-key (kbd "C-c C-b") 'eproject-ibuffer)
+  (global-set-key (kbd "C-x p b") 'eproject-ibuffer)
+  (global-set-key (kbd "C-x p t") 'eproject-todo)
+  (global-set-key (kbd "C-x p f") 'eproject-find-file)
+  (global-set-key (kbd "C-x p k") 'eproject-kill-project-buffers)
+  (global-set-key (kbd "C-x p o") 'eproject-open-all-project-files))
 
 ;; Textmate-mode related keybindings
 (when (require 'textmate nil 'noerror)
+  (global-set-key (kbd "C-x C-t") 'textmate-goto-file)
+  (global-set-key (kbd "C-c C-t") 'textmate-goto-symbol)
   (global-set-key (kbd "M-p") 'textmate-column-up)
   (global-set-key (kbd "M-n") 'textmate-column-down))
 
+;; Flyspell correct previous word
 (when (require 'flyspell nil 'noerror)
   (global-set-key (kbd "s-.") 'flyspell-correct-word-before-point))
 
diff --git a/languages/ruby.el b/languages/ruby.el
index b01b003..d04cc63 100644
--- a/languages/ruby.el
+++ b/languages/ruby.el
@@ -32,9 +32,9 @@
             (define-key ruby-mode-map
               (kbd "s-r") 'ruby-compilation-this-buffer)
             (define-key ruby-mode-map
-              (kbd "C-x t") 'eproject-find-file)
+              (kbd "C-x t") 'textmate-goto-file)
             (define-key ruby-mode-map
-              (kbd "C-x C-t") 'eproject-find-file)
+              (kbd "C-x C-t") 'textmate-goto-file)
             (define-key ruby-mode-map
               (kbd "C-c C-l") 'goto-line)
             (define-key ruby-mode-map