diff --git a/.emacs.d/desktop.el b/.emacs.d/desktop.el
index 884eea0..c8e48b4 100644
--- a/.emacs.d/desktop.el
+++ b/.emacs.d/desktop.el
@@ -5,6 +5,15 @@
 (defun efs/exwm-init-hook ()
   ;; Make workspace 1 be the one where we land at startup
   (exwm-workspace-switch-create 1)
+  ;; if not wsl
+  (efs/run-in-background "xsetroot -cursor_name left_ptr &")
+  (efs/run-in-background "nm-applet &")
+  (efs/run-in-background "pamac-tray &")
+  ;;(efs/run-in-background "xfce4-power-manager &")
+  (efs/run-in-background "volumeicon &")
+  (efs/run-in-background "numlockx on &")
+  (efs/run-in-background "blueberry-tray &")
+  (efs/run-in-background "fcitx &")
 
   ;; Launch apps that will run in the background
   (efs/run-in-background "dwall -s firewatch")
@@ -89,10 +98,13 @@
           ([?\s-r] . exwm-reset)
 
           ;; Move between windows
-          ([?\s-h] . windmove-left)
-          ([?\s-l] . windmove-right)
-          ([?\s-k] . windmove-up)
-          ([?\s-j] . windmove-down)
+          ([s-left] . windmove-left)
+          ([s-right] . windmove-right)
+          ([s-up] . windmove-up)
+          ([s-down] . windmove-down)
+
+            ;;([s-space] . toggle-frame-fullscreen)
+		    ([?\s-f] . exwm-floating-toggle-floating)
 
           ;; Launch applications via shell command
           ([?\s-&] . (lambda (command)
diff --git a/.emacs.d/desktop.org b/.emacs.d/desktop.org
index 1fc00ff..c19ade6 100644
--- a/.emacs.d/desktop.org
+++ b/.emacs.d/desktop.org
@@ -14,18 +14,10 @@ DesktopNames=exwm
 
 #+begin_src shell
 #!/bin/sh
-# Set the screen DPI (uncomment this if needed!)
-# xrdb ~/.emacs.d/exwm/Xresources
-
-# Run the screen compositor
-#picom &
-#picom -b --config /home/jaeus/.config/i3/picom.conf &
-# Enable screen locking on suspend
-#xss-lock -- slock &
-
 # Fire it up for WSL
 VETHER_IP=$(/bin/grep nameserver /etc/resolv.conf 2> /dev/null | /bin/tr -s ' ' | /bin/cut -d' ' -f2)
 export DISPLAY=$VETHER_IP:10.0
+picom -b --config $HOME/.xmonad/scripts/picom.conf &
 exec dbus-launch --exit-with-session emacs -mm --debug-init -l ~/.emacs.d/desktop.el
 
 #+end_src
@@ -40,6 +32,15 @@ exec dbus-launch --exit-with-session emacs -mm --debug-init -l ~/.emacs.d/deskto
   (defun efs/exwm-init-hook ()
     ;; Make workspace 1 be the one where we land at startup
     (exwm-workspace-switch-create 1)
+    ;; if not wsl
+    (efs/run-in-background "xsetroot -cursor_name left_ptr &")
+    (efs/run-in-background "nm-applet &")
+    (efs/run-in-background "pamac-tray &")
+    ;;(efs/run-in-background "xfce4-power-manager &")
+    (efs/run-in-background "volumeicon &")
+    (efs/run-in-background "numlockx on &")
+    (efs/run-in-background "blueberry-tray &")
+    (efs/run-in-background "fcitx &")
 
     ;; Launch apps that will run in the background
     (efs/run-in-background "dwall -s firewatch")
@@ -83,8 +84,7 @@ exec dbus-launch --exit-with-session emacs -mm --debug-init -l ~/.emacs.d/deskto
     (setq exwm-workspace-number 10)
 
     ;; When window "class" updates, use it to set the buffer name
-    (add-hook 'exwm-(use-package package-name
-                      :ensure t)date-class-hook #'efs/exwm-update-class)
+    (add-hook 'exwm-update-class-hook #'efs/exwm-update-class)
 
     ;; When window title updates, use it to set the buffer name
     (add-hook 'exwm-update-title-hook #'efs/exwm-update-title)
@@ -125,10 +125,13 @@ exec dbus-launch --exit-with-session emacs -mm --debug-init -l ~/.emacs.d/deskto
             ([?\s-r] . exwm-reset)
 
             ;; Move between windows
-            ([?\s-h] . windmove-left)
-            ([?\s-l] . windmove-right)
-            ([?\s-k] . windmove-up)
-            ([?\s-j] . windmove-down)
+            ([s-left] . windmove-left)
+            ([s-right] . windmove-right)
+            ([s-up] . windmove-up)
+            ([s-down] . windmove-down)
+
+              ;;([s-space] . toggle-frame-fullscreen)
+		      ([?\s-f] . exwm-floating-toggle-floating)
 
             ;; Launch applications via shell command
             ([?\s-&] . (lambda (command)
diff --git a/.emacs.d/emacs.org b/.emacs.d/emacs.org
index 6272456..82588f8 100644
--- a/.emacs.d/emacs.org
+++ b/.emacs.d/emacs.org
@@ -415,6 +415,7 @@ https://nathantypanski.com/blog/2014-08-03-a-vim-like-emacs-config.html
     "t t" '(toggle-truncate-lines :which-key "Toggle truncate lines")
     ;; Shortcut
     "f d a" '(lambda () (interactive) (find-file (expand-file-name "~/Roam/Agenda")))
+    "f d d" '(lambda () (interactive) (find-file (expand-file-name "~/.emacs.d/desktop.org")) :which-key "open exwm config")
     "f d e" '(lambda () (interactive) (find-file (expand-file-name "~/.emacs.d/emacs.org")) :which-key "open emacs config"))
 #+end_src
 
diff --git a/.emacs.d/exwm/start-exwm.sh b/.emacs.d/exwm/start-exwm.sh
index 0064796..3566a6a 100755
--- a/.emacs.d/exwm/start-exwm.sh
+++ b/.emacs.d/exwm/start-exwm.sh
@@ -8,7 +8,7 @@
 # Enable screen locking on suspend
 #xss-lock -- slock &
 # Fire it up for WSL
-VETHER_IP=$(/bin/grep nameserver /etc/resolv.conf 2> /dev/null | /bin/tr -s ' ' | /bin/cut -d' ' -f2)
-export DISPLAY=$VETHER_IP:10.0
+#VETHER_IP=$(/bin/grep nameserver /etc/resolv.conf 2> /dev/null | /bin/tr -s ' ' | /bin/cut -d' ' -f2)
+#export DISPLAY=$VETHER_IP:10.0
 picom -b --config $HOME/.xmonad/scripts/picom.conf &
 exec dbus-launch --exit-with-session emacs -mm --debug-init -l ~/.emacs.d/desktop.el