diff --git a/.emacs b/.config/emacs/init.el
similarity index 59%
rename from .emacs
rename to .config/emacs/init.el
index 8f03e41..d461dbf 100644
--- a/.emacs
+++ b/.config/emacs/init.el
@@ -1,5 +1,3 @@
-(require 'sudo-edit)
-(require 'xterm-color)
 (require 'package)
 (add-to-list 'package-archives
  '("melpa" . "https://melpa.org/packages/") t)
@@ -10,12 +8,13 @@
  '(custom-enabled-themes '(nyan))
  '(custom-safe-themes
    '("f3d88904f7c4a25cd6d0fad6cf1f5da9045a83a056f97540127fc7f8c26f8caf" default))
- '(custom-theme-directory "~/.emacs.d/themes")
- '(fringe-mode 0 nil (fringe))
- '(initial-scratch-message nil)
- '(package-selected-packages '(sudo-edit xterm-color vterm org multi-vterm))
- '(scroll-bar-mode 'left)
+ '(custom-theme-directory "~/.config/emacs/themes")
+ '(package-selected-packages '(ampc multi-vterm sudo-edit vterm org))
+ '(tab-bar-mode t)
+ '(tab-bar-show t)
  '(use-file-dialog nil))
 (custom-set-faces
  '(default ((t (:family "lucy tewi" :foundry "lucy" :slant normal :weight normal :height 83 :width normal))))
- '(fringe ((t nil))))
+ '(fringe ((t nil)))
+ '(tab-bar-tab ((t (:inherit tab-bar :box (:line-width 1 :style released-button)))))
+ '(tab-bar-tab-inactive ((t (:inherit tab-bar-tab :background "grey75")))))
diff --git a/.emacs.d/themes/nyan-theme.el b/.config/emacs/themes/nyan-theme.el
similarity index 100%
rename from .emacs.d/themes/nyan-theme.el
rename to .config/emacs/themes/nyan-theme.el
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
new file mode 100644
index 0000000..906609f
--- /dev/null
+++ b/.config/user-dirs.dirs
@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/desk"
+XDG_DOWNLOAD_DIR="$HOME/dls"
+XDG_TEMPLATES_DIR="$HOME/temp"
+XDG_PUBLICSHARE_DIR="$HOME/pub"
+XDG_DOCUMENTS_DIR="$HOME/docs"
+XDG_MUSIC_DIR="$HOME/music"
+XDG_PICTURES_DIR="$HOME/pics"
+XDG_VIDEOS_DIR="$HOME/vids"