diff --git a/executable_dot_zshrc b/executable_dot_zshrc
index 8744901..ef1ad82 100644
--- a/executable_dot_zshrc
+++ b/executable_dot_zshrc
@@ -7,9 +7,11 @@ checkCommand(){
   type "$1" >/dev/null 2>&1
 }
 # If you have zellij installed, this will auto start it
-if [ -z "$TMUX" ] && checkCommand tmux; then
-    exec tmux #new -As0 # uncomment this part if you want to auto attach to your last session
-fi
+#if [ -z "$ZELLIJ" ] && checkCommand zellij; then
+#    #export ZELLIJ_AUTO_ATTACH=true
+#    exec zellij
+#fi
+
 # Speed up shell load on WSL
 OLDPATH=$PATH
 PATH=$(echo "$PATH" | sed -e 's/\/mnt\/.*\?://g')
diff --git a/private_dot_config/dunst/dunstrc b/private_dot_config/dunst/dunstrc
index 1d48fd7..cd53a63 100644
--- a/private_dot_config/dunst/dunstrc
+++ b/private_dot_config/dunst/dunstrc
@@ -123,7 +123,7 @@
 
     ### Text ###
 
-    font = Atkinson Hyperlegible 8, Noto Color Emoji 8, FontAwesome 8 
+    font = Atkinson Hyperlegible 10, Noto Color Emoji 8, FontAwesome 8 
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/private_dot_config/i3/config b/private_dot_config/i3/config
index 76d772d..68d401f 100644
--- a/private_dot_config/i3/config
+++ b/private_dot_config/i3/config
@@ -10,82 +10,11 @@
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
 set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:monospace bold 9
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 9
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
+include "keybinds"
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# start a terminal
-#bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Return exec kitty 
-# kill focused window
-bindsym $mod+Shift+q kill
-
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-#bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
 set $ws1 "1"
@@ -109,233 +38,29 @@ set $ws27 "27"
 set $ws28 "28"
 set $ws29 "29"
 set $ws20 "20"
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
 
 
-bindsym $mod+Mod2+KP_1 workspace $ws21
-bindsym $mod+Mod2+KP_2 workspace $ws22
-bindsym $mod+Mod2+KP_3 workspace $ws23
-bindsym $mod+Mod2+KP_4 workspace $ws24
-bindsym $mod+Mod2+KP_5 workspace $ws25
-bindsym $mod+Mod2+KP_6 workspace $ws26
-bindsym $mod+Mod2+KP_7 workspace $ws27
-bindsym $mod+Mod2+KP_8 workspace $ws28
-bindsym $mod+Mod2+KP_9 workspace $ws29
-bindsym $mod+Mod2+KP_0 workspace $ws20
+include "xorg"
 
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-bindsym $mod+Shift+Mod2+KP_End move container to workspace $ws21
-bindsym $mod+Shift+Mod2+KP_Down move container to workspace $ws22
-bindsym $mod+Shift+Mod2+KP_Next move container to workspace $ws23
-bindsym $mod+Shift+Mod2+KP_Left move container to workspace $ws24
-bindsym $mod+Shift+Mod2+KP_Begin move container to workspace $ws25
-bindsym $mod+Shift+Mod2+KP_Right move container to workspace $ws26
-bindsym $mod+Shift+Mod2+KP_Home move container to workspace $ws27
-bindsym $mod+Shift+Mod2+KP_Up move container to workspace $ws28
-bindsym $mod+Shift+Mod2+KP_Prior move container to workspace $ws29
-bindsym $mod+Shift+Mod2+KP_Insert move container to workspace $ws20
-
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-
-
-bindsym $mod+space exec rofi -combi-modi "drun#run"  -show combi -icon-theme "Papirus" -show-icons -theme wal
-
-
-bindsym $mod+Tab exec rofi -show window -icon-theme "Adwaita" -show-icons -theme wal
-
-bindsym $mod+b exec xdg-open http://
-
-
-# Multi-screen screenshots with maim, TODO: save file as well
-bindsym --release Print exec maim -u | xclip -selection clipboard -t image/png # > "$HOME/Pictures/Screenshots/$(date +%s).png" 
-# OSX-like area selection screenshots
-bindsym --release Shift+Print exec maim -u -s | xclip -selection clipboard -t image/png # > "$HOME/Pictures/Screenshots/$(date +%s).png"
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
-
-#extra keys?
-#bindsym XF86AudioStop
-#bindsym XF86AudioMedia
-#bindsym XF86HomePage
-
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec light -A 5 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 5 # decrease screen brightness
-bindsym XF86Mail exec light -U 5
-bindsym XF86Calculator exec light -A 5
-# Touchpad controls
-bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
-
-# Media player controls
-#bindsym XF86AudioPlay exec playerctl play
-#$bindsym XF86AudioPause exec playerctl pause
-#bindsym XF86AudioNext exec playerctl next
-#bindsym XF86AudioPrev exec playerctl previous
-
-
-
-# Make the currently focused window a scratchpad
-bindsym $mod+Shift+minus move scratchpad
-
-# Show the first scratchpad window
-bindsym $mod+minus scratchpad show
-
-#background image
-exec_always --no-startup-id wal -R
-exec_always --no-startup-id feh --bg-fill "$(< ~/.cache/wal/wal)" --no-fehbg 
-exec_always --no-startup-id pywal-discord
-# I forget but probably important
-exec gnome-settings-daemon
-# fix audio
-exec alsactl restore
-# auto tiling
-
-set_from_resource $fg i3wm.color15 #134386
-set_from_resource $bg i3wm.color4 #e8ebfd
-set_from_resource $inactive i3wm.color0 #383c3e
-set_from_resource $urgent i3wm.color1 #9c0d38
-# class                 border    backgr.   text indicator child_border
-client.focused          $bg       $bg       $fg  $bg       $bg
-client.focused_inactive $inactive $inactive $fg  $bg       $bg
-client.unfocused        $inactive $inactive $fg  $bg       $bg
-client.urgent           $urgent   $urgent   $fg  $bg       $bg
-client.placeholder      $bg       $bg       $fg  $bg       $bg
-client.background       $bg
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-    status_command i3blocks -c /home/mira/.config/i3/i3blocks.conf
-    font pango:monospace, FontAwesome bold 9
-    #mode hide
-    colors {
-    background $inactive 
-    statusline $fg
-    separator  $fg
-
-    focused_workspace  $bg       $bg       $fg
-    active_workspace   $inactive $inactive $fg
-    inactive_workspace $inactive $inactive $fg
-    urgent_workspace   $urgent $urgent $fg
-    binding_mode       $urgent $urgent $fg
-
-  }        
-
-}
-#bar {
-#  colors {
-#    background #050E38
-#    statusline #E5E5F5
-#    separator  #666666
-#
-#    focused_workspace  #2F343A #2F343A #E5E5F5
-#    active_workspace   #7295CB #446EB7 #E5E5F5
-#    inactive_workspace #7295CB #446EB7 #E5E5F5
-#    urgent_workspace   #2F343A #9C0D38 #E5E5F5
-#    binding_mode       #2F343A #9C0D38 #E5E5F5
-#  }
-#}
-
-#KDE Stuff
-for_window [title="Desktop — Plasma"] kill; floating enable; border none
-
-# using plasma's logout screen instead of i3's
-#bindsym $mod+Shift+e exec --no-startup-id qdbus-qt5 org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout -1 -1 -1
-
-# Set Plasma dialogs and pop ups as floating so they won't get tiled
-for_window [window_role="pop-up"] floating enable
-for_window [window_role="task_dialog"] floating enable
-for_window [class="systemsettings"] floating enable
-for_window [class="plasmashell"] floating enable;
-for_window [class="Plasma"] floating enable; border none
-for_window [title="plasma-desktop"] floating enable; border none
-for_window [class="krunner"] floating enable; border none
-for_window [class="Kmix"] floating enable; border none
-for_window [class="Klipper"] floating enable; border none
-for_window [class="Plasmoidviewer"] floating enable; border none
-for_window [class="plasmashell" window_type="notification"] border none, move right 700px, move down 450px
-no_focus [class="plasmashell" window_type="notification"]
-
-#if no polkit, run gnome polkit (does this even work?)
-exec_always --no-startup-id /usr/lib/polkit-kde-authentication-agent-1 
 #compositor
-exec_always --no-startup-id picom -b
-#move to other monitor
-bindsym $mod+x move container to output right
-bindsym $mod+z move workspace to output right
-bindsym $mod+n move container to output down
-bindsym $mod+m move workspace to output down
-
-bindsym $mod+Shift+x move container to output left
-bindsym $mod+Shift+z move workspace to output left
-bindsym $mod+Shift+n move container to output up
-bindsym $mod+Shift+m move workspace to output up
+exec_always --no-startup-id picom --corner-radius 4 -i 0.99 -b
 
 #QT Themes?
 #exec sh 'export QT_QPA_PLATFORMTHEME=qt5ct'
 
 exec dunst &
-
+exec_always swhks & 
+exec_always pkexec swhkd
+exec nm-tray
+exec xsettingsd
 #border size
 default_border normal 1 
 #Set up monitors
-exec ~/.screenlayout/main.sh
-exec ~/tablet.sh
+# exec ~/.screenlayout/main.sh
+# exec ~/tablet.sh
+
+tiling_drag titlebar
+gaps inner 5 
+exec ~/.screenlayout/work-monitors.sh; xrandr --auto
+exec nm-applet
+include "theme"
diff --git a/private_dot_config/i3/i3blocks.conf b/private_dot_config/i3/i3blocks.conf
index 339da7f..aad7bc9 100644
--- a/private_dot_config/i3/i3blocks.conf
+++ b/private_dot_config/i3/i3blocks.conf
@@ -24,7 +24,7 @@
 #
 # The top properties below are applied to every block, but can be overridden.
 # Each block command defaults to the script name to avoid boilerplate.
-command=/home/mira/.config/i3/blocks/$BLOCK_NAME
+command=~/.config/i3/blocks/$BLOCK_NAME
 separator_block_width=15
 markup=none
 
@@ -160,4 +160,4 @@ interval=1
 #[keyindicator]
 #instance=NUM
 #interval=once
-#signal=11
\ No newline at end of file
+#signal=11
diff --git a/private_dot_config/i3/keybinds b/private_dot_config/i3/keybinds
new file mode 100644
index 0000000..f4d11f6
--- /dev/null
+++ b/private_dot_config/i3/keybinds
@@ -0,0 +1,151 @@
+
+# start a terminal
+bindsym $mod+Shift+Return exec alacritty 
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+#bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+bindsym $mod+d focus child
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+
+bindsym $mod+Mod2+KP_1 workspace $ws21
+bindsym $mod+Mod2+KP_2 workspace $ws22
+bindsym $mod+Mod2+KP_3 workspace $ws23
+bindsym $mod+Mod2+KP_4 workspace $ws24
+bindsym $mod+Mod2+KP_5 workspace $ws25
+bindsym $mod+Mod2+KP_6 workspace $ws26
+bindsym $mod+Mod2+KP_7 workspace $ws27
+bindsym $mod+Mod2+KP_8 workspace $ws28
+bindsym $mod+Mod2+KP_9 workspace $ws29
+bindsym $mod+Mod2+KP_0 workspace $ws20
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
+
+bindsym $mod+Shift+Mod2+KP_End move container to workspace $ws21
+bindsym $mod+Shift+Mod2+KP_Down move container to workspace $ws22
+bindsym $mod+Shift+Mod2+KP_Next move container to workspace $ws23
+bindsym $mod+Shift+Mod2+KP_Left move container to workspace $ws24
+bindsym $mod+Shift+Mod2+KP_Begin move container to workspace $ws25
+bindsym $mod+Shift+Mod2+KP_Right move container to workspace $ws26
+bindsym $mod+Shift+Mod2+KP_Home move container to workspace $ws27
+bindsym $mod+Shift+Mod2+KP_Up move container to workspace $ws28
+bindsym $mod+Shift+Mod2+KP_Prior move container to workspace $ws29
+bindsym $mod+Shift+Mod2+KP_Insert move container to workspace $ws20
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Make the currently focused window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
+#move to other monitor
+bindsym $mod+x move container to output right
+bindsym $mod+z move workspace to output right
+bindsym $mod+n move container to output down
+bindsym $mod+m move workspace to output down
+
+bindsym $mod+Shift+x move container to output left
+bindsym $mod+Shift+z move workspace to output left
+bindsym $mod+Shift+n move container to output up
+bindsym $mod+Shift+m move workspace to output up
+
diff --git a/private_dot_config/i3/theme b/private_dot_config/i3/theme
new file mode 100644
index 0000000..bdac7a4
--- /dev/null
+++ b/private_dot_config/i3/theme
@@ -0,0 +1,33 @@
+# Colors
+set $fg #EBF6FF
+set $bg #504573
+set $inactive #1E1B30
+set $urgent #A04558
+# class                 border    backgr.   text indicator child_border
+client.focused          $bg       $bg       $fg  $bg       $bg
+client.focused_inactive $inactive $inactive $fg  $bg       $bg
+client.unfocused        $inactive $inactive $fg  $bg       $bg
+client.urgent           $urgent   $urgent   $fg  $bg       $bg
+client.placeholder      $bg       $bg       $fg  $bg       $bg
+client.background       $bg
+
+font pango:Atkinson Hyperlegible bold 9
+
+bar {
+  status_command i3blocks -c ~/.config/sway/i3blocks.conf
+    font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9
+#mode hide
+    colors {
+      background $inactive 
+        statusline $fg
+        separator  $fg
+
+        focused_workspace  $bg       $bg       $fg
+        active_workspace   $inactive $inactive $fg
+        inactive_workspace $inactive $inactive $fg
+        urgent_workspace   $urgent $urgent $fg
+        binding_mode       $urgent $urgent $fg
+
+    }        
+
+}
diff --git a/private_dot_config/i3/xorg b/private_dot_config/i3/xorg
new file mode 100644
index 0000000..8a41dbb
--- /dev/null
+++ b/private_dot_config/i3/xorg
@@ -0,0 +1,38 @@
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+
+# Pulse Audio controls
+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+
+#extra keys?
+#bindsym XF86AudioStop
+#bindsym XF86AudioMedia
+#bindsym XF86HomePage
+
+# Sreen brightness controls
+# if requires sudo, run chmod +s $(which light)
+bindsym XF86MonBrightnessUp exec brightnessctl -e s 5%+ # increase screen brightness
+bindsym XF86MonBrightnessDown exec brightnessctl -e s 5%- # decrease screen brightness#bindsym XF86Mail exec light -U 5
+#bindsym XF86Calculator exec light -A 5
+
+# Media player controls
+bindsym XF86AudioPlay exec playerctl play
+bindsym XF86AudioPause exec playerctl pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+
+#background image
+exec_always --no-startup-id feh --bg-fill "00 Setup/wallpaper.png" --no-fehbg 
+# I forget but probably important
+# exec gnome-settings-daemon
+# fix audio
+# exec alsactl restore
+
+#if no polkit, run gnome polkit (does this even work?)
+# exec_always --no-startup-id /usr/lib/polkit-kde-authentication-agent-1 
+
+# Touchpad settings
+exec_always xinput set-prop "SYNA8017:00 06CB:CEB2 Touchpad" "libinput Natural Scrolling Enabled" 1
+exec_always xinput set-prop "SYNA8017:00 06CB:CEB2 Touchpad" "libinput Enabled" 1
diff --git a/private_dot_config/sheldon/plugins.toml b/private_dot_config/sheldon/plugins.toml
index 99836fa..0d336d3 100644
--- a/private_dot_config/sheldon/plugins.toml
+++ b/private_dot_config/sheldon/plugins.toml
@@ -42,9 +42,9 @@ apply = ["defer-more"]
 github = 'Aloxaf/fzf-tab'
 apply = ["defer"]
 
-[plugins.zsh-cargo-completion]
-github = 'MenkeTechnologies/zsh-cargo-completion'
-apply = ["defer"]
+# [plugins.zsh-cargo-completion]
+# github = 'MenkeTechnologies/zsh-cargo-completion'
+# apply = ["defer"]
 
 [plugins.click-completion]
 github = 'click-contrib/click-completion'
diff --git a/private_dot_config/sway/external_blocks b/private_dot_config/sway/external_blocks
deleted file mode 160000
index fc2c105..0000000
--- a/private_dot_config/sway/external_blocks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc2c10551c32558be44226c6924d64bae611e32c
diff --git a/private_dot_config/sway/i3blocks.conf b/private_dot_config/sway/i3blocks.conf
index 31c4cf0..25ebd28 100644
--- a/private_dot_config/sway/i3blocks.conf
+++ b/private_dot_config/sway/i3blocks.conf
@@ -24,7 +24,7 @@
 #
 # The top properties below are applied to every block, but can be overridden.
 # Each block command defaults to the script name to avoid boilerplate.
-command=/home/mira/.config/sway/blocks/$BLOCK_NAME/$BLOCK_NAME
+command=~/.config/sway/blocks/$BLOCK_NAME/$BLOCK_NAME
 separator_block_width=15
 markup=none
 
diff --git a/private_dot_config/sway/theme b/private_dot_config/sway/theme
index 1add5a7..bdac7a4 100644
--- a/private_dot_config/sway/theme
+++ b/private_dot_config/sway/theme
@@ -14,7 +14,7 @@ client.background       $bg
 font pango:Atkinson Hyperlegible bold 9
 
 bar {
-  status_command i3blocks -c /home/mira/.config/sway/i3blocks.conf
+  status_command i3blocks -c ~/.config/sway/i3blocks.conf
     font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9
 #mode hide
     colors {
diff --git a/private_dot_config/sway/wayland b/private_dot_config/sway/wayland
index 3e129a4..68166eb 100644
--- a/private_dot_config/sway/wayland
+++ b/private_dot_config/sway/wayland
@@ -1,13 +1,10 @@
 # Sway specific config
 # Logout 
-bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit Sway?' -B 'Yes, exit Sway' 'swaymsg exit'"
-
-# TODO
-# bindsym $mod+space exec wofi --show drun
+# bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit Sway?' -B 'Yes, exit Sway' 'swaymsg exit'"
 
 # screenshots 
-bindsym --release Print exec grimshot --notify copy
-bindsym --release Shift+Print exec grimshot --notify copy anything 
+# bindsym --release Print exec grimshot --notify copy
+# bindsym --release Shift+Print exec grimshot --notify copy anything 
 
 # Touchpad controls
 input "2362:628:PIXA3854:00_093A:0274_Touchpad" {
@@ -16,7 +13,7 @@ input "2362:628:PIXA3854:00_093A:0274_Touchpad" {
 }
 
 #Set up monitors
-output eDP-1 res 2256x1504 scale 1.00
+# output eDP-1 res 2256x1504 scale 1.00
 
 #Wallpaper
 output * bg ~/00 Setup/wallpaper.png fill
diff --git a/private_dot_config/swhkd/executable_hotkeys.sh b/private_dot_config/swhkd/executable_hotkeys.sh
index 105e935..1a4133e 100644
--- a/private_dot_config/swhkd/executable_hotkeys.sh
+++ b/private_dot_config/swhkd/executable_hotkeys.sh
@@ -2,4 +2,4 @@
 
 killall swhks
 SWHKDRC="${XDG_CONFIG_HOME:-$HOME/.config}/swhkd/swhkdrc"
-pkexec swhkd -d -c $SWHKDRC
+swhks & pkexec swhkd -d -c $SWHKDRC
diff --git a/private_dot_config/swhkd/swhkdrc b/private_dot_config/swhkd/swhkdrc
index 726b2a5..35b1787 100644
--- a/private_dot_config/swhkd/swhkdrc
+++ b/private_dot_config/swhkd/swhkdrc
@@ -20,6 +20,7 @@ XF86AudioPrev
     playerctl previous
 
 # Sreen brightness controls
+#sudo chmod +s $(which brightnessctl)
 XF86MonBrightnessUp
     brightnessctl -e s 5%+
 XF86MonBrightnessDown
@@ -40,15 +41,20 @@ super + tab
   rofi -show window -show-icons -theme lunar-witch
 
 print
-  flameshot full -r -p "/home/mira/Pictures/screenshots/" | wl-copy
+  flameshot full -r -p "$HOME/Pictures/screenshots/" | cb copy
 
 shift + print
-  flameshot gui -s -r -p "/home/mira/Pictures/screenshots/" | wl-copy
+  flameshot gui -s -r -p "$HOME/Pictures/screenshots/" | cb copy 
 
 
 ctrl + print
-  flameshot gui -r -p "/home/mira/Pictures/screenshots/" | wl-copy
+  flameshot gui -r -p "$HOME/Pictures/screenshots/" | cb copy 
 
 
+#super + shift + v
+#  cliphist list | rofi -dmenu  -p "Select item to copy" -lines 10 -width 35 -theme lunar-witch | cliphist decode | wl-copy  
 super + shift + v
-  cliphist list | rofi -dmenu  -p "Select item to copy" -lines 10 -width 35 -theme lunar-witch | cliphist decode | wl-copy  
+  cb hs $(cb hs | jq '.[] | .content.path? // .content' | rofi -dmenu -format i -theme lunar-witch)
+
+super + shift + .
+  rofi -show emoji -modi emoji -theme lunar-witch | cb