diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el
index 0179bfbf..74bd1760 100644
--- a/bundle/bundle--defaults.el
+++ b/bundle/bundle--defaults.el
@@ -110,3 +110,12 @@
         (vertical-scroll-bars)))
 
 (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((meta)) ((control) . text-scale)))
+
+(require 'ido)
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(setq ido-create-new-buffer 'always)
+;(setq ido-file-extensions-order '(".org" ".lisp" ".py" ".txt" ".el" ".epub"))
+(ido-mode t)
+
+(fido-mode 1) ; replace icomplete mode
diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el
index bf346cdd..666dedcf 100644
--- a/bundle/bundle--gui.el
+++ b/bundle/bundle--gui.el
@@ -52,10 +52,14 @@
                         ("leo.org" . [simple-query "dict.leo.org" "https://dict.leo.org/german-english/" ""]))
                       webjump-sample-sites)))
 
-(use-package tab-bar
-    :ensure nil
-    :init (setq tab-bar-mode nil)
-    :custom
-    (tab-bar-format
-     '(tab-bar-format-history
-       tab-bar-format-tabs-groups)))
+(setq tab-bar-format
+      '(tab-bar-format-history
+        tab-bar-format-tabs-groups))
+(global-set-key (kbd "M-[") 'tab-bar-history-back)
+(global-set-key (kbd "M-]") 'tab-bar-history-forward)
+(tab-bar-mode 1)
+
+(setq tab-line-close-button-show nil)
+(setq tab-line-new-button-show nil)
+(setq tab-line-tabs-function 'tab-line-tabs-mode-buffers)
+(global-tab-line-mode 1)
diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index 468b220a..526c300d 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -569,13 +569,6 @@
 
 (use-package restclient)
 
-(require 'ido)
-(setq ido-enable-flex-matching t)
-(setq ido-everywhere t)
-(setq ido-create-new-buffer 'always)
-(setq ido-file-extensions-order '(".org" ".lisp" ".py" ".txt" ".el" ".epub"))
-(ido-mode t)
-
 (load "bundle--irc")
 (load "bundle--news")
 (load "bundle--email")
diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el
index 2348ef28..177eab20 100644
--- a/bundle/custom_gnu.el
+++ b/bundle/custom_gnu.el
@@ -47,8 +47,7 @@
  '(latex-run-command "xelatex")
  '(line-spacing nil)
  '(message-user-organization "")
- '(org-agenda-files
-   '("agenda/journal.org" "agenda/meetings.org" "agenda/tasks.org" "agenda/logbook.org" "agenda/appointments.org"))
+ '(org-agenda-files '("~/Documents/org/agenda/"))
  '(org-babel-python-command "python3")
  '(org-directory "~/Documents/org/")
  '(org-modules
@@ -63,9 +62,6 @@
  '(python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
  '(scroll-bar-mode nil)
  '(scroll-step 5)
- '(tab-bar-format
-   '(tab-bar-format-history tab-bar-format-tabs-groups tab-bar-separator tab-bar-format-add-tab tab-bar-format-align-right))
- '(tab-bar-mode nil)
  '(tetris-x-colors
    [[229 192 123]
     [97 175 239]