diff --git a/.gitmodules b/.gitmodules
index 9c282b7f..d6bd2a8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,12 @@
 [submodule "lisp/flymake-cursor"]
 	path = lisp/flymake-cursor
 	url = git@github.com:illusori/emacs-flymake-cursor.git
-[submodule "lisp/rainbow-delimiters"]
-	path = lisp/rainbow-delimiters
-	url = git@github.com:jlr/rainbow-delimiters.git
 [submodule "lisp/multi-line-it"]
 	path = lisp/multi-line-it
 	url = git@github.com:IvanMalison/multi-line-it.git
-[submodule "themes/zenburn"]
-	path = themes/zenburn
-	url = https://github.com/bbatsov/zenburn-emacs
 [submodule "emacs-for-python"]
 	path = emacs-for-python
 	url = git@github.com:IvanMalison/emacs-for-python.git
-[submodule "themes/solarized"]
-	path = themes/solarized
-	url = git@github.com:sellout/emacs-color-theme-solarized.git
 [submodule "lisp/emacs-testify"]
 	path = lisp/emacs-testify
 	url = git@github.com:IvanMalison/emacs-testify.git
diff --git a/init.el b/init.el
index 5ba623fc..b506c25b 100644
--- a/init.el
+++ b/init.el
@@ -20,11 +20,7 @@
 (let ((default-directory "~/.emacs.d/elpa/"))
       (normal-top-level-add-subdirs-to-load-path))
 
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/zenburn")
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/solarized")
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 (add-to-list 'custom-theme-load-path "~/.emacs.d/elpa/")
-(load-theme 'zenburn t)
 (require 'patches)
 
 ;; =============================================================================
@@ -39,10 +35,13 @@
 (package-initialize)
 
 (defvar my-packages '(color-theme ctags ctags-update evil flymake mo-git-blame
-				  multiple-cursors no-easy-keys starter-kit-bindings
-				  starter-kit-ruby starter-kit magit ido-ubiquitous
-				  find-file-in-project idle-highlight-mode paredit
-				  inf-ruby undo-tree rainbow-delimiters package-filter smex)
+				  multiple-cursors no-easy-keys
+                                  starter-kit-bindings starter-kit-ruby
+                                  starter-kit magit ido-ubiquitous
+                                  find-file-in-project idle-highlight-mode
+                                  paredit inf-ruby undo-tree rainbow-delimiters
+                                  smex solarized-theme zenburn-theme
+                                  color-theme-wombat+)
   "Packages that must be installed at launch.")
 
 (defun ensure-package-installed (packages)
@@ -259,6 +258,7 @@ Return a list of installed packages or nil for every package not installed."
 ;;                                                                    Appearance
 ;; =============================================================================
 
+(load-theme 'zenburn t)
 (require 'color-theme)
 (require 'whitespace)
 (require 'rainbow-delimiters)
diff --git a/lisp/rainbow-delimiters b/lisp/rainbow-delimiters
deleted file mode 160000
index d38744e9..00000000
--- a/lisp/rainbow-delimiters
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d38744e9453cbe33ae2d28d76fa847d0611eb4c6
diff --git a/themes/solarized b/themes/solarized
deleted file mode 160000
index ec7dc872..00000000
--- a/themes/solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec7dc872858bed95e71a7d23ddba5488699cdf58
diff --git a/themes/zenburn b/themes/zenburn
deleted file mode 160000
index 2315e850..00000000
--- a/themes/zenburn
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2315e850aaee6b1e9bb16ea232723e5534e77a37