diff --git a/.bashrc b/.bashrc
index 7b33e35..f3f09cd 100644
--- a/.bashrc
+++ b/.bashrc
@@ -10,24 +10,9 @@ alias grep='grep --color=auto'
 alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 PS1='[\u@\h \W]\$ '
 
-# pnpm
-export PNPM_HOME="/home/pmcc/.local/share/pnpm"
-case ":$PATH:" in
-  *":$PNPM_HOME:"*) ;;
-  *) export PATH="$PNPM_HOME:$PATH" ;;
-esac
-# pnpm end
-
 eval "$(starship init bash)"
 
 export PATH=~/.npm-global/bin:~/.local/bin:$PATH
 export SSH_AUTH_SOCK=~/.1password/agent.sock
 
-if uwsm check may-start; then
-    exec uwsm start -- sway.desktop --unsupported-gpu
-fi
-
-#if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then
-#    exec sway
-#fi
-alias claude="/home/pmcc/.config/claude/local/claude"
+alias claude="/home/pmcc/.claude/local/claude"
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
deleted file mode 100644
index 1d09392..0000000
--- a/.config/alacritty/alacritty.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[font.normal]
-family = "JetBrainsMono Nerd Font"
-
-[general]
-import = [
-  "~/.config/alacritty/catppuccin-mocha.toml"
-]
diff --git a/.config/alacritty/catppuccin-mocha.toml b/.config/alacritty/catppuccin-mocha.toml
deleted file mode 100644
index 7762dcd..0000000
--- a/.config/alacritty/catppuccin-mocha.toml
+++ /dev/null
@@ -1,65 +0,0 @@
-[colors.primary]
-background = "#1e1e2e"
-foreground = "#cdd6f4"
-dim_foreground = "#7f849c"
-bright_foreground = "#cdd6f4"
-
-[colors.cursor]
-text = "#1e1e2e"
-cursor = "#f5e0dc"
-
-[colors.vi_mode_cursor]
-text = "#1e1e2e"
-cursor = "#b4befe"
-
-[colors.search.matches]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.search.focused_match]
-foreground = "#1e1e2e"
-background = "#a6e3a1"
-
-[colors.footer_bar]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.hints.start]
-foreground = "#1e1e2e"
-background = "#f9e2af"
-
-[colors.hints.end]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.selection]
-text = "#1e1e2e"
-background = "#f5e0dc"
-
-[colors.normal]
-black = "#45475a"
-red = "#f38ba8"
-green = "#a6e3a1"
-yellow = "#f9e2af"
-blue = "#89b4fa"
-magenta = "#f5c2e7"
-cyan = "#94e2d5"
-white = "#bac2de"
-
-[colors.bright]
-black = "#585b70"
-red = "#f38ba8"
-green = "#a6e3a1"
-yellow = "#f9e2af"
-blue = "#89b4fa"
-magenta = "#f5c2e7"
-cyan = "#94e2d5"
-white = "#a6adc8"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#fab387"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#f5e0dc"
diff --git a/.config/environment.d/cursor.conf b/.config/environment.d/cursor.conf
new file mode 100644
index 0000000..00c0539
--- /dev/null
+++ b/.config/environment.d/cursor.conf
@@ -0,0 +1,2 @@
+XCURSOR_THEME="catppuccin-latte-peach-cursors"
+XCURSOR_SIZE=32
diff --git a/.config/environment.d/proton.conf b/.config/environment.d/proton.conf
new file mode 100644
index 0000000..8839a06
--- /dev/null
+++ b/.config/environment.d/proton.conf
@@ -0,0 +1,2 @@
+PROTON_ENABLE_WAYLAND=1
+PROTON_USE_NTSYNC=1
diff --git a/.config/ghostty/config b/.config/ghostty/config
new file mode 100644
index 0000000..8deb8ec
--- /dev/null
+++ b/.config/ghostty/config
@@ -0,0 +1,47 @@
+# This is the configuration file for Ghostty.
+#
+# This template file has been automatically created at the following
+# path since Ghostty couldn't find any existing config files on your system:
+#
+#   /home/pmcc/.config/ghostty/config
+#
+# The template does not set any default options, since Ghostty ships
+# with sensible defaults for all options. Users should only need to set
+# options that they want to change from the default.
+#
+# Run `ghostty +show-config --default --docs` to view a list of
+# all available config options and their default values.
+#
+# Additionally, each config option is also explained in detail
+# on Ghostty's website, at https://ghostty.org/docs/config.
+
+# Config syntax crash course
+# ==========================
+# # The config file consists of simple key-value pairs,
+# # separated by equals signs.
+# font-family = Iosevka
+# window-padding-x = 2
+#
+# # Spacing around the equals sign does not matter.
+# # All of these are identical:
+# key=value
+# key= value
+# key =value
+# key = value
+#
+# # Any line beginning with a # is a comment. It's not possible to put
+# # a comment after a config option, since it would be interpreted as a
+# # part of the value. For example, this will have a value of "#123abc":
+# background = #123abc
+#
+# # Empty values are used to reset config keys to default.
+# key =
+#
+# # Some config options have unique syntaxes for their value,
+# # which is explained in the docs for that config option.
+# # Just for example:
+# resize-overlay-duration = 4s 200ms
+
+font-family = JetBrains Mono Nerd Font
+theme = catppuccin-mocha
+mouse-hide-while-typing = true
diff --git a/.config/sway/config b/.config/sway/config
index bb824f7..3dedbd6 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -14,7 +14,7 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term alacritty
+set $term ghostty
 # Your preferred application launcher
 set $menu rofi -show drun
 
@@ -146,8 +146,6 @@ bindsym $mod+r mode "resize"
 
 for_window [shell="xwayland"] title_format "[XWayland] %title"
 
-#xwayland disable
-
-#exec waybar
+seat * xcursor_theme catppuccin-latte-peach-cursors 32
 
 include ~/.config/sway/config.d/*
diff --git a/.config/sway/config.d/keybinds.conf b/.config/sway/config.d/keybinds.conf
index 26d8483..8c17a9c 100644
--- a/.config/sway/config.d/keybinds.conf
+++ b/.config/sway/config.d/keybinds.conf
@@ -46,4 +46,5 @@ bindsym --locked XF86MonBrightnessUp exec brightnessctl -e4 -n2 -d amdgpu_bl2 se
 bindsym --locked XF86MonBrightnessDown exec brightnessctl -e4 -n2 -d amdgpu_bl2 set 5%-
 
 ## Utils
-bindsym Print exec ~/.local/bin/snag -d ~/screenshots/
+bindsym Print exec bash -c 'file=$(~/.local/bin/snag -d ~/screenshots/) && wl-copy < $file'
+bindsym Print+Ctrl exec bash -c 'file=$(~/.local/bin/snag -r -d ~/screenshots/) && wl-copy < $file'
diff --git a/.config/sway/config.d/windows.conf b/.config/sway/config.d/windows.conf
index 0931278..bd672ff 100644
--- a/.config/sway/config.d/windows.conf
+++ b/.config/sway/config.d/windows.conf
@@ -3,3 +3,8 @@ for_window [shell="xwayland"] title_format "[XWayland] %title"
 assign [class="Unity"] workspace number 2
 for_window [title="Unity"] no_focus, move position 400 400
 for_window [title="Picture-in-Picture"] floating enable
+for_window [class="org.kde.haruna"] floating enable
+for_window [title=".*\.PopupWindow"] floating enable
+for_window [class="Unity" title="Project Settings"] floating enable
+for_window [class="Unity" title=".*\.AnnotationWindow"] floating enable
+for_window [class="Unity" title="Color"] floating enable
diff --git a/.config/waybar/config b/.config/waybar/config
index eb09031..258ef72 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -5,7 +5,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces"],
     "modules-center": ["pulseaudio", "clock"],
-    "modules-right": ["tray", "battery"],
+    "modules-right": ["tray", "memory", "battery"],
     "sway/workspaces": {
          "disable-scroll": true,
          "sort-by-name": true,
@@ -31,7 +31,7 @@
     "clock": {
         "timezone": "America/Montreal",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format": " {:%H:%M %d/%m/%y} "
+        "format": "🕐 {:%H:%M  📅 %d/%m/%y} "
     },
     "backlight": {
         "device": "intel_backlight",