diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 5733e58..aad537b 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -3,7 +3,7 @@ gtk-application-prefer-dark-theme=1
 gtk-cursor-theme-name=Oxygen 19 Pink Blossom
 gtk-key-theme-name=Emacs
 
-gtk-theme-name=Adwaita
+gtk-theme-name=Marwaita-s-Dark-Pink
 gtk-icon-theme-name=Adwaita
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-size=0
@@ -16,3 +16,4 @@ gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb
diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org
index e588f74..154a218 100644
--- a/.emacs.d/settings.org
+++ b/.emacs.d/settings.org
@@ -63,20 +63,6 @@
     (do-frame-config)
     (add-hook 'after-make-frame-functions 'disable-scroll-bars))
 #+END_SRC
-*** submlimity
-#+BEGIN_SRC emacs-lisp
-  (use-package sublimity
-    :ensure t
-    :straight '(sublimity
-                :type git
-                :host github
-                :repo "zk-phi/sublimity"))
-
-  (require 'sublimity-scroll)
-  ;;(require 'sublimity-map) ;; experimental
-  (require 'sublimity-attractive)
-
-  (sublimity-mode 1)
 #+END_SRC
 ** System path (macos)
 #+BEGIN_SRC emacs-lisp
@@ -107,7 +93,6 @@
   (use-package catppuccin-theme
     :ensure t)
   (require 'filenotify)
-
   (setq *theme-file* "~/theme")
   (defun set-system-theme ()
     (let ((theme
@@ -118,7 +103,7 @@
       (setq catppuccin-flavor (if (string-prefix-p "dark" theme) 'mocha 'latte))
       (if (not (eq catppuccin-flavor current-flavor))
         (catppuccin-reload))))
-
+  (setq catppuccin-flavor 'latte)
   (set-system-theme)
   (file-notify-add-watch *theme-file* '(change)
   			 #'(lambda (event) (set-system-theme)))
@@ -248,18 +233,6 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
   (use-package auto-complete :ensure t)
   (ac-config-default)
 #+END_SRC
-*** Copilot
-#+BEGIN_SRC emacs-lisp
-  (use-package copilot
-    :straight (:host github :repo "copilot-emacs/copilot.el" :files ("dist" "*.el"))
-    :ensure t
-    :config
-    (setq copilot-indent-offset-warning-disable t))
-  (define-key copilot-completion-map (kbd "C-c c") 'copilot-accept-completion)
-  (define-key copilot-completion-map (kbd "C-c c") 'copilot-accept-completion)
-  (add-hook 'prog-mode-hook 'copilot-mode)
-#+END_SRC
-
 ** Company mode
 #+BEGIN_SRC emacs-lisp
   (use-package company
diff --git a/.xinitrc b/.xinitrc
index 9f6c101..dc9362c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,27 +1,16 @@
-#!/bin/sh
+exec ~/.screenlayout/screenlayout.sh &
 
-export _JAVA_AWT_WM_NONREPARENTING=1
-export SBCL_HOME=/usr/lib/sbcl
-export _QWT_TOOLKT=MToolkit
-
-exec ~/.screenlayout/run.sh &
-
-exec wmname compiz &
-
-exec emacs-keys-everywhere &
-exec picom -b --vsync --backend glx &
-#exec xmodmap ~/.xmodmap &
-exec xinput set-prop 10 "Coordinate Transformation Matrix" 1.2 0 0 0 1.2 0 0 0 1.8 &
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
 
 exec xsetroot -cursor_name left_ptr &
-exec xset s off &
+exec xset s off & 
 exec xset b off &
 exec xset -dpms &
 
-exec feh --bg-fill --randomize ~/Wallpapers &
+exec picom -b &
 
-exec sleep 1s && dunst &
+exec dunst &
 
-exec systemd start --user display.target &
+exec feh --bg-fill --randomize ~/Wallpapers/light &
 
-/usr/local/bin/stumpwm
+while type dwm >/dev/null; do dwm 2>/tmp/dwm.log && continue || break ; done
diff --git a/Wallpapers/.DS_Store b/Wallpapers/.DS_Store
deleted file mode 100644
index e90dc67..0000000
Binary files a/Wallpapers/.DS_Store and /dev/null differ
diff --git a/scripts/machine-specific-zsh/sakomoto.zsh b/scripts/machine-specific-zsh/sakomoto.zsh
new file mode 100644
index 0000000..c106cda
--- /dev/null
+++ b/scripts/machine-specific-zsh/sakomoto.zsh
@@ -0,0 +1,9 @@
+eval "$(zoxide init --cmd z zsh)"
+
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+export GPG_TTY=$(tty)
+
+. /opt/asdf-vm/asdf.sh
+