diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.conf
deleted file mode 100644
index 0525fe5..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-###############
-### THEME ###
-###############
-
-source = ~/.config/hypr/hyprland.d/00-theme.conf
-
-################
-### MONITORS ###
-################
-
-source = ~/.config/hypr/hyprland.d/10-monitors.conf
-source = ~/.config/hypr/hyprland.d/20-workspaces.conf
-
-############################
-### LAYOUT AND BEHAVIOR ###
-############################
-
-source = ~/.config/hypr/hyprland.d/30-general.conf
-source = ~/.config/hypr/hyprland.d/40-input.conf
-source = ~/.config/hypr/hyprland.d/50-layout.conf
-source = ~/.config/hypr/hyprland.d/60-rules.conf
-
-###################
-### KEYBINDINGS ###
-###################
-
-source = ~/.config/hypr/hyprland.d/70-keybinds.conf
-
-#################
-### AUTOSTART ###
-#################
-
-source = ~/.config/hypr/hyprland.d/80-autostart.conf
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/00-theme.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/00-theme.conf.tmpl
deleted file mode 100644
index 7efeb52..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/00-theme.conf.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-source = ~/.config/hypr/hyprland.d/theme-{{ .chezmoi.config.data.theme }}.conf
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/10-monitors.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/10-monitors.conf.tmpl
deleted file mode 100644
index d28c65b..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/10-monitors.conf.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{- range .monitors }}
-monitorv2 {
-  output = {{ .name }}
-  mode = {{ .width }}x{{ .height }}@{{ .refresh_rate }}
-  position = {{ .position }}
-  scale = {{ .scale }}
-  {{- if hasKey . "vrr" }}
-  vrr = {{ .vrr }}
-  {{- end }}
-  {{- if hasKey . "transform" }}
-  transform = {{ .transform }}
-  {{- end }}
-  {{- if hasKey . "bitdepth" }}
-  bitdepth = {{ .bitdepth }}
-  {{- end }}
-  {{- if hasKey . "cm" }}
-  cm = {{ .cm }}
-  {{- end }}
-  {{- if hasKey . "supports_hdr" }}
-  supports_hdr = {{ .supports_hdr }}
-  {{- end }}
-  {{- if hasKey . "sdrbrightness" }}
-  sdrbrightness = {{ .sdrbrightness }}
-  {{- end }}
-  {{- if hasKey . "sdrsaturation" }}
-  sdrsaturation = {{ .sdrsaturation }}
-  {{- end }}
-  {{- if hasKey . "max_luminance" }}
-  max_luminance = {{ .max_luminance }}
-  {{- end }}
-}
-{{- end }}
-{{- if not .monitors }}
-monitor = , preferred, auto, 1
-{{- end }}
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/20-workspaces.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/20-workspaces.conf.tmpl
deleted file mode 100644
index 0cf4c59..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/20-workspaces.conf.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- $tags := .chezmoi.config.data.tags -}}
-## ========== Special Workspaces ==========
-workspace = special:passwordmgr, on-created-empty:uwsm app -- bitwarden-desktop
-
-## ========== Named Workspaces (IDs 1-6, sorted before numbered) ==========
-workspace = 1, defaultName:mail
-workspace = 2, defaultName:comms, monitor:DP-2, layout:scrolling, layoutopt:direction:down
-workspace = 3, defaultName:element, monitor:DP-2, layout:scrolling, layoutopt:direction:down
-workspace = 4, defaultName:joplin
-{{- if index $tags "cs2" }}
-workspace = 5, defaultName:steam, layout:scrolling
-{{- end }}
-{{- if index $tags "entertainment" }}
-workspace = 6, defaultName:spotify, monitor:DP-2, layout:monocle, on-created-empty:uwsm app -- spotify-launcher
-{{- end }}
-
-## ========== Monitor Workspaces ==========
-{{- range $monitor := .monitors }}
-  {{- range $index, $ws := $monitor.workspaces }}
-    {{- if kindIs "map" $ws }}
-workspace = {{ $ws.id }}, monitor:{{ $monitor.name }}{{ if eq $index 0 }}, default:true{{ end }}{{ if index $ws "name" }}, defaultName:{{ $ws.name }}{{ end }}{{ if index $ws "layout" }}, layout:{{ $ws.layout }}{{ end }}{{ range index $ws "layoutopts" }}, layoutopt:{{ . }}{{ end }}
-    {{- else }}
-workspace = {{ $ws }}, monitor:{{ $monitor.name }}{{ if eq $index 0 }}, default:true{{ end }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/30-general.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/30-general.conf
deleted file mode 100644
index 0845ca4..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/30-general.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-# Refer to https://wiki.hyprland.org/Configuring/Variables/
-
-# https://wiki.hyprland.org/Configuring/Variables/#general
-general {
-    gaps_in = 5
-    gaps_out = 5,5,5,5
-
-    border_size = 2
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    col.active_border = $border_active
-    col.inactive_border = $border_inactive
-    col.nogroup_border = $border_nogroup_inactive
-    col.nogroup_border_active = $border_nogroup_active
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false
-
-    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = master
-}
-
-render {
-    new_render_scheduling = true
-}
-
-cursor {
-    hide_on_key_press = true      # Hide cursor when typing
-    persistent_warps = true       # Cursor returns to last position in window
-    warp_on_change_workspace = true  # Move cursor to focused window on workspace switch
-
-    inactive_timeout = 0
-    zoom_factor = 1.0
-    zoom_rigid = false
-    enable_hyprcursor = true
-    sync_gsettings_theme = true
-
-    no_hardware_cursors = true
-}
-
-
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
-decoration {
-    rounding = 5
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    # Dim inactive windows
-    dim_modal = true
-    dim_inactive = true
-    dim_strength = 0.1
-
-    shadow {
-        enabled = false
-        range = 4
-        render_power = 3
-        color = $dec_shadow
-    }
-
-    # https://wiki.hyprland.org/Configuring/Variables/#blur
-    blur {
-        enabled = true
-        size = 3
-        passes = 1
-
-        vibrancy = 0.1696
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = easeOutQuint,0.23,1,0.32,1
-    bezier = easeInOutCubic,0.65,0.05,0.36,1
-    bezier = linear,0,0,1,1
-    bezier = almostLinear,0.5,0.5,0.75,1.0
-    bezier = quick,0.15,0,0.1,1
-
-    animation = global, 1, 10, default
-    animation = border, 1, 5.39, easeOutQuint
-    animation = windows, 1, 4.79, easeOutQuint
-    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
-    animation = windowsOut, 1, 1.49, linear, popin 87%
-    animation = fadeIn, 1, 1.73, almostLinear
-    animation = fadeOut, 1, 1.46, almostLinear
-    animation = fade, 1, 3.03, quick
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = layersIn, 1, 4, easeOutQuint, fade
-    animation = layersOut, 1, 1.5, linear, fade
-    animation = fadeLayersIn, 1, 1.79, almostLinear
-    animation = fadeLayersOut, 1, 1.39, almostLinear
-    animation = workspaces, 1, 1.94, almostLinear, fade
-    animation = workspacesIn, 1, 1.21, almostLinear, fade
-    animation = workspacesOut, 1, 1.94, almostLinear, fade
-    animation = specialWorkspace, 1, 1.5, easeOutQuint, slidevert
-}
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/40-input.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/40-input.conf.tmpl
deleted file mode 100644
index ab6ff2f..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/40-input.conf.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- $tags := .chezmoi.config.data.tags -}}
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = ultimatekeys
-    kb_options = caps:escape_shifted_capslock
-    numlock_by_default = true
-    repeat_rate = 25
-    repeat_delay = 600
-    follow_mouse = 1
-    mouse_refocus = true
-    float_switch_override_focus = 2
-    special_fallthrough = true
-    touchpad {
-        disable_while_typing = true
-        scroll_factor = 1.0
-        tap-to-click = true
-    }
-}
-
-{{- if (index $tags "desktop") }}
-device {
-    name = "Logitech Gaming Mouse G502"
-    sensitivity = 0.0
-    accel_profile = flat
-}
-{{- end }}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-#device {
-#    name = epic-mouse-v1
-#    sensitivity = -0.5
-#}
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/50-layout.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/50-layout.conf
deleted file mode 100644
index 358f507..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/50-layout.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-master {
-    orientation = left
-    # center_master_fallback = left
-    # slave_count_for_center_master = 4
-    mfact = 0.60
-    new_status = slave
-    new_on_top = true
-    new_on_active = after
-
-    allow_small_split = true
-    special_scale_factor = 0.8
-    drop_at_cursor = true
-}
-
-scrolling {
-    fullscreen_on_one_column = true
-    focus_fit_method = 0
-    follow_focus = true
-    follow_min_visible = 0.1
-    column_width = 0.7
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc {
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-    vrr = 2
-    vfr = true
-    mouse_move_enables_dpms = true
-    key_press_enables_dpms = true
-    layers_hog_keyboard_focus = true
-    mouse_move_focuses_monitor = true
-    col.splash = $splash_text
-}
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/60-rules.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/60-rules.conf.tmpl
deleted file mode 100644
index c2b4c3e..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/60-rules.conf.tmpl
+++ /dev/null
@@ -1,134 +0,0 @@
-{{- $tags := .chezmoi.config.data.tags -}}
-# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
-# "Smart gaps" / "No gaps when only"
-# uncomment all if you wish to use that.
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrule = match:float 0, match:workspace w[tv1], border_size 0
-# windowrule = match:float 0, match:workspace w[tv1], rounding 0
-# windowrule = match:float 0, match:workspace f[1], border_size 0
-# windowrule = match:float 0, match:workspace f[1], rounding 0
-
-##############
-### GROUPS ###
-##############
-
-group {
-  auto_group = true
-  insert_after_current = true
-  focus_removed_window = true
-  drag_into_group = 1
-  merge_groups_on_drag = true
-  merge_groups_on_groupbar = true
-  merge_floated_into_tiled_on_groupbar = true
-  group_on_movetoworkspace = false
-  col.border_active = $border_group_active
-  col.border_inactive = $border_group_inactive
-  col.border_locked_active = $border_grouplocked_active
-  col.border_locked_inactive = $border_grouplocked_active
-
-  groupbar{
-    enabled = true
-    height = 12
-    font_family = GeistMono Nerd Font
-    font_size = 8
-    font_weight_active = semibold
-    font_weight_inactive = normal
-    stacked = false
-    gradients = true
-    gradient_rounding = 5
-    indicator_height = 0
-    rounding = 0
-    gradient_round_only_edges = true
-    text_color = $groupbar_text
-    col.active = $groupbar_active
-    col.inactive = $groupbar_inactive
-    col.locked_active = $groupbar_grouplocked_active
-    col.locked_inactive = $groupbar_grouplocked_inactive
-    gaps_out = 0
-    gaps_in = 0
-
-    render_titles = true
-    scrolling = true
-    priority = 3
-  }
-}
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-
-# Example modern windowrule
-# windowrule = match:class ^(kitty)$, match:title ^(kitty)$, float on
-
-# Ignore maximize requests from apps. You'll probably like this.
-windowrule = match:class .*, suppress_event maximize
-
-# Fix some dragging issues with XWayland
-windowrule = match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on
-windowrule = match:xwayland 1, no_initial_focus on
-
-#windowrule = float, class:org.keepassxc.KeePassXC
-#windowrule = noscreenshare, class:org.keepassxc.KeePassXC
-#windowrule = size 60% 60%, class:org.keepassxc.KeePassXC
-#windowrule = center, class:org.keepassxc.KeePassXC
-
-## ========== Communication ==========
-# Comms
-windowrule = match:class ^(info\.mumble\.Mumble|discord|vesktop|teamspeak-client|TeamSpeak|TeamSpeak 3|teamspeak3)$, workspace 2
-# Element
-windowrule = match:class ^(Element)$, workspace 3
-
-## ========== Mail ==========
-windowrule = match:class ^(org\.mozilla\.Thunderbird)$, workspace 1
-
-## ========== Notes ==========
-windowrule = match:class ^(@joplin/app-desktop)$, workspace 4
-{{- if index $tags "entertainment" }}
-
-## ========== Multimedia ==========
-windowrule = match:class Spotify, workspace 6
-{{- end }}
-
-### ========== Development ==========
-#windowrule = match:class jetbrains-webstorm, match:title Welcome to WebStorm, float on
-#windowrule = match:class jetbrains-webstorm, match:title Welcome to WebStorm, size 1080 720
-{{- if index $tags "cs2" }}
-
-## ========== Gaming ==========
-# Steam
-windowrule = match:class ^(steam)$, workspace 5
-{{- end }}
-
-## ========== System ==========
-windowrule = match:class com.saivert.pwvucontrol, float on
-
-windowrule = match:class scrrec, float on
-windowrule = match:class scrrec, pin on
-windowrule = match:class scrrec, idle_inhibit always
-windowrule = match:class scrrec, rounding 10
-windowrule = match:class scrrec, opacity 0.6
-windowrule = match:class scrrec, border_size 0
-windowrule = match:class scrrec, size 300 100
-windowrule = match:class scrrec, move 1% 1%
-windowrule = match:class scrrec, monitor 0
-windowrule = match:class scrrec, no_initial_focus on
-
-windowrule = match:class com.gabm.satty, float on
-windowrule = match:class com.gabm.satty, min_size 700 400
-
-# Blur swaync
-#layerrule = blur on, match:namespace swaync-control-center
-#layerrule = blur on, match:namespace swaync-notification-window
-#layerrule = ignore_alpha 0, match:namespace swaync-control-center
-#layerrule = ignore_alpha 0, match:namespace swaync-notification-window
-
-# Quickshell
-layerrule = blur on, match:namespace quickshell:.*
-layerrule = ignore_alpha 0.79, match:namespace quickshell:.*
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/70-keybinds.conf.tmpl b/dot_config/hypr/hyprland.conf.bak/hyprland.d/70-keybinds.conf.tmpl
deleted file mode 100644
index 9dfa6b0..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/70-keybinds.conf.tmpl
+++ /dev/null
@@ -1,249 +0,0 @@
-##############################################
-################## MY APPS ###################
-##############################################
-
-# Set programs that you use
-$terminal = uwsm app -- kitty
-$term_tmux = uwsm app -- kitty -e tmux
-$term_tmux_append = uwsm app -- kitty -e tmux a
-$editor = uwsm app -- kitty -e nvim
-$alteditor = uwsm app -- zeditor
-
-$filemanager = uwsm app -- nautilus
-$launcher = uwsm app -- owlry -p app,cmd,system,ssh
-$clipman = uwsm app -- owlry -m clipboard
-
-$browser = uwsm app -- firefox
-$browserprv = uwsm app -- firefox --private-window
-$browsernewinst = uwsm app -- firefox --new-instance
-$altbrowser = uwsm app -- chromium
-
-$taskman = uwsm app -- owlry -m uuctl
-$pwdmgr = uwsm app -- bitwarden-desktop
-$soundctl = uwsm app -- pwvucontrol
-
-$notcenter = uwsm app -- swaync-client -t -sw
-$notdnd = uwsm app -- swaync-client -d
-$nothide = uwsm app -- swaync-client --hide-latest
-$notclose = uwsm app -- swaync-client --close-latest
-$notcloseall = uwsm app -- swaync-client --close-all
-
-$lockcmd = swaylock -f
-$powermenu = owlry-power-menu
-
-##############################################
-################## KEYBINDS ##################
-##############################################
-
-$mainMod = SUPER
-
-# First-class launchers
-bind = $mainMod, Return, exec, $terminal
-bind = $mainMod SHIFT, Return, exec, $term_tmux
-bind = $mainMod CTRL, Return, exec, $term_tmux_append
-bind = $mainMod, F1, exec, hypr-show-binds
-bind = $mainMod, E, exec, $filemanager
-bind = $mainMod, W, exec, $browser
-bind = $mainMod, Space, exec, $launcher
-
-# Secondary app launchers
-bind = $mainMod SHIFT, E, exec, $editor
-bind = $mainMod CTRL, E, exec, $alteditor
-bind = $mainMod SHIFT, W, exec, $browserprv
-bind = $mainMod CTRL, W, exec, $altbrowser
-bind = $mainMod ALT, W, exec, $browsernewinst
-bind = $mainMod, X, exec, $taskman
-bind = $mainMod, C, exec, $clipman
-bind = $mainMod, F4, exec, $soundctl
-bind = $mainMod, A, submap, quickws
-
-submap = quickws
-bind = , z, exec, hyprctl dispatch workspace 1 && hyprctl dispatch submap reset
-bind = , d, exec, hyprctl dispatch workspace 2 && hyprctl dispatch submap reset
-bind = , a, exec, hyprctl dispatch workspace 3 && hyprctl dispatch submap reset
-bind = , x, exec, hyprctl dispatch workspace 4 && hyprctl dispatch submap reset
-bind = , s, exec, hyprctl dispatch workspace 5 && hyprctl dispatch submap reset
-bind = , c, exec, hyprctl dispatch workspace 6 && hyprctl dispatch submap reset
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-submap = reset
-
-# Notifications
-bind = $mainMod, Grave, exec, $notcenter
-bind = $mainMod SHIFT, Grave, exec, $notdnd
-bind = $mainMod CTRL, Grave, exec, $nothide
-
-# Session
-bind = $mainMod, Pause, exec, $lockcmd
-bind = $mainMod SHIFT, Pause, exec, $powermenu
-bind = $mainMod, End, exec, $lockcmd
-bind = $mainMod SHIFT, End, exec, $powermenu
-
-# Window management
-bind = $mainMod, Q, killactive,
-bind = $mainMod SHIFT, Q, forcekillactive,
-bind = $mainMod, F, togglefloating,
-bind = $mainMod SHIFT, F, fullscreen
-bind = $mainMod, P, pin
-bind = $mainMod, U, focusurgentorlast
-bind = $mainMod, V, centerwindow
-
-# Special workspaces
-bind = $mainMod SHIFT, Space, togglespecialworkspace          # show/hide special workspace
-bind = $mainMod CTRL, Space, movetoworkspace, special          # move to the special workspace
-bind = $mainMod, N, togglespecialworkspace, passwordmgr
-
-# Layout switching
-bind = $mainMod, comma, exec, hypr-workspace-layout toggle-ms
-bind = $mainMod, period, exec, hypr-workspace-layout cycle
-bind = $mainMod SHIFT, comma, layoutmsg, fit active
-bind = $mainMod SHIFT, period, layoutmsg, togglefit
-bind = $mainMod CTRL, comma, layoutmsg, colresize 0.9
-
-# Layout-aware navigation (ALT layer)
-bind = $mainMod ALT, Tab, exec, hypr-workspace-layout nav-next
-bind = $mainMod ALT SHIFT, Tab, exec, hypr-workspace-layout nav-prev
-bind = $mainMod ALT, H, exec, hypr-workspace-layout nav-prev
-bind = $mainMod ALT, L, exec, hypr-workspace-layout nav-next
-bind = $mainMod ALT, J, exec, hypr-workspace-layout nav-down
-bind = $mainMod ALT, K, exec, hypr-workspace-layout nav-up
-
-# MOVE FOCUS with mainMod + vim keys
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, J, movefocus, d
-
-# MOVE WINDOW with mainMod SHIFT + vim keys (layout-aware)
-bind = $mainMod SHIFT, H, exec, hypr-workspace-layout move-left
-bind = $mainMod SHIFT, L, exec, hypr-workspace-layout move-right
-bind = $mainMod SHIFT, K, exec, hypr-workspace-layout move-up
-bind = $mainMod SHIFT, J, exec, hypr-workspace-layout move-down
-
-bind = $mainMod ALT SHIFT, J, exec, hypr-workspace-layout resize-shrink-h
-bind = $mainMod ALT SHIFT, K, exec, hypr-workspace-layout resize-grow-h
-
-# Resize submap
-bind = $mainMod, R, submap, resize
-
-submap = resize
-bind = , h, resizeactive, -25 0
-bind = , l, resizeactive, 25 0
-bind = , k, resizeactive, 0 -25
-bind = , j, resizeactive, 0 25
-bind = SHIFT, h, resizeactive, -60 0
-bind = SHIFT, l, resizeactive, 60 0
-bind = SHIFT, k, resizeactive, 0 -60
-bind = SHIFT, j, resizeactive, 0 60
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-submap = reset
-
-# Workspace cycling (per-monitor)
-bind = $mainMod, Tab, workspace, m+1
-bind = $mainMod SHIFT, Tab, workspace, m-1
-
-# SWITCH WORKSPACES with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 21
-bind = $mainMod, 2, workspace, 22
-bind = $mainMod, 3, workspace, 23
-bind = $mainMod, 4, workspace, 24
-bind = $mainMod, 5, workspace, 25
-bind = $mainMod, 6, workspace, 26
-bind = $mainMod, 7, workspace, 27
-bind = $mainMod, 8, workspace, 28
-bind = $mainMod, 9, workspace, 29
-bind = $mainMod, 0, workspace, 30
-
-# Monitor focus / workspace move
-bind = $mainMod, O, focusmonitor, r
-bind = $mainMod, I, focusmonitor, l
-bind = $mainMod SHIFT, O, movecurrentworkspacetomonitor, r
-bind = $mainMod SHIFT, I, movecurrentworkspacetomonitor, l
-
-# MOVE ACTIVE WINDOW TO A WORKSPACE with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 21
-bind = $mainMod SHIFT, 2, movetoworkspace, 22
-bind = $mainMod SHIFT, 3, movetoworkspace, 23
-bind = $mainMod SHIFT, 4, movetoworkspace, 24
-bind = $mainMod SHIFT, 5, movetoworkspace, 25
-bind = $mainMod SHIFT, 6, movetoworkspace, 26
-bind = $mainMod SHIFT, 7, movetoworkspace, 27
-bind = $mainMod SHIFT, 8, movetoworkspace, 28
-bind = $mainMod SHIFT, 9, movetoworkspace, 29
-bind = $mainMod SHIFT, 0, movetoworkspace, 30
-
-# MOVE ACTIVE WINDOW TO A WORKSPACE SILENTLY with mainMod + CTRL + SHIFT + [0-9]
-bind = $mainMod CTRL SHIFT, 1, movetoworkspacesilent, 21
-bind = $mainMod CTRL SHIFT, 2, movetoworkspacesilent, 22
-bind = $mainMod CTRL SHIFT, 3, movetoworkspacesilent, 23
-bind = $mainMod CTRL SHIFT, 4, movetoworkspacesilent, 24
-bind = $mainMod CTRL SHIFT, 5, movetoworkspacesilent, 25
-bind = $mainMod CTRL SHIFT, 6, movetoworkspacesilent, 26
-bind = $mainMod CTRL SHIFT, 7, movetoworkspacesilent, 27
-bind = $mainMod CTRL SHIFT, 8, movetoworkspacesilent, 28
-bind = $mainMod CTRL SHIFT, 9, movetoworkspacesilent, 29
-bind = $mainMod CTRL SHIFT, 0, movetoworkspacesilent, 30
-
-# Group tab switching
-bind = $mainMod, Z, changegroupactive, f
-bind = $mainMod SHIFT, Z, changegroupactive, b
-bind = $mainMod, G, submap, group
-
-submap = group
-bind = , h, moveintogroup, l
-bind = , j, moveintogroup, d
-bind = , k, moveintogroup, u
-bind = , l, moveintogroup, r
-bind = , o, moveoutofgroup
-bind = , t, togglegroup
-bind = , d, denywindowfromgroup, toggle
-bind = , f, lockactivegroup, toggle
-bind = SHIFT, f, lockgroups, toggle
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-submap = reset
-
-# Zoom submap
-bind = $mainMod, M, submap, zoom
-
-submap = zoom
-bind = , equal, exec, hypr-zoom-step +0.2
-bind = , minus, exec, hypr-zoom-step -0.2
-bind = , 0, exec, hypr-zoom-step reset
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-submap = reset
-
-# MOVE/RESIZE WINDOWS with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-{{ if .chezmoi.config.data.tags.laptop }}
-# Brightness controls
-bindel = , XF86MonBrightnessUp, exec, brightnessctl set +5%
-bindel = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
-bindel = Shift, XF86MonBrightnessUp, exec, brightnessctl set +1%
-bindel = Shift, XF86MonBrightnessDown, exec, brightnessctl set 1%-
-{{ end }}
-
-# Output volume control
-bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-
-# Input volume control
-bindel = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+
-bindel = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
-bindel = SHIFT, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
-# Screenshot and recording controls
-bind = , Print, exec, grimblast --notify copy screen
-bind = $mainMod, Print, exec, owlry-screenshot-menu
-bind = SHIFT, Print, exec, uwsm app -- kitty --class=scrrec -e wf-recorder -f ~/Videos/scrrec.mkv -y -g "$(slurp)"
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/80-autostart.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/80-autostart.conf
deleted file mode 100644
index a3a227f..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/80-autostart.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# AUTOSTART
-# most apps are either started as systemd service like either directly like hyprpolkitagent or indirectly via uwsm
-# and ~/.config/autostart
-exec-once = wl-paste --type text --watch cliphist store
-exec-once = wl-paste --type image --watch cliphist store
-exec-once = wl-clip-persist --clipboard regular
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/catpuccinmocha.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/catpuccinmocha.conf
deleted file mode 100644
index 552f816..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/catpuccinmocha.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-#######################################
-### CATTPUCCIN MOCHA HYPRLAND THEME ###
-#######################################
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b
-
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba($surface0Alpha88)
-$border_active = rgba($pinkAlphaff) rgba($mauveAlphaff) 45deg
-$border_inactive = rgba($redAlphabb) rgba($mauveAlphabb) 45deg
-$border_nogroup_active = rgba($tealAlphaff) rgba($yellowAlphaff) 45deg
-$border_nogroup_inactive = rgba($tealAlphaaa) rgba($yellowAlphaff) 45deg
-$border_group_active = rgba($sapphireAlphaff) rgba($lavenderAlphaff) 45deg
-$border_group_inactive = rgba($blueAlphadd) rgba($peachAlphadd) 45deg
-$border_grouplocked_active = rgba($maroonAlphaff) rgba(f7767eff) 45deg
-$border_grouplocked_inactive = rgba(ff007caa) rgba(f7767eff) 45deg
-$groupbar_text = rgba($baseAlphaff) 
-$groupbar_active = rgba($sapphireAlphaff) rgba($lavenderAlphaaa)
-$groupbar_inactive = rgba($blueAlphaee) rgba($lavenderAlphaaa)
-$groupbar_grouplocked_active = rgba($tealAlphaff) rgba($greenAlphaff)
-$groupbar_grouplocked_inactive = rgba($tealAlphaaa) rgba($greenAlphaaa)
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/default_theme.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/default_theme.conf
deleted file mode 100644
index 8f676aa..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/default_theme.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################
-### TOKYO NIGHT HYPRLAND THEME ###
-##################################
-$splash_text = rgba(ffffffff)
-$dec_shadow = rgba(1a1a1aee)
-$border_active = rgba(33ccffee) rgba(00ff99ee) 45deg
-$border_inactive = rgba(595959aa)
-$border_nogroup_active =
-$border_nogroup_inactive =
-$border_group_active = 0x66ffff00
-$border_group_inactive = 0x66777700
-$border_grouplocked_active = 0x66ff5500
-$border_grouplocked_inactive = 0x66ff5500
-$groupbar_text = 0xffffffff
-$groupbar_active = 0x66ffff00
-$groupbar_inactive = 0x66777700
-$groupbar_grouplocked_active = 0x66ff5500
-$groupbar_grouplocked_inactive = 0x66775500
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/rose-pine.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/rose-pine.conf
deleted file mode 100644
index 38f8b1d..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/rose-pine.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#####################################
-### ROSÉ PINE HYPRLAND THEME ###
-#####################################
-
-# Base colors
-$base = rgb(191724)
-$baseAlpha = 191724
-
-$surface = rgb(1f1d2e)
-$surfaceAlpha = 1f1d2e
-
-$overlay = rgb(26233a)
-$overlayAlpha = 26233a
-
-$muted = rgb(6e6a86)
-$mutedAlpha = 6e6a86
-
-$subtle = rgb(908caa)
-$subtleAlpha = 908caa
-
-$text = rgb(e0def4)
-$textAlpha = e0def4
-
-# Accent colors
-$love = rgb(eb6f92)
-$loveAlpha = eb6f92
-
-$gold = rgb(f6c177)
-$goldAlpha = f6c177
-
-$rose = rgb(ebbcba)
-$roseAlpha = ebbcba
-
-$pine = rgb(31748f)
-$pineAlpha = 31748f
-
-$foam = rgb(9ccfd8)
-$foamAlpha = 9ccfd8
-
-$iris = rgb(c4a7e7)
-$irisAlpha = c4a7e7
-
-# Highlight variants
-$highlight_low = rgb(21202e)
-$highlight_lowAlpha = 21202e
-
-$highlight_med = rgb(403d52)
-$highlight_medAlpha = 403d52
-
-$highlight_high = rgb(524f67)
-$highlight_highAlpha = 524f67
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba($overlayAlpha88)
-
-# Border configurations
-$border_active = rgba($roseAlphaff) rgba($irisAlphaff) 45deg
-$border_inactive = rgba($mutedAlphabb) rgba($subtleAlphabb) 45deg
-$border_nogroup_active = rgba($pineAlphaff) rgba($foamAlphaff) 45deg
-$border_nogroup_inactive = rgba($pineAlphaaa) rgba($foamAlphaaa) 45deg
-$border_group_active = rgba($irisAlphaff) rgba($loveAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlphadd) rgba($subtleAlphadd) 45deg
-$border_grouplocked_active = rgba($goldAlphaff) rgba($roseAlphaff) 45deg
-$border_grouplocked_inactive = rgba($goldAlphaaa) rgba($roseAlphaaa) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($roseAlphaff) rgba($irisAlphaaa)
-$groupbar_inactive = rgba($mutedAlphaee) rgba($subtleAlphaaa)
-$groupbar_grouplocked_active = rgba($goldAlphaff) rgba($loveAlphaff)
-$groupbar_grouplocked_inactive = rgba($goldAlphaaa) rgba($loveAlphaaa)
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-aeon.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-aeon.conf
deleted file mode 100644
index 3e63f64..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-aeon.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#############################
-### APEX AEON THEME ###
-#############################
-
-# The Void (Backgrounds)
-# Pure, unadulterated darkness. None of that "grey-blue" nonsense.
-$base = rgb(f5f5f5)
-$baseAlpha = f5f5f5
-
-$surface = rgb(e8e8e8)
-$surfaceAlpha = e8e8e8
-
-$overlay = rgb(737373)
-$overlayAlpha = 737373
-
-$muted = rgb(a0a0a0)
-$mutedAlpha = a0a0a0
-
-$subtle = rgb(a0a0a0)
-$subtleAlpha = a0a0a0
-
-# The Signal (Text)
-# Stark white for maximum readability.
-$text = rgb(0a0a0a)
-$textAlpha = 0a0a0a
-
-# Accents (Aggressive)
-# "Razor Red" - For errors or active borders. Blood-like.
-$love = rgb(ff0044)
-$loveAlpha = ff0044
-
-# "Warning Gold"
-$gold = rgb(d18f00)
-$goldAlpha = d18f00
-
-# "Toxic Green" - Because nature isn't always nice.
-$pine = rgb(00b377)
-$pineAlpha = 00b377
-
-# "Electric Cyan" - Cold, digital logic.
-$foam = rgb(007a88)
-$foamAlpha = 007a88
-
-# "Deep Void Purple"
-$iris = rgb(7a3cff)
-$irisAlpha = 7a3cff
-
-# "Pale Rose" (Mapped to alert color)
-$rose = rgb(ff4d6d)
-$roseAlpha = ff4d6d
-
-# Highlight variants
-$highlight_low = rgb(e8e8e8)
-$highlight_lowAlpha = e8e8e8
-
-$highlight_med = rgb(737373)
-$highlight_medAlpha = 737373
-
-$highlight_high = rgb(a0a0a0)
-$highlight_highAlpha = a0a0a0
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba(000000ee) # Hard shadows
-
-# Border configurations
-# Sharp, thin, and aggressive.
-$border_active = rgba($loveAlphaff) rgba($irisAlphaff) 45deg
-$border_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_nogroup_active = rgba($foamAlphaff) rgba($pineAlphaff) 45deg
-$border_nogroup_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_group_active = rgba($goldAlphaff) rgba($loveAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlpha66) rgba($surfaceAlpha66) 45deg
-
-$border_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff) 45deg
-$border_grouplocked_inactive = rgba($foamAlpha66) rgba($irisAlpha66) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($loveAlphaff) rgba($irisAlphaaa)
-$groupbar_inactive = rgba($surfaceAlphaee) rgba($mutedAlphaaa)
-$groupbar_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff)
-$groupbar_grouplocked_inactive = rgba($foamAlphaaa) rgba($irisAlphaaa)
\ No newline at end of file
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-neon.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-neon.conf
deleted file mode 100644
index 9f0b22f..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-apex-neon.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#############################
-### APEX NEON THEME ###
-#############################
-
-# The Void (Backgrounds)
-# Pure, unadulterated darkness. None of that "grey-blue" nonsense.
-$base = rgb(050505)
-$baseAlpha = 050505
-
-$surface = rgb(141414)
-$surfaceAlpha = 141414
-
-$overlay = rgb(262626)
-$overlayAlpha = 262626
-
-$muted = rgb(404040)
-$mutedAlpha = 404040
-
-$subtle = rgb(404040)
-$subtleAlpha = 404040
-
-# The Signal (Text)
-# Stark white for maximum readability.
-$text = rgb(ededed)
-$textAlpha = ededed
-
-# Accents (Aggressive)
-# "Razor Red" - For errors or active borders. Blood-like.
-$love = rgb(ff0044)
-$loveAlpha = ff0044
-
-# "Warning Gold"
-$gold = rgb(ffb700)
-$goldAlpha = ffb700
-
-# "Toxic Green" - Because nature isn't always nice.
-$pine = rgb(00ff99)
-$pineAlpha = 00ff99
-
-# "Electric Cyan" - Cold, digital logic.
-$foam = rgb(00eaff)
-$foamAlpha = 00eaff
-
-# "Deep Void Purple"
-$iris = rgb(9d00ff)
-$irisAlpha = 9d00ff
-
-# "Pale Rose" (Mapped to alert color)
-$rose = rgb(ff8899)
-$roseAlpha = ff8899
-
-# Highlight variants
-$highlight_low = rgb(141414)
-$highlight_lowAlpha = 141414
-
-$highlight_med = rgb(262626)
-$highlight_medAlpha = 262626
-
-$highlight_high = rgb(404040)
-$highlight_highAlpha = 404040
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba(000000ee) # Hard shadows
-
-# Border configurations
-# Sharp, thin, and aggressive.
-$border_active = rgba($loveAlphaff) rgba($irisAlphaff) 45deg
-$border_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_nogroup_active = rgba($foamAlphaff) rgba($pineAlphaff) 45deg
-$border_nogroup_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_group_active = rgba($goldAlphaff) rgba($loveAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlpha66) rgba($surfaceAlpha66) 45deg
-
-$border_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff) 45deg
-$border_grouplocked_inactive = rgba($foamAlpha66) rgba($irisAlpha66) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($loveAlphaff) rgba($irisAlphaaa)
-$groupbar_inactive = rgba($surfaceAlphaee) rgba($mutedAlphaaa)
-$groupbar_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff)
-$groupbar_grouplocked_inactive = rgba($foamAlphaaa) rgba($irisAlphaaa)
\ No newline at end of file
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-owl.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-owl.conf
deleted file mode 100644
index 2f0706c..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/theme-owl.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-################################
-### OWL HYPRLAND THEME ###
-################################
-
-# Base colors
-$base = rgb(1a1b26)
-$baseAlpha = 1a1b26
-
-$surface = rgb(24283b)
-$surfaceAlpha = 24283b
-
-$overlay = rgb(414868)
-$overlayAlpha = 414868
-
-$muted = rgb(565f89)
-$mutedAlpha = 565f89
-
-$subtle = rgb(414868)
-$subtleAlpha = 414868
-
-$text = rgb(c0caf5)
-$textAlpha = c0caf5
-
-# Accent colors
-$love = rgb(f7768e)
-$loveAlpha = f7768e
-
-$gold = rgb(e0af68)
-$goldAlpha = e0af68
-
-$rose = rgb(f5e0dc)
-$roseAlpha = f5e0dc
-
-$pine = rgb(9ece6a)
-$pineAlpha = 9ece6a
-
-$foam = rgb(7aa2f7)
-$foamAlpha = 7aa2f7
-
-$iris = rgb(bb9af7)
-$irisAlpha = bb9af7
-
-# Highlight variants
-$highlight_low = rgb(24283b)
-$highlight_lowAlpha = 24283b
-
-$highlight_med = rgb(414868)
-$highlight_medAlpha = 414868
-
-$highlight_high = rgb(565f89)
-$highlight_highAlpha = 565f89
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba($overlayAlpha88)
-
-# Border configurations
-$border_active = rgba($goldAlphaff) rgba($foamAlphaff) 45deg
-$border_inactive = rgba($mutedAlphabb) rgba($subtleAlphabb) 45deg
-$border_nogroup_active = rgba($foamAlphaff) rgba($irisAlphaff) 45deg
-$border_nogroup_inactive = rgba($foamAlphaaa) rgba($irisAlphaaa) 45deg
-$border_group_active = rgba($roseAlphaff) rgba($goldAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlphadd) rgba($subtleAlphadd) 45deg
-$border_grouplocked_active = rgba($loveAlphaff) rgba($goldAlphaff) 45deg
-$border_grouplocked_inactive = rgba($loveAlphaaa) rgba($goldAlphaaa) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($goldAlphaff) rgba($foamAlphaaa)
-$groupbar_inactive = rgba($mutedAlphaee) rgba($subtleAlphaaa)
-$groupbar_grouplocked_active = rgba($loveAlphaff) rgba($goldAlphaff)
-$groupbar_grouplocked_inactive = rgba($loveAlphaaa) rgba($goldAlphaaa)
diff --git a/dot_config/hypr/hyprland.conf.bak/hyprland.d/tokyonight.conf b/dot_config/hypr/hyprland.conf.bak/hyprland.d/tokyonight.conf
deleted file mode 100644
index f496284..0000000
--- a/dot_config/hypr/hyprland.conf.bak/hyprland.d/tokyonight.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-##################################
-### TOKYO NIGHT HYPRLAND THEME ###
-##################################
-$splash_text = rgba(a9b1d6ee)
-$dec_shadow = rgba(737aa2ee)
-$border_active = rgba(9ece6aff) rgba(7aa2f7ff) 45deg
-$border_inactive = rgba(9d7cd8aa) rgba(7aa2f7ff) 45deg
-$border_nogroup_active = rgba(7aa2f7ff) rgba(89ddffff) 45deg
-$border_nogroup_inactive = rgba(7aa2f7aa) rgba(89ddffaa) 45deg
-$border_group_active = rgba(ff9e64ff) rgba(ff0e64ff) 45deg
-$border_group_inactive = rgba(ff9e64aa) rgba(ff0e64aa) 45deg
-$border_grouplocked_active = rgba(ff007cff) rgba(f7767eff) 45deg
-$border_grouplocked_inactive = rgba(ff007caa) rgba(f7767eff) 45deg
-$groupbar_text = rgba(1f2335ff) 
-$groupbar_active = rgba(ff9e64ee) rgba(ff9e6499)
-$groupbar_inactive = rgba(ff9e64bb) rgba(ff9e6499)
-$groupbar_grouplocked_active = rgba(ff007cee) rgba(ff007c99)
-$groupbar_grouplocked_inactive = rgba(ff007cbb) rgba(ff007c99)
diff --git a/dot_config/hypr/hyprland.d/theme-apex-aeon.conf b/dot_config/hypr/hyprland.d/theme-apex-aeon.conf
deleted file mode 100644
index 3e63f64..0000000
--- a/dot_config/hypr/hyprland.d/theme-apex-aeon.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#############################
-### APEX AEON THEME ###
-#############################
-
-# The Void (Backgrounds)
-# Pure, unadulterated darkness. None of that "grey-blue" nonsense.
-$base = rgb(f5f5f5)
-$baseAlpha = f5f5f5
-
-$surface = rgb(e8e8e8)
-$surfaceAlpha = e8e8e8
-
-$overlay = rgb(737373)
-$overlayAlpha = 737373
-
-$muted = rgb(a0a0a0)
-$mutedAlpha = a0a0a0
-
-$subtle = rgb(a0a0a0)
-$subtleAlpha = a0a0a0
-
-# The Signal (Text)
-# Stark white for maximum readability.
-$text = rgb(0a0a0a)
-$textAlpha = 0a0a0a
-
-# Accents (Aggressive)
-# "Razor Red" - For errors or active borders. Blood-like.
-$love = rgb(ff0044)
-$loveAlpha = ff0044
-
-# "Warning Gold"
-$gold = rgb(d18f00)
-$goldAlpha = d18f00
-
-# "Toxic Green" - Because nature isn't always nice.
-$pine = rgb(00b377)
-$pineAlpha = 00b377
-
-# "Electric Cyan" - Cold, digital logic.
-$foam = rgb(007a88)
-$foamAlpha = 007a88
-
-# "Deep Void Purple"
-$iris = rgb(7a3cff)
-$irisAlpha = 7a3cff
-
-# "Pale Rose" (Mapped to alert color)
-$rose = rgb(ff4d6d)
-$roseAlpha = ff4d6d
-
-# Highlight variants
-$highlight_low = rgb(e8e8e8)
-$highlight_lowAlpha = e8e8e8
-
-$highlight_med = rgb(737373)
-$highlight_medAlpha = 737373
-
-$highlight_high = rgb(a0a0a0)
-$highlight_highAlpha = a0a0a0
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba(000000ee) # Hard shadows
-
-# Border configurations
-# Sharp, thin, and aggressive.
-$border_active = rgba($loveAlphaff) rgba($irisAlphaff) 45deg
-$border_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_nogroup_active = rgba($foamAlphaff) rgba($pineAlphaff) 45deg
-$border_nogroup_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_group_active = rgba($goldAlphaff) rgba($loveAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlpha66) rgba($surfaceAlpha66) 45deg
-
-$border_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff) 45deg
-$border_grouplocked_inactive = rgba($foamAlpha66) rgba($irisAlpha66) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($loveAlphaff) rgba($irisAlphaaa)
-$groupbar_inactive = rgba($surfaceAlphaee) rgba($mutedAlphaaa)
-$groupbar_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff)
-$groupbar_grouplocked_inactive = rgba($foamAlphaaa) rgba($irisAlphaaa)
\ No newline at end of file
diff --git a/dot_config/hypr/hyprland.d/theme-apex-neon.conf b/dot_config/hypr/hyprland.d/theme-apex-neon.conf
deleted file mode 100644
index 9f0b22f..0000000
--- a/dot_config/hypr/hyprland.d/theme-apex-neon.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#############################
-### APEX NEON THEME ###
-#############################
-
-# The Void (Backgrounds)
-# Pure, unadulterated darkness. None of that "grey-blue" nonsense.
-$base = rgb(050505)
-$baseAlpha = 050505
-
-$surface = rgb(141414)
-$surfaceAlpha = 141414
-
-$overlay = rgb(262626)
-$overlayAlpha = 262626
-
-$muted = rgb(404040)
-$mutedAlpha = 404040
-
-$subtle = rgb(404040)
-$subtleAlpha = 404040
-
-# The Signal (Text)
-# Stark white for maximum readability.
-$text = rgb(ededed)
-$textAlpha = ededed
-
-# Accents (Aggressive)
-# "Razor Red" - For errors or active borders. Blood-like.
-$love = rgb(ff0044)
-$loveAlpha = ff0044
-
-# "Warning Gold"
-$gold = rgb(ffb700)
-$goldAlpha = ffb700
-
-# "Toxic Green" - Because nature isn't always nice.
-$pine = rgb(00ff99)
-$pineAlpha = 00ff99
-
-# "Electric Cyan" - Cold, digital logic.
-$foam = rgb(00eaff)
-$foamAlpha = 00eaff
-
-# "Deep Void Purple"
-$iris = rgb(9d00ff)
-$irisAlpha = 9d00ff
-
-# "Pale Rose" (Mapped to alert color)
-$rose = rgb(ff8899)
-$roseAlpha = ff8899
-
-# Highlight variants
-$highlight_low = rgb(141414)
-$highlight_lowAlpha = 141414
-
-$highlight_med = rgb(262626)
-$highlight_medAlpha = 262626
-
-$highlight_high = rgb(404040)
-$highlight_highAlpha = 404040
-
-# Theme-specific definitions
-$splash_text = rgba($textAlphaee)
-$dec_shadow = rgba(000000ee) # Hard shadows
-
-# Border configurations
-# Sharp, thin, and aggressive.
-$border_active = rgba($loveAlphaff) rgba($irisAlphaff) 45deg
-$border_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_nogroup_active = rgba($foamAlphaff) rgba($pineAlphaff) 45deg
-$border_nogroup_inactive = rgba($mutedAlpha44) rgba($surfaceAlpha44) 45deg
-
-$border_group_active = rgba($goldAlphaff) rgba($loveAlphaff) 45deg
-$border_group_inactive = rgba($mutedAlpha66) rgba($surfaceAlpha66) 45deg
-
-$border_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff) 45deg
-$border_grouplocked_inactive = rgba($foamAlpha66) rgba($irisAlpha66) 45deg
-
-# Group bar configurations
-$groupbar_text = rgba($baseAlphaff)
-$groupbar_active = rgba($loveAlphaff) rgba($irisAlphaaa)
-$groupbar_inactive = rgba($surfaceAlphaee) rgba($mutedAlphaaa)
-$groupbar_grouplocked_active = rgba($foamAlphaff) rgba($irisAlphaff)
-$groupbar_grouplocked_inactive = rgba($foamAlphaaa) rgba($irisAlphaaa)
\ No newline at end of file
diff --git a/dot_config/nushell/config.nu.tmpl b/dot_config/nushell/config.nu.tmpl
index 91484f6..0933611 100644
--- a/dot_config/nushell/config.nu.tmpl
+++ b/dot_config/nushell/config.nu.tmpl
@@ -39,7 +39,7 @@ $env.config = {
       mode: [vi_insert, emacs]
       event: {
         send: executehostcommand
-        cmd: "commandline edit --insert (history | last | split words | last)"
+        cmd: "commandline edit --insert (history | last | get command | split words | last)"
       }
     }
   ]