diff --git a/bundle/bundle--general.el b/bundle/bundle--general.el
index fa99381e..d0fc5c57 100644
--- a/bundle/bundle--general.el
+++ b/bundle/bundle--general.el
@@ -11,7 +11,6 @@
 (mouse-wheel-mode 1)
 (blink-cursor-mode -1)
 
-(setq ispell-program-name "hunspell")
 (setq grep-command "grep -i -nH -e ")
 
 (when (eq system-type 'gnu/linux)
@@ -59,11 +58,15 @@
 
 (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((meta)) ((control) . text-scale)))
 
+;;; SIMPLE
 (setq completion-auto-wrap t)
+(setq completion-auto-select nil)
+
+;;; MINIBUFFER
 (setq completions-format 'one-column)
 (setq completions-header-format nil)
 (setq completions-max-height 20)
-(setq completion-auto-select nil)
+
 ;; (require 'ido)
 ;; (setq ido-enable-flex-matching t)
 ;; (setq ido-everywhere t)
@@ -129,17 +132,6 @@
   (setq doom-themes-enable-bold t
         doom-themes-enable-italic t))
 
-(setq world-clock-time-format "%a %d %b %R %Z")
-
-(setq world-clock-list
-      '(("America/Los_Angeles" "Seattle")
-        ("America/New_York" "New York")
-        ("Europe/London" "London")
-        ("Europe/Paris" "Paris")
-        ("Europe/Sofia" "Sofia")
-        ("Asia/Calcutta" "Bangalore")
-        ("Asia/Tokyo" "Tokyo")))
-
 (tool-bar-mode -1)
 (menu-bar-mode -1)
 (scroll-bar-mode -1)
diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index 7cab0338..8456dcdf 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -19,6 +19,19 @@
 
 (use-package htmlize)
 
+(use-package time
+  :ensure nil
+  :config
+  (setq world-clock-time-format "%a %d %b %R %Z")
+  (setq world-clock-list
+        '(("America/Los_Angeles" "Seattle")
+          ("America/New_York" "New York")
+          ("Europe/London" "London")
+          ("Europe/Paris" "Paris")
+          ("Europe/Sofia" "Sofia")
+          ("Asia/Calcutta" "Bangalore")
+          ("Asia/Tokyo" "Tokyo"))))
+
 (use-package autoinsert
   :ensure nil
   :init (auto-insert-mode 1)
@@ -87,6 +100,7 @@
       ;; finds and loads.
       ;; (when (eq system-type 'windows-nt)
       ;;   (setq ispell-program-name "c:/msys64/ucrt64/bin/hunspell.exe"))
+      (setq ispell-program-name "hunspell")
       (setq ispell-dictionary "german,english")
       (setq ispell-local-dictionary-alist
             '(("german" "[[:alpha:]]" "[^[:alpha:]]" "[']" t ("-d" "de_DE_frami,de_AT_frami,de_CH_frami") nil utf-8)