diff --git a/.gitmodules b/.gitmodules
index afcc75c..65cd72d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,15 @@
-[submodule "waybar/catppuccin-waybar"]
-	path = waybar/catppuccin-waybar
-	url = https://github.com/catppuccin/waybar.git
 [submodule "hypr/catppuccin-hyprland"]
 	path = hypr/catppuccin-hyprland
 	url = https://github.com/catppuccin/hyprland.git
 [submodule "hypr/catppuccin-hyprlock"]
 	path = hypr/catppuccin-hyprlock
 	url = https://github.com/catppuccin/hyprlock.git
-[submodule "zathura/catppuccin-zathura"]
-	path = zathura/catppuccin-zathura
-	url = https://github.com/catppuccin/zathura.git
 [submodule "nvim/pack/nvim/start/mini.nvim"]
 	path = nvim/pack/nvim/start/mini.nvim
 	url = https://github.com/echasnovski/mini.nvim
 [submodule "nvim/pack/nvim/start/nvim-lspconfig"]
 	path = nvim/pack/nvim/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
-[submodule "btop/catppuccin-btop"]
-	path = btop/catppuccin-btop
-	url = https://github.com/catppuccin/btop.git
 [submodule "nvim"]
 	path = nvim
 	url = https://git.narl.io/nvrl/nvim-config.git
diff --git a/btop/catppuccin-btop b/btop/catppuccin-btop
deleted file mode 160000
index f437574..0000000
--- a/btop/catppuccin-btop
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f437574b600f1c6d932627050b15ff5153b58fa3
diff --git a/btop/themes/catppuccin_mocha.theme b/btop/themes/catppuccin_mocha.theme
deleted file mode 100644
index 560b5a1..0000000
--- a/btop/themes/catppuccin_mocha.theme
+++ /dev/null
@@ -1,83 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#1e1e2e"
-
-# Main text color
-theme[main_fg]="#cdd6f4"
-
-# Title color for boxes
-theme[title]="#cdd6f4"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#89b4fa"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#45475a"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#89b4fa"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#7f849c"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#f5e0dc"
-
-# Background color of the percentage meters
-theme[meter_bg]="#45475a"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#f5e0dc"
-
-# CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#cba6f7" #Mauve
-theme[mem_box]="#a6e3a1" #Green
-theme[net_box]="#eba0ac" #Maroon
-theme[proc_box]="#89b4fa" #Blue
-
-# Box divider line and small boxes line color
-theme[div_line]="#6c7086"
-
-# Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#a6e3a1"
-theme[temp_mid]="#f9e2af"
-theme[temp_end]="#f38ba8"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#94e2d5"
-theme[cpu_mid]="#74c7ec"
-theme[cpu_end]="#b4befe"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#cba6f7"
-theme[free_mid]="#b4befe"
-theme[free_end]="#89b4fa"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#74c7ec"
-theme[cached_mid]="#89b4fa"
-theme[cached_end]="#b4befe"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#fab387"
-theme[available_mid]="#eba0ac"
-theme[available_end]="#f38ba8"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#a6e3a1"
-theme[used_mid]="#94e2d5"
-theme[used_end]="#89dceb"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="#fab387"
-theme[download_mid]="#eba0ac"
-theme[download_end]="#f38ba8"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="#a6e3a1"
-theme[upload_mid]="#94e2d5"
-theme[upload_end]="#89dceb"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#74c7ec"
-theme[process_mid]="#b4befe"
-theme[process_end]="#cba6f7"
\ No newline at end of file
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
deleted file mode 100644
index 2310247..0000000
--- a/hypr/hyprlock.conf
+++ /dev/null
@@ -1,545 +0,0 @@
-# For more information visit https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/
-
-source = ~/.config/hypr/catppuccin-hyprland/themes/mocha.conf
-
-$scrPath      = ~/.config/hypr/hyprlock/
-$imgPath      = ~/.config/hypr/hyprlock/assets/
-
-$USER         = narl    # Your Alias
-$host         = uname -n #Your Alias
-$wifi-mode    = false # Change the WiFi output. true = show SSID, false = Connected.
-$bt-mode      = false # Change the Bluetooth output. true = show Device name, false = Connected.
-
-# Default geolocation provider is IP-API.COM, hardcode it if the location does not match the current location.
-# Hardcode your location (If hardcode does not recognize your City, change it to IP Geolocation provider in weatherinfo.sh)
-$CITY         = 
-$COUNTRY      = 
-
-# WALLPAPER
-# Just comment and uncomment to select
-$wallpaper    = screenshot
-#$wallpaper    = ~/your/wallpaper-path.png
-$blur  = 2
-
-# ADJUST HERE
-$rounding     = 12
-$shape-rd     = -1
-$font-text    = GeistMono Nerd Font Bold
-$font-text0   = GeistMono Nerd Font
-$font-display = PP Neue Machina Ultra-Bold
-$font-symbol  = JetBrainsMono Nerd Font Mono
-# Input Var
-$weight       = 2
-$inner-color  = rgba($baseAlpha80)
-$border-color = rgba($mauveAlpha80)
-
-# Colors
-$clock-color  = $text
-$fg0          = $text
-$fg1          = $base
-$shape-col0   = $mauve
-$shape-col1   = rgba($surface0Alpha80)
-$shape-col2   = rgba($surface1Alpha80)
-$shadow-pass  = 2
-$shadow-size  = 3
-$shadow-color = $crust
-$shadow-boost = 1.2
-$text-shadow-pass   = 1
-$text-shadow-boost  = 0.5
-
-
-
-# GENERAL
-general {
-    no_fade_in          = true
-    grace               = 1
-    disable_loading_bar = false
-    hide_cursor         = true
-    ignore_empty_input  = true
-    text_trim           = true
-}
-
-#BACKGROUND
-background {
-    monitor     = 
-    path        = $wallpaper
-
-    blur_passes         = $blur
-    contrast            = 0.8916
-    brightness          = 0.7172
-    vibrancy            = 0.1696
-    vibrancy_darkness   = 0
-}
-
-# PROFILE PICTURE
-image {
-    monitor     =
-    path        = $imgPath/profile.jpg 
-    size        = 120 # lesser side if not 1:1 ratio
-    opacity     = 0.25
-
-    shadow_pass         = $shadow-pass
-    shadow_size         = $shadow-size
-    shadow_color        = $shadow-color
-    shadow_boost        = $shadow-boost
-
-    rounding            = $rounding # negative values mean circle
-    border_size         = 4
-    border_color        = $mauve
-    rotate              = 0 # degrees, counter-clockwise
-    
-    position            = 20, -20
-    halign              = left
-    valign              = top
-    zindex              = 1
-}
-
-# USER INFO
-label {
-    monitor     =
-    text        = cmd[update:1000] echo -e "$USER\n󰁥 $($host)\n\n$(uname -r)\nPackages: $(pacman -Q | wc -l) pacman"
-    
-    shadow_passes       = 1
-    shadow_boost        = 0.5
-    
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text
-
-    position            = 170, -35
-    halign              = left
-    valign              = top
-}
-
-# WEATHERCAST & LOCATION
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$(bash $scrPath/weatherinfo.sh)"
-    
-    shadow_passes       = 1
-    shadow_boost        = 0.5
-    
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text
-
-    position            = 0, -20
-    halign              = center
-    valign              = top
-}
-
-# INPUT FIELD
-input-field {
-    monitor     =
-    size        = 275, 55
-    rounding    = $rounding
-    
-    outline_thickness   = $weight
-    outer_color         = $border-color
-    dots_size           = 0.1 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing        = 1 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center         = true
-    
-    inner_color         = $inner-color
-    font_color          = $fg0
-    fade_on_empty       = false
-    
-    font_family         = $font-text
-    placeholder_text    = <span foreground="##$textAlpha">󰢏 $USER</span>
-    hide_input          = false
-    check_color         = $mauve
-    fail_color          = $red
-    fail_text           = <i>$FAIL <b>($ATTEMPTS)</b></i>
-    capslock_color      = $yellow
-    
-    position            = 0, -240
-    halign              = center
-    valign              = center
-    zindex              = 10
-}
-
-# TIME HR
-label {
-    monitor     =
-    text        = cmd[update:1000] echo -e "$(date +"%H")" # 24-Hour Format
-   #text        = cmd[update:1000] echo -e "$(date +"%I")" # 12-Hour Format
-    color       = $clock-color
-    
-    shadow_pass         = $shadow-pass
-    shadow_size         = $shadow-size
-    shadow_color        = $shadow-color
-    shadow_boost        = $shadow-boost
-    
-    font_size           = 150
-    font_family         = $font-display 
-    
-    position            = 0, -155
-    halign              = center
-    valign              = top
-}
-
-# TIME MM
-label {
-    monitor     =
-    text        = cmd[update:1000] echo -e "$(date +"%M")"
-    color       = $clock-color
-    
-    shadow_pass         = $shadow-pass
-    shadow_size         = $shadow-size
-    shadow_color        = $shadow-color
-    shadow_boost        = $shadow-boost
-
-    font_size           = 150
-    font_family         = $font-display
-    
-    position            = 0, -325
-    halign              = center
-    valign              = top
-}
-
-# AM/PM for 12-Hour Format
-#label {
-    monitor     =
-    text = cmd[update:1000] echo -e "$(date +"%p")"
-    color       = $clock-color
-    
-    shadow_pass         = $shadow-pass
-    shadow_size         = $shadow-size
-    shadow_color        = $shadow-color
-    shadow_boost        = $shadow-boost
-
-    font_size           = 16
-    font_family         = $font-display
-    
-    position            = 0, 17
-    halign              = center
-    valign              = center
-    zindex		= 5
-}
-
-# AM/PM BG
-#shape {
-    monitor     =
-    size        = 70, 40
-    
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $shape-col2
-    rounding            = $rounding
-    border_size         = 
-    border_color        =
-
-    position            = 0, 20
-    halign              = center
-    valign              = center
-    zindex              = 1
-}
-
-# GREETING
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$(bash $scrPath/greeting.sh)"
-    
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-    
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text
-
-    position            = 0, -55
-    halign              = center
-    valign              = center
-}
-
-# TODAY IS
-label {
-    monitor     =
-    text        = cmd[update:1000] bash -c 'day=$(date +%A); echo "Today is $day"'
-
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text
-
-    position            = 0, -75
-    halign              = center
-    valign              = center
-}
-
-# DATE
-label {
-    monitor     =
-    text        = cmd[update:1000] bash -c 'day=$(date +%d); case "$day" in 1) suffix="st";; 2) suffix="nd";; 3) suffix="rd";; *) suffix="th";; esac; echo -e "$(date +"%B %e")'$day'$suffix, $(date +%Y)"'
-
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $fg0
-    font_size           = 14
-    font_family         = $font-text
-
-    position            = 0, -115
-    halign              = center
-    valign              = center
-}
-
-# BATTERY
-label {
-    monitor     =
-    text        = cmd[update:1000] echo -e "$($scrPath/battery.sh)"
-    
-    color               = $fg1
-    font_size           = 12
-    font_family         = $font-text
-    
-    position            = -37, 29
-    halign              = right
-    valign              = bottom
-    zindex              = 5
-}
-
-# NETWORK
-label {
-    monitor     =
-    text        = cmd[update:1000] echo -e "$($scrPath/network.sh)"
-    
-    color               = $fg1
-    font_size           = 12
-    font_family         = $font-text
-    
-    position            = 37, 29
-    halign              = left
-    valign              = bottom
-    zindex              = 5
-}
-
-# BLUETOOTH
-label {
-    monitor     = 
-    text        = cmd[update:1000] echo -e "$(~/.config/hypr/hyprlock/bluetooth.sh)"
-    
-    color               = $fg1
-    font_size           = 12
-    font_family         = $font-text
-    
-    position            = 37, 85
-    halign 		= left
-    valign 		= bottom
-    zindex 		= 5
-}
-
-# BATTERY BG
-shape {
-    monitor     =
-    size        = 90, 40
-    
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $shape-col0
-    rounding            = $shape-rd
-    border_size         = 
-    border_color        =
-
-    position            = -20, 20
-    halign              = right
-    valign              = bottom
-    zindex              = 1
-}
-
-# NETWORK BG
-shape {
-    monitor     =
-    size        = 150, 40
-
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $shape-col0
-    rounding            = $shape-rd
-    border_size         = 
-    border_color        =
-
-    position            = 20, 20
-    halign              = left
-    valign              = bottom
-    zindex              = 1
-}
-
-# BLUETOOTH BG
-shape {
-    monitor     =
-    size        = 150, 40
-
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $shape-col0
-    rounding            = $shape-rd
-    border_size         = 
-    border_color        =
-
-    position            = 20, 75
-    halign              = left
-    valign              = bottom
-    zindex              = 1
-}
-
-# MEDIA BG
-image {
-    monitor     =
-    path        = $imgPath/media-bg-dark-25.png
-    size        = 8% 
-    opacity     = 0.25
-
-    rounding            = 5
-    border_size         = 0
-    rotate              = 0
-
-    position            = 0, -10% 
-    halign              = center
-    valign              = center
-    zindex              = 1
-}
-
-shape {
-    monitor     =
-    size        = 35%, 8% 
-
-    shadow_passes       = $text-shadow-pass
-    shadow_boost        = $text-shadow-boost
-
-    color               = $shape-col1
-    rounding            = $rounding
-    border_size         =
-    border_color        =
-
-    position            = 0, 5%
-    halign              = center
-    valign              = bottom
-    zindex              = 1
-}
-
-# PLAYER TITLE
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --title)"
-
-    color               = $fg0
-    font_size           = 14
-    font_family         = $font-text
-
-    position            = 0, -40%
-    halign              = center
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER ARTIST
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --artist)"
-
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text
-
-    position            = 0, -42%
-    halign              = center
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER ALBUM
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --album)"
-
-    color               = $fg0
-    font_size           = 11
-    font_family         = $font-text0
-
-    position            = 0, -44%
-    halign              = center
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER STATUS SYMBOL
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --status-symbol)"
-
-    color               = $fg0
-    font_size           = 16
-    font_family         = $font-symbol
-
-    position            = 33.5%, -38%
-    halign              = left
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER STATUS
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --status)"
-
-    color               = $fg0
-    font_size           = 10
-    font_family         = $font-text
-
-    position            = 35%, -38%
-    halign              = left
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER SOURCE SYMBOL
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --source-symbol)"
-
-    color               = rgba($subtext0Alpha99)
-    font_size           = 16
-    font_family         = $font-symbol
-
-    position            = -33.5%, -38%
-    halign              = right
-    valign              = center
-    zindex              = 5
-}
-
-# PLAYER SOURCE
-label {
-    monitor     =
-    text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --source)"
-
-    color               = rgba($subtext0Alpha99)
-    font_size           = 10
-    font_family         = $font-text
-
-    position            = -35%, -38%
-    halign              = right
-    valign              = center
-    zindex              = 5
-}
-
-label {
-    monitor     =
-    text        =
-
-    color               = $fg0
-    font_size           = 24
-    font_family         = $font-symbol
-
-    position            = 0, 1%
-    halign              = center
-    valign              = bottom
-}
-
-
diff --git a/hypr/hyprlock.conf.bak b/hypr/hyprlock.conf.bak
deleted file mode 100644
index 8f3f25f..0000000
--- a/hypr/hyprlock.conf.bak
+++ /dev/null
@@ -1,155 +0,0 @@
-source = $HOME/.config/hypr/catppuccin-hyprland/themes/mocha.conf
-
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = JetBrainsMono Nerd Font
-
-# GENERAL
-general {
-  hide_cursor = true
-  no_fade_in = false
-  grace = 0
-  disable_loading_bar = true
-}
-
-# BACKGROUND
-background {
-  monitor =
-  path = $HOME/Pictures/reze/reze.png
-  blur_passes = 3
-  blur_size = 7
-  noise = 0.0117
-  contrast = 0.8916
-  brightness = 0.8172
-  vibrancy = 0.1696
-  vibrancy_darkness = 0.0
-  color = $base
-}
-
-# TIME
-label {
-  monitor =
-  text = $TIME
-  color = $text
-  font_size = 120
-  font_family = $font
-  position = 0, 300
-  halign = center
-  valign = center
-}
-
-# DATE
-label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $text
-  font_size = 30
-  font_family = $font
-  position = 0, 200
-  halign = center
-  valign = center
-}
-
-# USER AVATAR (Center)
-image {
-  monitor =
-  path = $HOME/.face
-  size = 120
-  border_color = rgba(255, 255, 255, 0.1)
-  position = 0, 50
-  halign = center
-  valign = center
-}
-
-# INPUT FIELD (Center)
-input-field {
-  monitor =
-  size = 300, 60
-  outline_thickness = 2
-  dots_size = 0.2
-  dots_spacing = 0.2
-  dots_center = true
-  outer_color = rgba(255, 255, 255, 0.1)
-  inner_color = rgba(0, 0, 0, 0.2)
-  font_color = $text
-  fade_on_empty = false
-  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
-  hide_input = false
-  check_color = $accent
-  fail_color = $red
-  fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = $yellow
-  position = 0, -60
-  halign = center
-  valign = center
-}
-
-# --- MUSIC DASHBOARD (TOP RIGHT) ---
-
-# ALBUM ART (At the very top right, 80px high, adjusted -3px for perfect alignment)
-image {
-    monitor =
-    path = /tmp/hyprlock_art.png
-    size = 80
-    rounding = 15
-    border_color = rgba(255, 255, 255, 0.1)
-    reload_time = 2
-    reload_cmd = ~/.config/hypr/scripts/album_art.sh
-    position = -20, -17
-    halign = right
-    valign = top
-}
-
-# MUSIC TEXT BOX (To the left of the image, same height)
-shape {
-    monitor =
-    size = 300, 80
-    color = rgba(0, 0, 0, 0.3)
-    rounding = 15
-    border_size = 1
-    border_color = rgba(255, 255, 255, 0.1)
-    position = -110, -20
-    halign = right
-    valign = top
-}
-
-# MUSIC TEXT (Right aligned and vertically centered inside the 80px box)
-label {
-    monitor =
-    text = cmd[update:1000] ~/.config/hypr/scripts/songdetail.sh
-    color = $text
-    font_size = 14
-    font_family = $font
-    position = -125, -37
-    halign = right
-    valign = top
-    text_align = right
-}
-
-# --- STATUS DASHBOARD (BOTTOM RIGHT) ---
-
-# SYSTEM INFO BOX (Vertical stack container)
-shape {
-    monitor =
-    size = 300, 100
-    color = rgba(0, 0, 0, 0.3)
-    rounding = 15
-    border_size = 1
-    border_color = rgba(255, 255, 255, 0.1)
-    position = -20, 20
-    halign = right
-    valign = bottom
-}
-
-# SYSTEM INFO TEXT (3 lines, top of each other, right aligned)
-label {
-    monitor =
-    text = cmd[update:5000] ~/.config/hypr/scripts/status_info.sh
-    color = $text
-    font_size = 14
-    font_family = $font
-    position = -35, 35
-    halign = right
-    valign = bottom
-    text_align = right
-}
diff --git a/hypr/hyprlock/assets/profile-[1:1-500px].png b/hypr/hyprlock/assets/profile-[1:1-500px].png
deleted file mode 100644
index 1de98e7..0000000
Binary files a/hypr/hyprlock/assets/profile-[1:1-500px].png and /dev/null differ
diff --git a/hypr/hyprlock/assets/profile.jpg b/hypr/hyprlock/assets/profile.jpg
deleted file mode 100644
index 0f388ab..0000000
Binary files a/hypr/hyprlock/assets/profile.jpg and /dev/null differ
diff --git a/hypr/hyprlock/battery.sh b/hypr/hyprlock/battery.sh
deleted file mode 100755
index e3e2606..0000000
--- a/hypr/hyprlock/battery.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Get the current battery percentage
-battery_percentage=$(cat /sys/class/power_supply/BAT0/capacity)
-
-# Get the battery status (Charging or Discharging)
-battery_status=$(cat /sys/class/power_supply/BAT0/status)
-
-# Define the battery icons for each 10% segment
-battery_icons=("󰂃" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰁹")
-
-# Define the charging icon
-charging_icon="󰂄"
-
-# Calculate the index for the icon array
-# Ensure the index is within bounds (0 to 9) for battery percentages 0 to 100
-icon_index=$((battery_percentage / 10))
-
-# If the battery is 100%, use the last icon (index 9)
-if [ "$battery_percentage" -eq 100 ]; then
-    icon_index=9
-fi
-
-# Get the corresponding icon
-battery_icon=${battery_icons[$icon_index]}
-
-# Check if the battery is charging
-if [ "$battery_status" = "Charging" ]; then
-    battery_icon="$charging_icon"
-fi
-
-# Output the battery percentage and icon
-echo "$battery_percentage% $battery_icon"
diff --git a/hypr/hyprlock/bluetooth.sh b/hypr/hyprlock/bluetooth.sh
deleted file mode 100755
index 1686367..0000000
--- a/hypr/hyprlock/bluetooth.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Path to the Hyprland configuration file
-config_file="$HOME/.config/hypr/hyprlock.conf"
-
-# Read the bt-mode value from the configuration file
-bt_mode=$(grep -oP '^\$bt-mode\s*=\s*\K\S+' ~/.config/hypr/hyprlock.conf)
-
-# Get Bluetooth power status
-bluetooth_status=$(bluetoothctl show | grep "Powered:" | awk '{print $2}')
-
-# Check if Bluetooth is powered on
-if [ "$bluetooth_status" != "yes" ]; then
-    echo "󰂯 Bluetooth Off"
-    exit 0
-fi
-
-# Initialize connected devices
-connected_devices=$(echo "$connected_devices" | sed 's/[[:space:]]*$//')
-
-# Process Bluetooth devices
-while read -r line; do
-    echo "Processing line: $line" >&2
-    device_mac=$(echo "$line" | awk '{print $2}')
-    device_name=$(echo "$line" | cut -d' ' -f3-)
-    echo "Device MAC: $device_mac" >&2
-    echo "Device Name: $device_name" >&2
-    if bluetoothctl info "$device_mac" | grep -q "Connected: yes"; then
-        connected_devices+="$device_name "
-    fi
-    echo "Finished processing $device_mac" >&2
-    echo "---" >&2
-done < <(bluetoothctl devices)
-
-# If no connected devices, show "No Devices"
-if [ -z "$connected_devices" ]; then
-    echo "󰂲 No Devices"
-    exit 0
-fi
-
-# Display output based on bt-mode
-if [ "$bt_mode" = "true" ]; then
-    echo "󰂯 $connected_devices"
-else
-    echo "󰂯 Connected"
-fi
-
diff --git a/hypr/hyprlock/change_wallpaper.sh b/hypr/hyprlock/change_wallpaper.sh
deleted file mode 100755
index fb78176..0000000
--- a/hypr/hyprlock/change_wallpaper.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Only works if you use SWWW for your wallpapers
-
-SWWW_DIR="$HOME/.cache/swww/"
-HYPRLOCK="$HOME/.config/hypr/hyprlock.conf"
-
-# Get a Monitor Cache File
-FIRST_FILE=$(find "$SWWW_DIR" -type f | head -n 1)
-
-# Check if SWWW file exists
-if [ -n "$FIRST_FILE" ] && [ -f "$FIRST_FILE" ]; then
-    WALLPAPER=$(sed -n '2p' "$FIRST_FILE")
-
-    sed -i "s|^\(\$wallpaper[[:space:]]*=[[:space:]]*\).*|\1$WALLPAPER # (screenshot or /path/to/your/wallpaper.jpg)|" "$HYPRLOCK"
-    echo "Wallpaper path updated to $WALLPAPER"
-    exit 0
-fi
-
-# Error
-echo "Fehler: kein Wallpaper gefunden."
-exit 1
diff --git a/hypr/hyprlock/greeting.sh b/hypr/hyprlock/greeting.sh
deleted file mode 100755
index 1d17b85..0000000
--- a/hypr/hyprlock/greeting.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Set your Username
-# username="TamarindX"
-
-# Read the username alias from hyprlock.conf
-username=$(grep -oP '^\$USER\s*=\s*\K\S+' ~/.config/hypr/hyprlock.conf)
-
-# Check if the username was successfully extracted
-if [ -z "$username" ]; then
-  echo "Username not found in hyprlock.conf."
-  exit 1
-fi
-
-# Get the current hour
-hour=$(date +%H)
-
-# Determine the greeting based on the time
-if   [ "$hour" -ge 5  ] && [ "$hour" -lt 12 ]; then
-    greeting="Good Morning"
-elif [ "$hour" -ge 12 ] && [ "$hour" -lt 17 ]; then
-    greeting="Good Afternoon"
-elif [ "$hour" -ge 17 ] && [ "$hour" -lt 21 ]; then
-    greeting="Good Evening"
-elif [ "$hour" -ge 21 ] && [ "$hour" -lt 24 ]; then
-    greeting="Good Night"
-else
-    greeting="GO TO SLEEP!"
-fi
-
-# Output the combined text
-echo -e "Hello, $username! $greeting"
diff --git a/hypr/hyprlock/network.sh b/hypr/hyprlock/network.sh
deleted file mode 100755
index c9b25cc..0000000
--- a/hypr/hyprlock/network.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Set this variable to control the output
-# Set to "true" to show SSID, "false" to show "Connected"
-# show_ssid=false
-
-# Read the wifi-mode alias from hyprlock.conf
-show_ssid=$(grep -oP '^\$wifi-mode\s*=\s*\K\S+' ~/.config/hypr/hyprlock.conf)
-
-# Check if the SSID was successfully extracted else fallback?!
-if [ -z "$show_ssid" ]; then
-  show_ssid=false
-fi
-
-# Check if any Ethernet connection is active
-ethernet_connected=$(nmcli -t -f DEVICE,TYPE,STATE dev | grep -E 'ethernet:connected')
-
-# If Ethernet
-if [ -n "$ethernet_connected" ]; then
-    echo "󰈀  Ethernet"
-    exit 0
-fi
-
-# Get Wi-Fi connection status
-wifi_status=$(nmcli -t -f WIFI g)
-
-# Check if Wi-Fi is enabled
-if [ "$wifi_status" != "enabled" ]; then
-    echo "󰤮  Wi-Fi Off"
-    exit 0
-fi
-
-# Get active Wi-Fi connection details
-wifi_info=$(nmcli -t -f ACTIVE,SSID,SIGNAL dev wifi | grep '^yes')
-
-# If no active connection, show "Disconnected"
-if [ -z "$wifi_info" ]; then
-    echo "󰤮  No Wi-Fi"
-    exit 0
-fi
-
-# Extract SSID
-ssid=$(echo "$wifi_info" | cut -d':' -f2)
-
-# Extract signal strength
-signal_strength=$(echo "$wifi_info" | cut -d':' -f3)
-
-# Define Wi-Fi icons based on signal strength
-wifi_icons=("󰤯" "󰤟" "󰤢" "󰤥" "󰤨") # From low to high signal
-
-# Clamp signal strength between 0 and 100
-signal_strength=$((signal_strength < 0 ? 0 : (signal_strength > 100 ? 100 : signal_strength)))
-
-# Calculate the icon index based on signal strength
-icon_index=$((signal_strength / 25))
-
-# Get the corresponding icon
-wifi_icon=${wifi_icons[$icon_index]}
-
-# Output based on show_ssid variable
-if [ "$show_ssid" = true ]; then
-    echo "$wifi_icon  $ssid"
-else
-    echo "$wifi_icon  Connected"
-fi
diff --git a/hypr/hyprlock/playerctl.sh b/hypr/hyprlock/playerctl.sh
deleted file mode 100755
index 0a1d13c..0000000
--- a/hypr/hyprlock/playerctl.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-if [ $# -eq 0 ]; then
-	echo "Usage: $0 --title | --artist | --album | --source | --source-symbol"
-	exit 1
-fi
-
-# Function to get metadata using playerctl
-get_metadata() {
-	key=$1
-	playerctl metadata --player=%any,chromium,firefox --format "{{ $key }}" 2>/dev/null
-}
-
-# Check for arguments
-
-# Function to determine the source and return an icon and text
-get_source_info_symbol() {
-	trackid=$(get_metadata "mpris:trackid")
-	if [[ "$trackid" == *"firefox"* ]]; then
-		echo -e "󰈹"
-	elif [[ "$trackid" == *"spotify"* ]]; then
-		echo -e ""
-	elif [[ "$trackid" == *"chromium"* ]]; then
-		echo -e ""
-	else
-		echo ""
-	fi
-}
-
-get_source_info() {
-	trackid=$(get_metadata "mpris:trackid")
-	if [[ "$trackid" == *"firefox"* ]]; then
-		echo -e "Firefox"
-	elif [[ "$trackid" == *"spotify"* ]]; then
-		echo -e "Spotify"
-	elif [[ "$trackid" == *"chromium"* ]]; then
-		echo -e "Chrome"
-	else
-		echo ""
-	fi
-}
-
-# Function to truncate text with ellipsis if necessary
-truncate_with_ellipsis() {
-	text=$1
-	max_length=$2
-	if [ ${#text} -gt $max_length ]; then
-		echo "${text:0:$((max_length - 3))}..."
-	else
-		echo "$text"
-	fi
-}
-
-# Parse the argument
-case "$1" in
---title)
-	title=$(get_metadata "xesam:title")
-	if [ -z "$title" ]; then
-		echo ""
-	else
-		truncate_with_ellipsis "$title" 28 # Limit the output to 50 characters
-	fi
-	;;
---artist)
-	artist=$(get_metadata "xesam:artist")
-	if [ -z "$artist" ]; then
-		echo ""
-	else
-		truncate_with_ellipsis "$artist" 28 # Limit the output to 50 characters
-	fi
-	;;
---status-symbol)
-	status=$(playerctl status 2>/dev/null)
-	if [[ $status == "Playing" ]]; then
-		echo "󰎆"
-	elif [[ $status == "Paused" ]]; then
-		echo "󰏥"
-	else
-		echo ""
-	fi
-	;;
---status)
-	status=$(playerctl status 2>/dev/null)
-	if [[ $status == "Playing" ]]; then
-		echo "Playing Now"
-	elif [[ $status == "Paused" ]]; then
-		echo "Paused"
-	else
-		echo ""
-	fi
-	;;
---album)
-	album=$(playerctl metadata --player=%any,chromium,firefox --format "{{ xesam:album }}" 2>/dev/null)
-	if [[ -n $album ]]; then
-		echo "$album"
-	else
-		status=$(playerctl status 2>/dev/null)
-		if [[ -n $status ]]; then
-			echo "Not album"
-		else
-			truncate_with_ellipsis "$album" 28 # Limit the output to 50 characters
-		fi
-	fi
-	;;
---source-symbol)
-	get_source_info_symbol
-	;;
---source)
-	get_source_info
-	;;
-*)
-	echo "Invalid option: $1"
-	echo "Usage: $0 --title | --artist | --album | --source | --source-symbol"
-	exit 1
-	;;
-esac
diff --git a/hypr/hyprlock/weatherinfo.sh b/hypr/hyprlock/weatherinfo.sh
deleted file mode 100755
index a41b4b2..0000000
--- a/hypr/hyprlock/weatherinfo.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Get location data using IP Geolocation
-
-# Recommended with API, but you can try w/o API [IPINFO.IO]
-# API_TOKEN="YOUR_API_TOKEN"
-# location_data=$(curl -s "https://ipinfo.io?token=$API_TOKEN" 2>/dev/null)
-# location_data=$(curl -s https://ipinfo.io 2>/dev/null) #[Limited requests. Require API to send 50k request/month]
-
-# Extract city and country code (ISO 3166-1 alpha-2 code)
-# CITY=$(echo "$location_data" | jq -r '.city // empty')
-# COUNTRY=$(echo "$location_data" | jq -r '.country // empty')
-
-# IPINFO Alternative [IP-API.COM]
-location_data=$(curl -s "http://ip-api.com/json/" 2>/dev/null)
-
-# Extract city and country code
-CITY=$(echo "$location_data" | jq -r '.city // empty')
-COUNTRY=$(echo "$location_data" | jq -r '.countryCode // empty')
-# Visit http://ip-api.com/json/ to find other variables
-
-# HARDCODE Location
-# CITY=$(grep -oP '^\$CITY\s*=\s*\K.+' ~/.config/hypr/hyprlock.conf)
-# COUNTRY=$(grep -oP '^\$COUNTRY\s*=\s*\K.+' ~/.config/hypr/hyprlock.conf)
-
-# Check if CITY and COUNTRY are valid
-if [[ -n "$CITY" && -n "$COUNTRY" ]]; then
-    # Fetch weather info for the detected city from wttr.in
-    weather_info=$(curl -s "wttr.in/$CITY?format=%c+%C+%t" 2>/dev/null)
-
-    # Check if the weather info is valid
-    if [[ -n "$weather_info" ]]; then
-        echo "$COUNTRY, $CITY: $weather_info"
-    else
-        echo "Weather info unavailable for $COUNTRY, $CITY"
-    fi
-else
-    echo "Unable to determine your location"
-fi
diff --git a/hypr/install.sh b/hypr/install.sh
deleted file mode 100644
index 31c0066..0000000
--- a/hypr/install.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Set paths
-CONFIG_DIR="$HOME/.config/hypr"
-BACKUP_DIR="$CONFIG_DIR/hyprlock-backup-$(date +%Y%m%d%H%M%S)"
-REPO_URL="https://github.com/Tamarindtype/googlish-hyprlock-theme.git"
-TEMP_DIR="$(mktemp -d)"
-
-read -p "Do you want to see every command executed? [y/N]: " choice
-choice=${choice,,}
-
-if [[ "$choice" == "y" ]]; then
-    SHOW_COMMANDS=true
-else
-    SHOW_COMMANDS=false
-fi
-
-run_cmd() {
-    local desc="$1"
-    local cmd="$2"
-
-    if [[ "$SHOW_COMMANDS" == true ]]; then 
-        echo -e "\n$desc"
-        echo "-> $cmd"
-        read -p "Run command? [Y/n]: " confirm
-        confirm=${confirm,,} 
-
-        if [[ "$confirm" == "n" ]]; then
-            echo "⏭ Skipped."
-        else
-            eval "$cmd"
-        fi
-    else
-        eval "$cmd"
-    fi
-}
-
-# Backup existing config
-if [ -d "$CONFIG_DIR/hyprlock" ] || [ -f "$CONFIG_DIR/hyprlock.conf" ]; then
-    read -p "Do you want to create a backup of your config? [Y/n]: " choice
-    choice=${choice,,}
-
-    if [[ "$choice" != "n" ]]; then
-        run_cmd "Creating backup folder" "mkdir -p \"$BACKUP_DIR\""
-        
-        if [ -d "$CONFIG_DIR/hyprlock" ]; then
-            run_cmd "Backing up folder" "mv \"$CONFIG_DIR/hyprlock\" \"$BACKUP_DIR/\""
-        fi
-
-        if [ -f "$CONFIG_DIR/hyprlock.conf" ]; then
-            run_cmd "Backing up file" "mv \"$CONFIG_DIR/hyprlock.conf\" \"$BACKUP_DIR/\""
-        fi
-    fi
-else
-    echo "No existing hyprlock config found. Skipping backup."
-fi
-
-# Clone the repo
-run_cmd "Cloning repository..." "git clone \"$REPO_URL\" \"$TEMP_DIR\""
-
-# Move files
-run_cmd "Creating config directory" "mkdir -p \"$CONFIG_DIR\""
-
-if [ -d "$TEMP_DIR/hyprlock" ]; then
-    run_cmd "Moving hyprlock folder" "mv \"$TEMP_DIR/hyprlock\" \"$CONFIG_DIR/\""
-fi
-
-if [ -f "$TEMP_DIR/hyprlock.conf" ]; then
-    run_cmd "Moving hyprlock.conf" "mv \"$TEMP_DIR/hyprlock.conf\" \"$CONFIG_DIR/\""
-fi
-
-# Make scripts executable
-if [ -d "$CONFIG_DIR/hyprlock" ]; then
-    run_cmd "Making scripts executable..." "chmod +x \"$CONFIG_DIR/hyprlock\"/*.sh"
-fi
-
-# Optional: Run hyprlock
-run_cmd "Running Hyprlock" "hyprlock"
-
-read -p "Do you want to install the 'hyprlock-change-wallpaper' command? [Y/n]: " choice
-choice=${choice,,}
-
-if [[ "$choice" != "n" ]]; then
-    run_cmd "Installing hyprlock-change-wallpaper shortcut" "sudo ln -sf $CONFIG_DIR/hyprlock/change_wallpaper.sh /usr/local/bin/hyprlock-change-wallpaper"
-    run_cmd "Make command runable" "chmod +x $CONFIG_DIR/hyprlock/change_wallpaper.sh"
-
-    if command -v hyprlock-change-wallpaper &>/dev/null; then
-        echo "hyprlock-change-wallpaper was succesfully installed"
-    else
-        echo "Error while installing hyprlock-change-wallpaper."
-    fi
-else
-    echo "⏭ installation of hyprlock-change-wallpaper skipped"
-fi
-
-# Cleanup
-run_cmd "Cleaning up temp files..." "rm -rf \"$TEMP_DIR\""
diff --git a/systemd/user/graphical-session.target.wants/hyprpaper.service b/systemd/user/graphical-session.target.wants/hyprpaper.service
deleted file mode 120000
index a5b7405..0000000
--- a/systemd/user/graphical-session.target.wants/hyprpaper.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/user/hyprpaper.service
\ No newline at end of file
diff --git a/waybar/catppuccin-waybar b/waybar/catppuccin-waybar
deleted file mode 160000
index ee8ed32..0000000
--- a/waybar/catppuccin-waybar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ee8ed32b4f63e9c417249c109818dcc05a2e25da
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
deleted file mode 100644
index 4abebb6..0000000
--- a/waybar/config.jsonc
+++ /dev/null
@@ -1,210 +0,0 @@
-// ~/.config/waybar/config.jsonc
-[
-    {
-        "name": "top",
-        "layer": "top",
-        "position": "top",
-        "height": 39,
-        "spacing": 4,
-        "margin-top": 6,
-        "margin-left": 10,
-        "margin-right": 10,
-
-        "modules-left": [
-            "group/spaces"
-        ],
-        "modules-center": [
-            "group/center"
-        ],
-        "modules-right": [
-            "group/powertray"
-        ],
-
-        // --- Standard Modules ---
-        "hyprland/workspaces": {
-            "format": "{icon}"
-        },
-        "hyprland/window": {
-            "format": "{}",
-            "max-length": 50
-        },
-        "clock": {
-            "format": "{:%a %d %b %H:%M}",
-            "tooltip": false
-        },
-        "custom/mpris": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo mpris",
-            "on-click": "playerctl play-pause",
-            "signal": 11
-        },
-        "tray": {
-            "icon-size": 18,
-            "spacing": 10
-        },
-        "custom/dnd": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo dnd",
-            "on-click": "dunstctl set-paused toggle",
-            "signal": 13,
-            "interval": 5
-        },
-        "group/spaces": {
-            "orientation": "horizontal",
-            "modules": [
-                "hyprland/workspaces",
-                "hyprland/window"
-            ]
-        },
-        "group/powertray": {
-            "orientation": "horizontal",
-            "modules": [
-                "custom/dnd",
-                "tray",
-                "custom/gamemode",
-                "custom/power_status"
-            ]
-        },
-        "group/center": {
-            "orientation": "horizontal",
-            "modules": [
-                "custom/mpris",
-                "clock"
-            ]
-        },
-        "custom/gamemode": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo game",
-            "on-click": "~/.config/hypr/scripts/gamemode.sh",
-            "signal": 7,
-            "interval": 5
-        },
-
-        "custom/power_status": {
-            "format": "{} ",
-            "return-type": "json",
-            "exec": "fluxo power",
-            "on-click": "~/.config/hypr/scripts/powermenu.sh & disown",
-            "signal": 10,
-            "interval": 5
-        }
-    },
-    {
-        "name": "bottom",
-        "layer": "top",
-        "position": "bottom",
-        "height": 35,
-        "spacing": 4,
-        "margin-bottom": 6,
-        "margin-left": 10,
-        "margin-right": 10,
-
-        "modules-left": [
-            "group/hardware"
-        ],
-        "group/hardware": {
-            "orientation": "horizontal",
-            "modules": [
-                "custom/sys",
-                "custom/cpu",
-                "custom/mem",
-                "custom/disk-root",
-                "custom/network",
-                "custom/backlight"
-            ]
-        },
-        "modules-center": [
-        ],
-        "modules-right": [
-            "custom/bluetooth-audio",
-            "custom/volume",
-            "custom/mic"
-        ],
-
-        // --- fluxo System & Hardware ---
-        "custom/sys": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo sys",
-            "signal": 5,
-            "interval": 5
-        },
-        "custom/cpu": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo cpu",
-            "on-click": "zenmonitor & disown",
-            "signal": 2
-        },
-        "custom/mem": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo mem",
-            "signal": 3
-        },
-        "custom/gpu": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo gpu",
-            "signal": 4
-        },
-        "custom/network": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo net",
-            "signal": 1
-        },
-
-        "custom/disk-root": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo disk /",
-            "signal": 6
-        },
-
-        // --- fluxo Audio & BT ---
-        "custom/volume": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo vol",
-            "on-click": "fluxo vol mute",
-            "on-scroll-up": "fluxo vol up 5",
-            "on-scroll-down": "fluxo vol down 5",
-            "on-click-right": "fluxo vol cycle",
-            "on-click-middle": "pavucontrol",
-            "signal": 8
-        },
-        "custom/mic": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo mic",
-            "on-click": "fluxo mic mute",
-            "on-scroll-up": "fluxo mic up 5",
-            "on-scroll-down": "fluxo mic down 5",
-            "on-click-right": "fluxo mic cycle",
-            "on-click-middle": "pavucontrol",
-            "signal": 8
-        },
-        "custom/bluetooth-audio": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo bt",
-            "on-click": "fluxo bt menu",
-            "on-click-right": "fluxo bt cycle",
-            "on-click-middle": "fluxo bt cycle_mode",
-            "signal": 9,
-            "tooltip": true
-        },
-        "custom/backlight": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo backlight",
-            "on-scroll-up": "brightnessctl s +10%",
-            "on-scroll-down": "brightnessctl s 10%-",
-            "signal": 12
-        }
-    }
-]
diff --git a/waybar/q b/waybar/q
deleted file mode 100644
index f9f958c..0000000
--- a/waybar/q
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ~/.config/waybar/style.css */
-@import "./catppuccin-waybar/themes/mocha.css";
-
-/* ==========================================================================
-   Global Reset & Bar
-   ========================================================================== */
-* {
-  border: none;
-  border-radius: 12px;
-  min-height: 0;
-  font-family: "JetBrainsMono Nerd Font", sans-serif;
-  font-size: 12px;
-  transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
-}
-
-window#waybar {
-  background-color: transparent;
-  color: @text;
-}
-
-/* ==========================================================================
-   Base Islands (Containers)
-   ========================================================================== */
-/* Groups and standalone modules receive the floating island styling */
-#spaces,
-#powertray,
-#hardware,
-#center,
-#custom-bluetooth-audio,
-#custom-volume,
-#custom-buds,
-#custom-mic {
-  background-color: alpha(@surface0, 0.8);
-  margin: 4px 6px;
-  padding: 4px 16px;
-  border: 1px solid alpha(@surface1, 0.5);
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
-  color: @text;
-}
-
-/* Group-specific sizing overrides */
-#hardware,
-#powertray,
-#spaces {
-  border-radius: 24px;
-  padding: 4px 10px;
-}
-
-/* Center Pill (Clock + MPRIS) Override */
-#center {
-  background: linear-gradient(45deg, @mauve, @lavender);
-  color: @surface0; 
-  font-weight: 900;
-  padding: 4px 20px;
-}
-
-/* ==========================================================================
-   Grouped Modules (Inner Items)
-   ========================================================================== */
-/* Strip backgrounds and borders from items that live inside groups */
-#workspaces,
-#window,
-#custom-cpu,
-#custom-mem,
-#custom-sys,
-#custom-gpu,
-#custom-disk-root,
-#custom-mpris,
-#custom-network,
-#custom-backlight,
-#clock, 
-#tray, 
-#custom-gamemode, 
-#custom-dnd, 
-#custom-power_status {
-  background-color: transparent;
-  border: none;
-  box-shadow: none;
-  margin: 0;
-  padding: 0 8px; 
-}
-
-/* Subtle vertical separator line between inner items */
-#custom-cpu, 
-#custom-mem,
-#custom-sys,
-#custom-gpu,
-#custom-disk-root,
-#custom-mpris,
-#custom-network,
-#tray, 
-#custom-gamemode, 
-#custom-dnd {
-  border-right: 1px solid alpha(@surface1, 0.5);
-  border-radius: 0;
-}
-
-/* ==========================================================================
-   Specific Module Overrides & Alerts
-   ========================================================================== */
-
-/* --- Workspaces --- */
-#workspaces {
-  padding: 0px 8px; /* Override the inner item padding */
-}
-
-#workspaces button {
-  padding: 0;
-  margin: 4px;
-  min-width: 12px;
-  min-height: 12px;
-  background-color: @subtext0;
-  color: transparent;
-  border-radius: 12px;
-}
-
-#workspaces button.active,
-#workspaces button.active:hover {
-  min-width: 30px;
-  background-color: @mauve;
-}
-
-#workspaces button:hover {
-  background-color: @lavender;
-  min-width: 20px;
-}
-
-#workspaces button.urgent {
-  background-color: @red;
-}
-
-/* --- Hardware Semantic Alerts --- */
-.normal { color: @mauve; }
-.high   { color: @peach; }
-.max    { color: @red; }
-
-#custom-network { color: @mauve; }
-#custom-gamemode.active { color: @mauve; }
-
-/* --- Media / Controls --- */
-#custom-volume.unmuted, 
-#custom-mic.unmuted {
-    color: @mauve;
-}
-#custom-volume.muted,
-#custom-mic.muted {
-  color: @overlay1;
-}
-
-/* --- Bluetooth Audio --- */
-#custom-bluetooth-audio.disabled,
-#custom-bluetooth-audio.disconnected {
-  color: @overlay1;
-}
-
-#custom-bluetooth-audio.connected {
-  color: @blue;
-}
-
-/* ANC States  */
-#custom-bluetooth-audio.anc-active,
-#custom-bluetooth-audio.connected.anc-active,
-#custom-bluetooth-audio.connected\ anc-active {
-  color: @mauve;
-}
-
-#custom-bluetooth-audio.anc-aware,
-#custom-bluetooth-audio.connected.anc-aware,
-#custom-bluetooth-audio.connected\ anc-aware {
-  color: @green;
-}
-
-#custom-bluetooth-audio.anc-off,
-#custom-bluetooth-audio.connected.anc-off,
-#custom-bluetooth-audio.connected\ anc-off {
-  color: @blue;
-}
-
-/* --- Power Status --- */
-#custom-power_status.charging { color: @green; }
-#custom-power_status.warning  { color: @peach; }
-#custom-power_status.critical {
-  color: @red;
-  animation: blink 1s infinite alternate;
-}
-
-
-/* Interactive Hover States for Standalone Modules */
-#custom-volume:hover,
-#custom-buds:hover,
-#custom-mic:hover,
-#custom-bluetooth-audio:hover,
-#custom-power_status:hover {
-  background-color: @surface1;
-  color: @mauve;
-}
-
-
-/* ==========================================================================
-   Tooltips & Animations
-   ========================================================================== */
-tooltip {
-  background-color: alpha(@base, 0.9);
-  border: 1px solid @surface1;
-  border-radius: 8px;
-}
-
-tooltip label {
-  color: @text;
-  padding: 8px;
-}
-
-@keyframes blink {
-  to {
-    color: @base;
-    background-color: @red;
-  }
-}
diff --git a/waybar/scripts/gpu-screen-recorder-status.sh b/waybar/scripts/gpu-screen-recorder-status.sh
deleted file mode 100755
index 3f67326..0000000
--- a/waybar/scripts/gpu-screen-recorder-status.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-PID_FILE="/tmp/gpu-screen-recorder.pid"
-FORMAT_RECORDING="<span size='large'></span>"
-FORMAT_STOPPED="<span size='large'></span>"
-
-if [ -f "$PID_FILE" ]; then
-    PID=$(cat "$PID_FILE")
-    if ps -p "$PID" > /dev/null; then
-        echo "{\"text\": \"$FORMAT_RECORDING\", \"tooltip\": \"Replay running\", \"class\": \"recording\"}"
-    else
-        # The process is not running, but the PID file exists.
-        # This can happen if the process crashed.
-        # We'll remove the stale PID file.
-        rm "$PID_FILE"
-    	echo "{\"text\": \"$FORMAT_STOPPED\", \"tooltip\": \"Replay paused\"}"
-    fi
-else
-	echo "{\"text\": \"$FORMAT_STOPPED\", \"tooltip\": \"Replay paused\"}"
-fi
diff --git a/waybar/scripts/toggle-replay.sh b/waybar/scripts/toggle-replay.sh
deleted file mode 100755
index 412eeb3..0000000
--- a/waybar/scripts/toggle-replay.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-PID_FILE="/tmp/gpu-screen-recorder.pid"
-
-if [ -f "$PID_FILE" ] && ps -p "$(cat "$PID_FILE")" > /dev/null; then
-    $HOME/.config/hypr/scripts/replay-ctrl.sh stop
-else
-    $HOME/.config/hypr/scripts/replay-ctrl.sh start
-fi
diff --git a/waybar/style.css b/waybar/style.css
deleted file mode 100644
index f9f958c..0000000
--- a/waybar/style.css
+++ /dev/null
@@ -1,218 +0,0 @@
-/* ~/.config/waybar/style.css */
-@import "./catppuccin-waybar/themes/mocha.css";
-
-/* ==========================================================================
-   Global Reset & Bar
-   ========================================================================== */
-* {
-  border: none;
-  border-radius: 12px;
-  min-height: 0;
-  font-family: "JetBrainsMono Nerd Font", sans-serif;
-  font-size: 12px;
-  transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
-}
-
-window#waybar {
-  background-color: transparent;
-  color: @text;
-}
-
-/* ==========================================================================
-   Base Islands (Containers)
-   ========================================================================== */
-/* Groups and standalone modules receive the floating island styling */
-#spaces,
-#powertray,
-#hardware,
-#center,
-#custom-bluetooth-audio,
-#custom-volume,
-#custom-buds,
-#custom-mic {
-  background-color: alpha(@surface0, 0.8);
-  margin: 4px 6px;
-  padding: 4px 16px;
-  border: 1px solid alpha(@surface1, 0.5);
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
-  color: @text;
-}
-
-/* Group-specific sizing overrides */
-#hardware,
-#powertray,
-#spaces {
-  border-radius: 24px;
-  padding: 4px 10px;
-}
-
-/* Center Pill (Clock + MPRIS) Override */
-#center {
-  background: linear-gradient(45deg, @mauve, @lavender);
-  color: @surface0; 
-  font-weight: 900;
-  padding: 4px 20px;
-}
-
-/* ==========================================================================
-   Grouped Modules (Inner Items)
-   ========================================================================== */
-/* Strip backgrounds and borders from items that live inside groups */
-#workspaces,
-#window,
-#custom-cpu,
-#custom-mem,
-#custom-sys,
-#custom-gpu,
-#custom-disk-root,
-#custom-mpris,
-#custom-network,
-#custom-backlight,
-#clock, 
-#tray, 
-#custom-gamemode, 
-#custom-dnd, 
-#custom-power_status {
-  background-color: transparent;
-  border: none;
-  box-shadow: none;
-  margin: 0;
-  padding: 0 8px; 
-}
-
-/* Subtle vertical separator line between inner items */
-#custom-cpu, 
-#custom-mem,
-#custom-sys,
-#custom-gpu,
-#custom-disk-root,
-#custom-mpris,
-#custom-network,
-#tray, 
-#custom-gamemode, 
-#custom-dnd {
-  border-right: 1px solid alpha(@surface1, 0.5);
-  border-radius: 0;
-}
-
-/* ==========================================================================
-   Specific Module Overrides & Alerts
-   ========================================================================== */
-
-/* --- Workspaces --- */
-#workspaces {
-  padding: 0px 8px; /* Override the inner item padding */
-}
-
-#workspaces button {
-  padding: 0;
-  margin: 4px;
-  min-width: 12px;
-  min-height: 12px;
-  background-color: @subtext0;
-  color: transparent;
-  border-radius: 12px;
-}
-
-#workspaces button.active,
-#workspaces button.active:hover {
-  min-width: 30px;
-  background-color: @mauve;
-}
-
-#workspaces button:hover {
-  background-color: @lavender;
-  min-width: 20px;
-}
-
-#workspaces button.urgent {
-  background-color: @red;
-}
-
-/* --- Hardware Semantic Alerts --- */
-.normal { color: @mauve; }
-.high   { color: @peach; }
-.max    { color: @red; }
-
-#custom-network { color: @mauve; }
-#custom-gamemode.active { color: @mauve; }
-
-/* --- Media / Controls --- */
-#custom-volume.unmuted, 
-#custom-mic.unmuted {
-    color: @mauve;
-}
-#custom-volume.muted,
-#custom-mic.muted {
-  color: @overlay1;
-}
-
-/* --- Bluetooth Audio --- */
-#custom-bluetooth-audio.disabled,
-#custom-bluetooth-audio.disconnected {
-  color: @overlay1;
-}
-
-#custom-bluetooth-audio.connected {
-  color: @blue;
-}
-
-/* ANC States  */
-#custom-bluetooth-audio.anc-active,
-#custom-bluetooth-audio.connected.anc-active,
-#custom-bluetooth-audio.connected\ anc-active {
-  color: @mauve;
-}
-
-#custom-bluetooth-audio.anc-aware,
-#custom-bluetooth-audio.connected.anc-aware,
-#custom-bluetooth-audio.connected\ anc-aware {
-  color: @green;
-}
-
-#custom-bluetooth-audio.anc-off,
-#custom-bluetooth-audio.connected.anc-off,
-#custom-bluetooth-audio.connected\ anc-off {
-  color: @blue;
-}
-
-/* --- Power Status --- */
-#custom-power_status.charging { color: @green; }
-#custom-power_status.warning  { color: @peach; }
-#custom-power_status.critical {
-  color: @red;
-  animation: blink 1s infinite alternate;
-}
-
-
-/* Interactive Hover States for Standalone Modules */
-#custom-volume:hover,
-#custom-buds:hover,
-#custom-mic:hover,
-#custom-bluetooth-audio:hover,
-#custom-power_status:hover {
-  background-color: @surface1;
-  color: @mauve;
-}
-
-
-/* ==========================================================================
-   Tooltips & Animations
-   ========================================================================== */
-tooltip {
-  background-color: alpha(@base, 0.9);
-  border: 1px solid @surface1;
-  border-radius: 8px;
-}
-
-tooltip label {
-  color: @text;
-  padding: 8px;
-}
-
-@keyframes blink {
-  to {
-    color: @base;
-    background-color: @red;
-  }
-}
diff --git a/zathura/catppuccin-mocha b/zathura/catppuccin-mocha
deleted file mode 120000
index 8555c83..0000000
--- a/zathura/catppuccin-mocha
+++ /dev/null
@@ -1 +0,0 @@
-catppuccin-zathura/src/catppuccin-mocha
\ No newline at end of file
diff --git a/zathura/catppuccin-zathura b/zathura/catppuccin-zathura
deleted file mode 160000
index 0adc530..0000000
--- a/zathura/catppuccin-zathura
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0adc53028d81bf047461bc61c43a484d11b15220