diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 94ad7e2..783a2fd 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -7,12 +7,10 @@
       gc-cons-threshold 100000000)
 (load custom-file)
 (load-theme 'fred t)
-(savehist-mode 1)
-(show-paren-mode 1)
 (column-number-mode 1)
-(when (fboundp 'tool-bar-mode)
-  (tool-bar-mode -1))
-
+(setq standard-indent 2)
+(setq-default tab-width 4
+              indent-tabs-mode nil)
 ;;;; enable disabled functions
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
@@ -49,11 +47,18 @@
 (bind-key "s-t" 'open-thunar-in-current-directory)
 
 ;;;; internal packages
-(use-package indent
+(use-package tool-bar
   :config
-  (setq standard-indent 2)
-  (setq-default tab-width 4
-                indent-tabs-mode nil))
+  (when (fboundp 'tool-bar-mode)
+    (tool-bar-mode -1)))
+
+(use-package savehist
+  :config
+  (savehist-mode))
+
+(use-package paren
+  :config
+  (show-paren-mode 1))
 
 (use-package sh-script
   :defer