diff --git a/.config/hypr/conf/style/colors.lua b/.config/hypr/conf/style/colors.lua
index 126d6b1..a38680b 100644
--- a/.config/hypr/conf/style/colors.lua
+++ b/.config/hypr/conf/style/colors.lua
@@ -3,7 +3,7 @@
 hl.config({
     general = {
         col = {
-            active_border = "rgba(124326ff)",
+            active_border = { colors = {"rgba(124326ff)", "rgba(22aa2269)"}, angle = 45 },
             inactive_border = "rgba(080c08ff)",
         },
     },
diff --git a/.config/hypr/conf/style/general.lua b/.config/hypr/conf/style/general.lua
index 4b829d8..77a7773 100644
--- a/.config/hypr/conf/style/general.lua
+++ b/.config/hypr/conf/style/general.lua
@@ -2,9 +2,9 @@
 
 hl.config({
     general = {
-        gaps_in = 5,
-        gaps_out = 10,
-        border_size = 5,
+        gaps_in = 10,
+        gaps_out = 20,
+        border_size = 7,
         -- Set to true enable resizing windows by clicking and dragging on borders and gaps
         resize_on_border = false,
         -- Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
diff --git a/.config/hypr/conf/windows.lua b/.config/hypr/conf/windows.lua
index 44bc85b..267feb8 100644
--- a/.config/hypr/conf/windows.lua
+++ b/.config/hypr/conf/windows.lua
@@ -75,12 +75,13 @@ hl.window_rule({
 })
 
 hl.window_rule({
-    name = "btop",
+    name = "kitty",
     match = {
         class = "kitty",
     },
     float = true,
-    size = {1920, 1080}
+    size = {1920, 1080},
+    opacity = 0.8
 })
 
 -- Hyprland-run windowrule
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index 7c4bfed..5a3e00d 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,30 +1,30 @@
 source=./shared.conf
-preload = ~/.themes/Serpensortia/wallpaper/top.jxl
-preload = ~/.themes/Serpensortia/wallpaper/bottom.jxl
-preload = ~/.themes/Serpensortia/wallpaper/left.jxl
-preload = ~/.themes/Serpensortia/wallpaper/right.jxl
+preload = ~/.themes/Serpensortia/wallpaper/woods_u.jpg
+preload = ~/.themes/Serpensortia/wallpaper/woods_d.jpg
+preload = ~/.themes/Serpensortia/wallpaper/woods_l.jpg
+preload = ~/.themes/Serpensortia/wallpaper/woods_r.jpg
 
 wallpaper {
     monitor = $top-monitor
-    path = ~/.themes/Serpensortia/wallpaper/top.jxl
+    path = ~/.themes/Serpensortia/wallpaper/woods_u.jpg
     fit_mode = cover
     timeout = 1
 }
 wallpaper {
     monitor = $bottom-monitor
-    path = ~/.themes/Serpensortia/wallpaper/bottom.jxl
+    path = ~/.themes/Serpensortia/wallpaper/woods_d.jpg
     fit_mode = cover
     timeout = 1
 }
 wallpaper {
     monitor = $left-monitor
-    path = ~/.themes/Serpensortia/wallpaper/left.jxl
+    path = ~/.themes/Serpensortia/wallpaper/woods_l.jpg
     fit_mode = cover
     timeout = 1
 }
 wallpaper {
     monitor = $right-monitor
-    path = ~/.themes/Serpensortia/wallpaper/right.jxl
+    path = ~/.themes/Serpensortia/wallpaper/woods_r.jpg
     fit_mode = cover
     timeout = 1
 }
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 0aa1566..e123aaa 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -5,24 +5,30 @@
     "output": [
       "HDMI-A-1"
     ],
-    "margin-top": 14,
-    "margin-bottom": 0,
-    "margin-left": 14,
-    "margin-right": 14,
+    "margin-left": 20,
+    "margin-right": 20,
     "spacing": 0,
     "include": [
-      "~/.config/waybar/modules.jsonc"
+      "./modules/groups.jsonc",
+      "./modules/distro.jsonc",
+      "./modules/storage.jsonc",
+      "./modules/system.jsonc",
+      "./modules/workspace.jsonc",
+      "./modules/audio.jsonc",
+      "./modules/connections.jsonc",
+      "./modules/tray-notif.jsonc"
     ],
     "modules-left": [
-      "group/workspaces"
+      "hyprland/workspaces",
+      "hyprland/window"
     ],
-    // Load Modules
     "modules-center": [
     ],
     "modules-right": [
-      "mpd",
-      "group/hardware",
-      "tray"
+      "mpris",
+      "group/audio",
+      "group/tray-group",
+      "group/connections"
     ]
   },
   {
@@ -34,66 +40,21 @@
       "DP-2"
     ],
     "include": [
-      "~/.config/waybar/modules.jsonc"
+      "./modules/clock.jsonc",
+      "./modules/system.jsonc",
+      "./modules/groups.jsonc",
+      "./modules/storage.jsonc"
     ],
     "modules-left": [
       "clock#time",
-      "clock#date"
+      "clock"
     ],
     "modules-right": [
-      "cpu",
       "privacy",
-      "user",
-      "custom/exit"
-    ],
-    "clock#time": {
-      "format": "{:%H:%M:%S}",
-      "interval": 1,
-      "tooltip": false
-    },
-    "clock#date": {
-      "format": "{:%A %d %h %G}",
-      "tooltip-format": "<tt><big>{calendar}</big></tt>"
-    },
-    "user": {
-      "format": "{user} (up {work_d} days)",
-      "interval": 60,
-      "height": 30,
-      "width": 30,
-      "icon": true,
-    },
-    "privacy": {
-      "icon-spacing": 4,
-      "icon-size": 18,
-      "transition-duration": 250,
-      "modules": [
-        {
-          "type": "screenshare",
-          "tooltip": true,
-          "tooltip-icon-size": 24
-        },
-        {
-          "type": "audio-out",
-          "tooltip": true,
-          "tooltip-icon-size": 24
-        },
-        {
-          "type": "audio-in",
-          "tooltip": true,
-          "tooltip-icon-size": 24
-        }
-      ],
-      "ignore-monitor": true,
-      "ignore": [
-        {
-          "type": "audio-in",
-          "name": "cava"
-        },
-        {
-          "type": "screenshare",
-          "name": "obs"
-        }
-      ]
-    }
+      "group/storage",
+      "memory",
+      "cpu#bars",
+      "group/user-group"
+    ]
   }
 ]
diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc
deleted file mode 100644
index 607e732..0000000
--- a/.config/waybar/modules.jsonc
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "group/workspaces": {
-    "orientation": "inherit",
-    "modules": [
-      "hyprland/workspaces",
-      "hyprland/window"
-    ]
-  },
-  "hyprland/workspaces": {
-    "active-only": false,
-    "all-outputs": true,
-    "on-click": "activate",
-    "workspace-taskbar": {
-      "enable": true,
-      "active-window-position": "last",
-      "update-active-window": true,
-      "icon-theme": [
-        "Silvery-Dark-Icons"
-      ]
-    },
-    "format-icons": {
-      "active": ""
-    },
-    "format": "{icon} {windows}"
-  },
-  "hyprland/window": {
-    "format": "[{class}] {title}",
-    "rewrite": {
-      "(.*) - Vivaldi": "$1",
-      "(.*) - fish": "$1"
-    },
-    "separate-outputs": false
-  },
-  "custom/exit": {
-    "format": "",
-    "tooltip-format": "Powermenu",
-    "on-click": "wlogout -b 4",
-    "tooltip": false
-  },
-  // System tray
-  "tray": {
-    "orientation": "vertical",
-    "show-passive-items": true,
-    // "icon-size": 21,
-    "spacing": 10
-  },
-  // Clock
-  "clock": {
-    // "timezone": "America/New_York",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format-alt": "{:%Y-%m-%d}"
-  },
-  // System
-  "custom/system": {
-    "format": "",
-    "tooltip": false
-  },
-  // CPU
-  "cpu": {
-    "interval": 1,
-    "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
-    "format-icons": [
-      "<span color='#69ff94'>▁</span>", // green
-      "<span color='#2aa9ff'>▂</span>", // blue
-      "<span color='#f8f8f2'>▃</span>", // white
-      "<span color='#f8f8f2'>▄</span>", // white
-      "<span color='#ffffa5'>▅</span>", // yellow
-      "<span color='#ffffa5'>▆</span>", // yellow
-      "<span color='#ff9977'>▇</span>", // orange
-      "<span color='#dd532e'>█</span>"  // red
-    ],
-    "on-click": "kitty -e htop"
-  },
-  // Memory
-  "memory": {
-    "format": "/ M {}% ",
-    "on-click": "kitty -e htop"
-  },
-  // Harddisc space used
-  "disk": {
-    "interval": 30,
-    "format": "D {percentage_used}% ",
-    "path": "/",
-    "on-click": "kitty -e htop"
-  },
-  "hyprland/language": {
-    "format": "/ K {short}"
-  },
-  // Group Hardware
-  "group/hardware": {
-    "orientation": "inherit",
-    "drawer": {
-      "transition-duration": 300,
-      "children-class": "not-memory",
-      "transition-left-to-right": false
-    },
-    "modules": [
-      "custom/system",
-      "pulseaudio",
-      "network",
-      "disk",
-      "memory",
-      "hyprland/language"
-    ]
-  },
-  // Network
-  "network": {
-    "format": "{ifname}",
-    "format-wifi": " {essid} ({signalStrength}%)",
-    "format-ethernet": "  {ifname}",
-    "format-disconnected": "Disconnected ⚠",
-    "tooltip-format": " {ifname} via {gwaddri}",
-    "tooltip-format-wifi": "  {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
-    "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
-    "tooltip-format-disconnected": "Disconnected",
-    "max-length": 50,
-    "on-click": "~/.config/ml4w/settings/networkmanager.sh",
-    "on-click-right": "~/.config/ml4w/scripts/nm-applet.sh toggle"
-  },
-  // Pulseaudio
-  "pulseaudio": {
-    // "scroll-step": 1, // %, can be a float
-    "format": "{icon}  {volume}%",
-    "format-bluetooth": "{volume}% {icon}",
-    "format-bluetooth-muted": " {icon}",
-    "format-muted": "",
-    "format-source": "{volume}% ",
-    "format-source-muted": "",
-    "format-icons": {
-      "default": [
-        "",
-        " ",
-        " "
-      ]
-    },
-    "on-click": "pavucontrol"
-  },
-  // Bluetooth
-  "bluetooth": {
-    "format-disabled": "",
-    "format-off": "",
-    "interval": 30,
-    "on-click": "blueman-manager",
-    "format-no-controller": ""
-  },
-  // Other
-  "user": {
-    "format": "{user}",
-    "interval": 60,
-    "icon": false
-  },
-  // Idle Inhibator
-  "idle_inhibitor": {
-    "format": "{icon}",
-    "tooltip": true,
-    "format-icons": {
-      "activated": "",
-      "deactivated": ""
-    },
-    "on-click-right": "hyprlock"
-  }
-}
diff --git a/.config/waybar/modules/audio.jsonc b/.config/waybar/modules/audio.jsonc
new file mode 100644
index 0000000..fe14c55
--- /dev/null
+++ b/.config/waybar/modules/audio.jsonc
@@ -0,0 +1,41 @@
+{
+  "pulseaudio": {
+    "format": "{icon}",
+    "format-muted": "",
+    "format-icons": {
+      "headphone": "󰋋",
+      "headset": "󰋋",
+      "hands-free": "󰋋",
+      "default": [
+        "",
+        "",
+        ""
+      ]
+    },
+    "on-click": "pavucontrol",
+    "tooltip-format": "Output: {volume}%"
+  },
+  "pulseaudio#microphone": {
+    "format": "{format_source}",
+    "format-source": "",
+    "format-source-muted": ""
+  },
+  "pulseaudio/slider": {
+    "min": 0,
+    "max": 100,
+    "orientation": "horizontal"
+  },
+  "mpris": {
+    "format": "{player_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "player-icons": {
+      "default": "▶",
+      "mpv": "🎵"
+    },
+    "status-icons": {
+      "paused": "⏸"
+    },
+    "on-click-middle": "",
+    "on-click-right": "hyprctl dispatch 'hl.dsp.focus({window = \"class:deezer-desktop\"})'"
+  }
+}
diff --git a/.config/waybar/modules/clock.jsonc b/.config/waybar/modules/clock.jsonc
new file mode 100644
index 0000000..a1ae042
--- /dev/null
+++ b/.config/waybar/modules/clock.jsonc
@@ -0,0 +1,31 @@
+{
+  // Clock
+  "clock": {
+    "format": "{:%A, %d %B, %Y}",
+    "tooltip-format": "<span size='10pt' font='Fira Code'>{calendar}</span>",
+    "calendar": {
+      "mode"          : "year",
+      "mode-mon-col"  : 3,
+      "weeks-pos"     : "right",
+      "on-scroll"     : 1,
+      "on-click-right": "mode",
+      "format": {
+        "months":     "<span color='#c0c0c0'><b>{}</b></span>",
+        "days":       "<span color='#c0c0c0'><b>{}</b></span>",
+        "weeks":      "<span color='#12aa26'><b>W{}</b></span>",
+        "weekdays":   "<span color='#12aa26'><b>{}</b></span>",
+        "today":      "<span color='#12aa26'><b>{}</b></span>"
+      }
+    },
+    "actions": {
+      "on-click-right": "mode",
+      "on-scroll-up": "shift_up",
+      "on-scroll-down": "shift_down"
+    }
+  },
+  "clock#time": {
+    "format": "{:%H:%M:%S}",
+    "interval": 1,
+    "tooltip": false
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/connections.jsonc b/.config/waybar/modules/connections.jsonc
new file mode 100644
index 0000000..ad6caad
--- /dev/null
+++ b/.config/waybar/modules/connections.jsonc
@@ -0,0 +1,33 @@
+{
+  "network": {
+    "format-wifi": "{icon}",
+    "format-ethernet": "",
+    "format-linked": "󱘖",
+    "format-disconnected": "󰤣",
+    "format-disabled": "󰤮",
+    "format-icons": [
+      "󰤯",
+      "󰤟",
+      "󰤢",
+      "󰤥",
+      "󰤨"
+    ],
+    "tooltip-format-disconnected": "No Connection",
+    "tooltip-format-disabled": "Wi-Fi is OFF",
+    "tooltip-format-wifi": "󱄙  {essid} ({signalStrength}%)\n\n󰐻  Freq: {frequency}GHz\n  {bandwidthDownBytes}   {bandwidthUpBytes}",
+    "tooltip-format-ethernet": "󰈀  {ifname} (Connected)\n  {bandwidthDownBytes}   {bandwidthUpBytes}",
+    "tooltip-format-linked": "󱘖 {ifname}: No IP Address",
+    "on-click": "nm-applet --indicator",
+    "on-click-right": "pkill nm-applet"
+  },
+  "bluetooth": {
+    "format": "󰂯",
+    "format-connected": "󰂱",
+    "format-disabled": "󰂲",
+    "tooltip-format": "{controller_alias} {status}",
+    "tooltip-format-connected": "󰐻  {num_connections} Connected:\n{device_enumerate}",
+    "tooltip-format-enumerate-connected-battery": "󰂱  {device_alias} (󰠠  {device_battery_percentage}%)",
+    "on-click": "blueman-manager",
+    "on-click-right": "rfkill toggle bluetooth"
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/distro.jsonc b/.config/waybar/modules/distro.jsonc
new file mode 100644
index 0000000..5415960
--- /dev/null
+++ b/.config/waybar/modules/distro.jsonc
@@ -0,0 +1,16 @@
+{
+  "custom/distro": {
+    "format": "\uF385",
+    "tooltip": false
+  },
+  "custom/terminal": {
+    "format": "󰆍",
+    "on-click": "kitty",
+    "tooltip": false
+  },
+  "custom/files": {
+    "format": "",
+    "on-click": "thunar",
+    "tooltip": false
+  },
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/groups.jsonc b/.config/waybar/modules/groups.jsonc
new file mode 100644
index 0000000..e8f329c
--- /dev/null
+++ b/.config/waybar/modules/groups.jsonc
@@ -0,0 +1,78 @@
+{
+  "group/now-playing": {
+    "orientation": "inherit",
+    "modules": [
+      "custom/deezer"
+    ]
+  },
+  "group/user-group": {
+    "orientation": "horizontal",
+    "modules": [
+      "user",
+      "custom/exit"
+    ]
+  },
+  "group/distro-group": {
+    "orientation": "horizontal",
+    "drawer": {
+      "transition-duration": 650,
+      "transition-left-to-right": true
+    },
+    "modules": [
+      "custom/distro",
+      "custom/terminal",
+      "custom/files"
+    ]
+  },
+  "group/storage": {
+    "orientation": "vertical",
+    "modules": [
+      "disk#root",
+      "disk#duke",
+      "disk#edwin",
+      "disk#fridolin",
+      "disk#gregor",
+      "disk#nextcloud"
+    ]
+  },
+  "group/system": {
+    "orientation": "horizontal",
+    "modules": [
+      "temperature",
+      "cpu"
+    ]
+  },
+  "group/audio": {
+    "orientation": "horizontal",
+    "drawer": {
+      "transition-duration": 650,
+      "transition-left-to-right": false
+    },
+    "modules": [
+      "pulseaudio",
+      "pulseaudio/slider",
+      "pulseaudio#microphone"
+    ]
+  },
+  "group/connections": {
+    "orientation": "horizontal",
+    "drawer": {
+      "transition-duration": 500,
+      "transition-left-to-right": false
+    },
+    "modules": [
+      "network",
+      "bluetooth"
+    ]
+  },
+  "group/tray-group": {
+    "orientation": "horizontal",
+    "drawer": {
+      "transition-duration": 500,
+      "transition-left-to-right": false
+    },
+    "modules": [
+      "tray"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/idle-inhibitor.jsonc b/.config/waybar/modules/idle-inhibitor.jsonc
new file mode 100644
index 0000000..42ad415
--- /dev/null
+++ b/.config/waybar/modules/idle-inhibitor.jsonc
@@ -0,0 +1,11 @@
+{
+  "idle_inhibitor": {
+    "format": "{icon}",
+    "format-icons": {
+      "activated": "󰛨",
+      "deactivated": "󰛩"
+    },
+    "tooltip-format-activated": "System Focused",
+    "tooltip-format-deactivated": "Normal Mode"
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/storage.jsonc b/.config/waybar/modules/storage.jsonc
new file mode 100644
index 0000000..a69f3a0
--- /dev/null
+++ b/.config/waybar/modules/storage.jsonc
@@ -0,0 +1,59 @@
+{
+  "disk#root": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>root</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/",
+    "separator": "\n",
+    "align": 1
+  },
+  "disk#duke": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>duke</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/media/duke/",
+    "separator": "\n",
+    "align": 1
+  },
+  "disk#edwin": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>edwin</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/media/edwin/",
+    "separator": "\n",
+    "align": 1
+  },
+  "disk#fridolin": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>fridolin</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/media/fridolin/",
+    "separator": "\n",
+    "align": 1
+  },
+  "disk#gregor": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>gregor</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/media/gregor/",
+    "separator": "\n",
+    "align": 1
+  },
+  "disk#nextcloud": {
+    "interval": 30,
+    "format": "<span color='#12aa26'>nextcloud</span> ({percentage_used}%)",
+    "header": "Disks: ",
+    "path": "/media/nextcloud/",
+    "separator": "\n",
+    "align": 1
+  },
+  "memory": {
+    "tooltip": true,
+    "interval": 15,
+    "format": "{used:0.1f}G/{total:0.1f}G",
+    "states": {
+      "warning": 75,
+      "critical": 85
+    }
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/system.jsonc b/.config/waybar/modules/system.jsonc
new file mode 100644
index 0000000..79019c3
--- /dev/null
+++ b/.config/waybar/modules/system.jsonc
@@ -0,0 +1,89 @@
+{
+  "cpu": {
+    "tooltip": false,
+    "interval": 10,
+    "format": "󰻠",
+    "format-alt": "󰻠 <span size='11pt'>{usage}%</span>",
+    "states": {
+      "warning": 75,
+      "critical": 90
+    },
+    "on-click": "btop"
+  },
+  "cpu#bars": {
+    "interval": 1,
+    "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}",
+    "format-icons": [
+      "<span color='#69ff94'>▁</span>", // green
+      "<span color='#2aa9ff'>▂</span>", // blue
+      "<span color='#f8f8f2'>▃</span>", // white
+      "<span color='#f8f8f2'>▄</span>", // white
+      "<span color='#ffffa5'>▅</span>", // yellow
+      "<span color='#ffffa5'>▆</span>", // yellow
+      "<span color='#ff9977'>▇</span>", // orange
+      "<span color='#dd532e'>█</span>"  // red
+    ],
+    "on-click": "btop"
+  },
+
+  "temperature": {
+    "tooltip": false,
+    "interval": 10,
+    "thermal-zone": 8,
+    "critical-threshold": 80,
+    "format": "{icon}",
+    "format-alt": "{icon} <span size='11pt'>{temperatureC}°C</span>",
+    "format-critical": "<span size='12pt'>󱗗 </span><span size='11pt'>{temperatureC}°C</span>",
+    "format-icons": [
+      "",
+      "",
+      ""
+    ]
+  },
+  "custom/exit": {
+    "format": "\uF011",
+    "tooltip-format": "Powermenu",
+    "on-click": "wlogout -b 4"
+  },
+  "user": {
+    "format": "{user} (up {work_d} days)",
+    "interval": 60,
+    "height": 30,
+    "width": 30,
+    "icon": true,
+    "tooltip": true
+  },
+  "privacy": {
+    "icon-spacing": 4,
+    "icon-size": 18,
+    "transition-duration": 250,
+    "modules": [
+      {
+        "type": "screenshare",
+        "tooltip": true,
+        "tooltip-icon-size": 24
+      },
+      {
+        "type": "audio-out",
+        "tooltip": true,
+        "tooltip-icon-size": 24
+      },
+      {
+        "type": "audio-in",
+        "tooltip": true,
+        "tooltip-icon-size": 24
+      }
+    ],
+    "ignore-monitor": true,
+    "ignore": [
+      {
+        "type": "audio-in",
+        "name": "cava"
+      },
+      {
+        "type": "screenshare",
+        "name": "obs"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/tray-notif.jsonc b/.config/waybar/modules/tray-notif.jsonc
new file mode 100644
index 0000000..decfc0d
--- /dev/null
+++ b/.config/waybar/modules/tray-notif.jsonc
@@ -0,0 +1,7 @@
+{
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10,
+    "show-passive-items": true
+  }
+}
\ No newline at end of file
diff --git a/.config/waybar/modules/workspace.jsonc b/.config/waybar/modules/workspace.jsonc
new file mode 100644
index 0000000..5265dad
--- /dev/null
+++ b/.config/waybar/modules/workspace.jsonc
@@ -0,0 +1,27 @@
+{
+  "hyprland/workspaces": {
+    "active-only": false,
+    "all-outputs": true,
+    "show-special": true,
+    "workspace-taskbar": {
+      "enable": true,
+      "active-window-position": "last",
+      "update-active-window": true,
+      "icon-theme": [
+        "Silvery-Dark-Icons"
+      ]
+    },
+    "format-icons": {
+      "active": ""
+    },
+    "format": "{icon} {windows}"
+  },
+  "hyprland/window": {
+    "format": "[{class}] {title}",
+    "rewrite": {
+      "(.*) - Vivaldi": "$1",
+      "(.*) - fish": "$1"
+    },
+    "separate-outputs": false
+  }
+}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index baca2b6..6d7df66 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1 +1,17 @@
-@import url("file:////home/arindy/.themes/Serpensortia/waybar/style.css");
\ No newline at end of file
+@import "tokens/colors.css";
+@import "tokens/workspace.css";
+@import "tokens/widget.css";
+@import "tokens/slider.css";
+
+* {
+    margin: 0;
+    padding: 1px;
+    min-height: 0px;
+    border: none;
+    border-radius: 0;
+    font-family: "Fira Sans Semibold", "Font Awesome 7 Free", "Font Awesome 7 Brands", "Font Awesome 6 Free", "Font Awesome 6 Brands", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+}
+
+window#waybar {
+    background: transparent;
+}
\ No newline at end of file
diff --git a/.config/waybar/tokens/colors.css b/.config/waybar/tokens/colors.css
new file mode 100644
index 0000000..a7772df
--- /dev/null
+++ b/.config/waybar/tokens/colors.css
@@ -0,0 +1,124 @@
+@define-color backgroundlight #080c08;
+@define-color backgrounddark #080c08;
+@define-color workspacesbackground1 #080c08;
+@define-color workspacesbackground2 #424a42;
+@define-color bordercolor #124326;
+@define-color textcolor1 #c0c0c0;
+@define-color textcolor2 #c0c0c0;
+@define-color textcolor3 #c0c0c0;
+@define-color iconcolor #c0c0c0;
+/*
+
+{
+
+!*@define-color *! backgroundlight #080c08;
+!*@define-color *! backgrounddark #080c08;
+!*@define-color *! workspacesbackground1 #080c08;
+!*@define-color *! workspacesbackground2 #424a42;
+!*@define-color *! bordercolor #124326;
+!*@define-color *! textcolor1 #c0c0c0;
+!*@define-color *! textcolor2 #c0c0c0;
+!*@define-color *! textcolor3 #c0c0c0;
+!*@define-color *! iconcolor #c0c0c0;
+
+!*@define-color *! background #080c08;
+
+!*@define-color *! error #ffb4ab;
+
+!*@define-color *! error_container #93000a;
+
+!*@define-color *! inverse_on_surface #2c3134;
+
+!*@define-color *! inverse_primary #08677f;
+
+!*@define-color *! inverse_surface #dee3e6;
+
+!*@define-color *! on_background #dee3e6;
+
+!*@define-color *! on_error #690005;
+
+!*@define-color *! on_error_container #ffdad6;
+
+!*@define-color *! on_primary #003544;
+
+!*@define-color *! on_primary_container #b8eaff;
+
+!*@define-color *! on_primary_fixed #001f28;
+
+!*@define-color *! on_primary_fixed_variant #004d61;
+
+!*@define-color *! on_secondary #1e333b;
+
+!*@define-color *! on_secondary_container #cfe6f1;
+
+!*@define-color *! on_secondary_fixed #071e26;
+
+!*@define-color *! on_secondary_fixed_variant #344a52;
+
+!*@define-color *! on_surface #dee3e6;
+
+!*@define-color *! on_surface_variant #bfc8cc;
+
+!*@define-color *! on_tertiary #2c2e4d;
+
+!*@define-color *! on_tertiary_container #e1e0ff;
+
+!*@define-color *! on_tertiary_fixed #171837;
+
+!*@define-color *! on_tertiary_fixed_variant #434465;
+
+!*@define-color *! outline #8a9296;
+
+!*@define-color *! outline_variant #40484c;
+
+!*@define-color *! primary #88d1ec;
+
+!*@define-color *! primary_container #004d61;
+
+!*@define-color *! primary_fixed #b8eaff;
+
+!*@define-color *! primary_fixed_dim #88d1ec;
+
+!*@define-color *! scrim #000000;
+
+!*@define-color *! secondary #b3cad4;
+
+!*@define-color *! secondary_container #344a52;
+
+!*@define-color *! secondary_fixed #cfe6f1;
+
+!*@define-color *! secondary_fixed_dim #b3cad4;
+
+!*@define-color *! shadow #000000;
+
+!*@define-color *! source_color #25738b;
+
+!*@define-color *! surface #0f1416;
+
+!*@define-color *! surface_bright #353a3d;
+
+!*@define-color *! surface_container #1b2023;
+
+!*@define-color *! surface_container_high #252b2d;
+
+!*@define-color *! surface_container_highest #303638;
+
+!*@define-color *! surface_container_low #171c1f;
+
+!*@define-color *! surface_container_lowest #0a0f11;
+
+!*@define-color *! surface_dim #0f1416;
+
+!*@define-color *! surface_tint #88d1ec;
+
+!*@define-color *! surface_variant #40484c;
+
+!*@define-color *! tertiary #c3c3eb;
+
+!*@define-color *! tertiary_container #434465;
+
+!*@define-color *! tertiary_fixed #e1e0ff;
+
+!*@define-color *! tertiary_fixed_dim #c3c3eb;
+}
+*/
diff --git a/.config/waybar/tokens/slider.css b/.config/waybar/tokens/slider.css
new file mode 100644
index 0000000..6546229
--- /dev/null
+++ b/.config/waybar/tokens/slider.css
@@ -0,0 +1,29 @@
+@import "colors.css";
+
+#pulseaudio-slider {
+    margin: 4px 5px;
+    padding: 0 2px;
+    background-color: transparent;
+    border-radius: 20px;
+}
+
+#pulseaudio-slider trough {
+    min-height: 10px;
+    min-width: 80px;
+    border-radius: 10px;
+    background-color: @workspacesbackground2;
+}
+
+#pulseaudio-slider highlight {
+    min-height: 10px;
+    border-radius: 10px;
+    background-color: @iconcolor;
+}
+
+#pulseaudio-slider slider {
+    min-height: 12px;
+    min-width: 12px;
+    margin: -2px 0;
+    border-radius: 100%;
+    background-color: @bordercolor;
+}
\ No newline at end of file
diff --git a/.config/waybar/tokens/widget.css b/.config/waybar/tokens/widget.css
new file mode 100644
index 0000000..37d7023
--- /dev/null
+++ b/.config/waybar/tokens/widget.css
@@ -0,0 +1,101 @@
+@import "colors.css";
+
+/*======= MODULE INDEPENDENT =======*/
+#distro-group {
+    margin: 4px 5px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    color: @bordercolor;
+}
+
+#custom-distro {
+    color: @bordercolor;
+    padding: 6px 15px 6px 10px;
+}
+
+#custom-terminal {
+    color: #a6e3a1;
+    padding: 0px 10px;
+}
+
+#custom-files {
+    color: #f9e2af;
+    padding: 0px 10px 0px 8px;
+}
+
+#mpris {
+    padding: 0px 10px;
+    margin: 4px 5px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    border: 3px solid @bordercolor;
+}
+
+#custom-browser {
+    color: #fab387;
+    padding: 0px 15px 0px 10px;
+}
+
+#power-profiles-daemon,
+#idle_inhibitor {
+    margin: 4px 5px;
+    padding: 6px 15px 6px 10px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    color: @secondary_fixed_dim;
+}
+
+/*======= MODULE CAPSUL =======*/
+#audio,
+#connections,
+#system,
+#storage {
+    margin: 4px 5px;
+    padding: 6px 6px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    color: @secondary_fixed_dim;
+    border: 3px solid @bordercolor;
+
+}
+
+#disk,
+#memory,
+#cpu,
+#temperature,
+#bluetooth {
+    margin-right: 2px;
+    padding: 0 8px;
+}
+
+#network {
+    padding: 0px 10px 0px 4px;
+}
+
+#pulseaudio {
+    margin-right: 12px;
+    margin-left: 8px;
+}
+
+/*======= TRAY =======*/
+#tray-group {
+    margin: 4px 5px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    border: 3px solid @bordercolor;
+}
+
+#custom-tray-arrow {
+    padding: 6px 14px 6px 10px;
+    color: @bordercolor;
+}
+
+#tray {
+    padding: 6px 10px;
+}
+
+#tray>.passive,
+#tray>.active,
+#tray>.needs-attention {
+    -gtk-icon-effect: none;
+}
\ No newline at end of file
diff --git a/.config/waybar/tokens/workspace.css b/.config/waybar/tokens/workspace.css
new file mode 100644
index 0000000..bbd3ddd
--- /dev/null
+++ b/.config/waybar/tokens/workspace.css
@@ -0,0 +1,87 @@
+@import "colors.css";
+
+#window,
+#cpu,
+#privacy,
+#workspaces,
+#user-group,
+#memory,
+#custom-exit,
+#clock {
+    margin: 4px 5px;
+    padding: 6px 6px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    transition: all 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    border: 3px solid @bordercolor;
+}
+
+tooltip {
+    padding: 10px;
+    background-color: @backgrounddark;
+    border-radius: 20px;
+    transition: all 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    border: 3px solid @bordercolor;
+
+}
+
+#cpu.bars {
+    min-height: 100px;
+}
+
+.calendar-today,
+.calendar-days,
+.calendar-weeks,
+.calendar-months {
+    color: @bordercolor;
+}
+
+.calendar-weekdays {
+    color: @textcolor1;
+}
+
+#workspaces button {
+    min-width: 32px;
+    padding: 0 4px;
+    margin: 0 2px;
+    background: transparent;
+    border-radius: 16px;
+    color: @tertiary;
+}
+
+#workspaces button.active {
+    padding: 0 12px;
+    margin: 0 2px;
+    background-color: @bordercolor;
+    color: @on_primary;
+}
+
+#workspaces button.special {
+    color: @tertiary_fixed;
+}
+
+#workspaces button:hover {
+    background-color: @backgrounddark_highest;
+    color: @bordercolor;
+}
+
+#workspaces button.active:hover {
+    background-color: @bordercolor;
+    color: @on_primary;
+}
+
+#workspaces button.empty {
+    color: @workspacesbackground2;
+}
+
+#workspaces button.urgent {
+    color: @error_container;
+}
+
+#workspaces button label:first-child {
+    margin-right: 8px;
+}
+
+#workspaces button label:last-child {
+    margin-left: 2px;
+}
\ No newline at end of file
diff --git a/.themes/Serpensortia/wallpaper/cat_d.jpg b/.themes/Serpensortia/wallpaper/cat_d.jpg
new file mode 100644
index 0000000..e0c0c80
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/cat_d.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/cat_l.jpg b/.themes/Serpensortia/wallpaper/cat_l.jpg
new file mode 100644
index 0000000..921a86e
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/cat_l.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/cat_r.jpg b/.themes/Serpensortia/wallpaper/cat_r.jpg
new file mode 100644
index 0000000..9fe391d
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/cat_r.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/cat_u.jpg b/.themes/Serpensortia/wallpaper/cat_u.jpg
new file mode 100644
index 0000000..636eeff
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/cat_u.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/woods_d.jpg b/.themes/Serpensortia/wallpaper/woods_d.jpg
new file mode 100644
index 0000000..fabd1b4
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/woods_d.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/woods_l.jpg b/.themes/Serpensortia/wallpaper/woods_l.jpg
new file mode 100644
index 0000000..b9d3ffe
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/woods_l.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/woods_r.jpg b/.themes/Serpensortia/wallpaper/woods_r.jpg
new file mode 100644
index 0000000..7c8c28f
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/woods_r.jpg differ
diff --git a/.themes/Serpensortia/wallpaper/woods_u.jpg b/.themes/Serpensortia/wallpaper/woods_u.jpg
new file mode 100644
index 0000000..de76a73
Binary files /dev/null and b/.themes/Serpensortia/wallpaper/woods_u.jpg differ