diff --git a/.config/environment.d/cursor.conf b/.config/environment.d/cursor.conf
deleted file mode 100644
index 00c0539..0000000
--- a/.config/environment.d/cursor.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-XCURSOR_THEME="catppuccin-latte-peach-cursors"
-XCURSOR_SIZE=32
diff --git a/.config/sway/config.d/windows.conf b/.config/sway/config.d/windows.conf
index bd672ff..a801235 100644
--- a/.config/sway/config.d/windows.conf
+++ b/.config/sway/config.d/windows.conf
@@ -8,3 +8,5 @@ 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
+
+for_window [title="Pipewire Volume Control"] floating enable
diff --git a/.config/waybar/config b/.config/waybar/config
index e5ebc4f..8d56f3b 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -52,15 +52,6 @@
         "format-alt": "{icon}",
         "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
     },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
-        "format-muted": "",
-        "format-icons": {
-            "default": ["", "", " "]
-        },
-        "on-click": "pwvucontrol"
-    },
     "custom/power": {
         "format" : "⏻",
         "tooltip": false,
@@ -71,4 +62,13 @@
             "reboot": "systemctl reboot"
         }
     },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+            "default": ["", "", " "]
+        },
+        "on-click": "pwvucontrol"
+    },
 }
diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..d5d11f6
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,38 @@
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
+set -g mouse on
+
+# Faster escape sequences (better for Vim/Neovim)
+set -s escape-time 10
+
+# Increase scrollback buffer size
+set -g history-limit 50000
+
+# Better colors and terminal support
+set -g default-terminal "tmux-256color"
+set -ga terminal-overrides ",*256col*:Tc"
+
+# Status bar configuration
+set -g status-interval 60
+set -g status-position bottom
+set -g status-bg colour235
+set -g status-fg colour136
+set -g status-left-length 40
+set -g status-left "#[fg=green]Session: #S #[fg=yellow]#I #[fg=cyan]#P"
+set -g status-right "#[fg=cyan]%d %b %R"
+set -g status-justify centre
+
+# Window status
+setw -g window-status-current-style "fg=black,bg=red"
+setw -g window-status-current-format " #I:#W#F "
+setw -g window-status-style "fg=brightblue,bg=black"
+setw -g window-status-format " #I:#W#F "
+# Pane borders
+set -g pane-border-style "fg=colour238"
+set -g pane-active-border-style "fg=colour208"
+
+set -g @continuum-save-interval '5'
+set -g @continuum-restore 'on'
+
+run '/usr/share/tmux-plugin-manager/tpm'