diff --git a/.config/btop/themes/catppuccin.theme b/.config/btop/themes/catppuccin.theme
index 82ac1d0..86819d2 100644
--- a/.config/btop/themes/catppuccin.theme
+++ b/.config/btop/themes/catppuccin.theme
@@ -1,83 +1,83 @@
 # Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#eff1f5"
+theme[main_bg]="#24273A"
 
 # Main text color
-theme[main_fg]="#4c4f69"
+theme[main_fg]="#CAD3F5"
 
 # Title color for boxes
-theme[title]="#4c4f69"
+theme[title]="#CAD3F5"
 
 # Highlight color for keyboard shortcuts
-theme[hi_fg]="#1e66f5"
+theme[hi_fg]="#8AADF4"
 
 # Background color of selected item in processes box
-theme[selected_bg]="#bcc0cc"
+theme[selected_bg]="#494D64"
 
 # Foreground color of selected item in processes box
-theme[selected_fg]="#1e66f5"
+theme[selected_fg]="#8AADF4"
 
 # Color of inactive/disabled text
-theme[inactive_fg]="#8c8fa1"
+theme[inactive_fg]="#8087A2"
 
 # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#dc8a78"
+theme[graph_text]="#F4DBD6"
 
 # Background color of the percentage meters
-theme[meter_bg]="#bcc0cc"
+theme[meter_bg]="#494D64"
 
 # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#dc8a78"
+theme[proc_misc]="#F4DBD6"
 
 # CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#8839ef" #Mauve
-theme[mem_box]="#40a02b" #Green
-theme[net_box]="#e64553" #Maroon
-theme[proc_box]="#1e66f5" #Blue
+theme[cpu_box]="#c6a0f6" #Mauve
+theme[mem_box]="#a6da95" #Green
+theme[net_box]="#ee99a0" #Maroon
+theme[proc_box]="#8aadf4" #Blue
 
 # Box divider line and small boxes line color
-theme[div_line]="#9ca0b0"
+theme[div_line]="#6E738D"
 
 # Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#40a02b"
-theme[temp_mid]="#df8e1d"
-theme[temp_end]="#d20f39"
+theme[temp_start]="#a6da95"
+theme[temp_mid]="#eed49f"
+theme[temp_end]="#ed8796"
 
 # CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#179299"
-theme[cpu_mid]="#209fb5"
-theme[cpu_end]="#7287fd"
+theme[cpu_start]="#8bd5ca"
+theme[cpu_mid]="#7dc4e4"
+theme[cpu_end]="#b7bdf8"
 
 # Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#8839ef"
-theme[free_mid]="#7287fd"
-theme[free_end]="#1e66f5"
+theme[free_start]="#c6a0f6"
+theme[free_mid]="#b7bdf8"
+theme[free_end]="#8aadf4"
 
 # Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#209fb5"
-theme[cached_mid]="#1e66f5"
-theme[cached_end]="#7287fd"
+theme[cached_start]="#7dc4e4"
+theme[cached_mid]="#8aadf4"
+theme[cached_end]="#b7bdf8"
 
 # Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#fe640b"
-theme[available_mid]="#e64553"
-theme[available_end]="#d20f39"
+theme[available_start]="#f5a97f"
+theme[available_mid]="#ee99a0"
+theme[available_end]="#ed8796"
 
 # Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#40a02b"
-theme[used_mid]="#179299"
-theme[used_end]="#04a5e5"
+theme[used_start]="#a6da95"
+theme[used_mid]="#8bd5ca"
+theme[used_end]="#91d7e3"
 
 # Download graph colors (Peach -> Red)
-theme[download_start]="#fe640b"
-theme[download_mid]="#e64553"
-theme[download_end]="#d20f39"
+theme[download_start]="#f5a97f"
+theme[download_mid]="#ee99a0"
+theme[download_end]="#ed8796"
 
 # Upload graph colors (Green -> Sky)
-theme[upload_start]="#40a02b"
-theme[upload_mid]="#179299"
-theme[upload_end]="#04a5e5"
+theme[upload_start]="#a6da95"
+theme[upload_mid]="#8bd5ca"
+theme[upload_end]="#91d7e3"
 
 # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#209fb5"
-theme[process_mid]="#7287fd"
-theme[process_end]="#8839ef"
+theme[process_start]="#7dc4e4"
+theme[process_mid]="#b7bdf8"
+theme[process_end]="#c6a0f6"
diff --git a/.config/hypr/hyprpanel.json b/.config/hypr/hyprpanel.json
index 8587549..ad125d8 100644
--- a/.config/hypr/hyprpanel.json
+++ b/.config/hypr/hyprpanel.json
@@ -8,7 +8,7 @@
   "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Firefox",
   "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
   "menus.dashboard.stats.enable_gpu": false,
-  "theme.bar.floating": false,
+  "theme.bar.floating": true,
   "bar.workspaces.show_icons": false,
   "menus.clock.weather.unit": "metric",
   "bar.layouts": {
@@ -16,17 +16,17 @@
       "left": [
         "dashboard",
         "workspaces",
-        "media"
+        "windowtitle"
       ],
       "middle": [
-        "clock"
+        "media"
       ],
       "right": [
         "updates",
         "volume",
+        "clock",
         "systray",
-        "notifications",
-        "power"
+        "notifications"
       ]
     }
   },
@@ -62,15 +62,15 @@
   "menus.clock.weather.key": "50177474d9b04f2993d150045230106",
   "menus.dashboard.powermenu.avatar.image": "/home/thomas/Images/face.png",
   "bar.network.label": true,
-  "theme.bar.transparent": true,
-  "theme.bar.menus.monochrome": true,
+  "theme.bar.transparent": false,
+  "theme.bar.menus.monochrome": false,
   "theme.matugen_settings.scheme_type": "tonal-spot",
   "wallpaper.enable": false,
   "bar.media.show_artist": false,
   "bar.notifications.show_total": false,
   "bar.battery.label": true,
   "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Lock",
-  "theme.bar.outer_spacing": "0.5em",
+  "theme.bar.outer_spacing": "0.4em",
   "bar.customModules.updates.pollingInterval": 1440000,
   "notifications.ignore": [
     "openfortigui",
@@ -89,27 +89,27 @@
   "bar.customModules.netstat.icon": "󰖟",
   "bar.customModules.storage.icon": "󰋊",
   "bar.customModules.updates.updateCommand": "$HOME/.config/ags/scripts/checkUpdates.sh -arch",
-  "theme.bar.buttons.enableBorders": true,
+  "theme.bar.buttons.enableBorders": false,
   "theme.bar.buttons.modules.netstat.enableBorder": false,
   "bar.customModules.storage.pollingInterval": 8000,
-  "theme.bar.buttons.y_margins": "0.5em",
+  "theme.bar.buttons.y_margins": "0.2em",
   "theme.bar.buttons.borderSize": "0.1em",
   "theme.bar.buttons.spacing": "0.3em",
   "theme.bar.buttons.workspaces.enableBorder": false,
-  "bar.workspaces.showWsIcons": true,
-  "bar.workspaces.workspaces": 1,
+  "bar.workspaces.showWsIcons": false,
+  "bar.workspaces.workspaces": 5,
   "bar.workspaces.workspaceMask": false,
   "bar.workspaces.hideUnoccupied": true,
-  "theme.bar.buttons.monochrome": true,
+  "theme.bar.buttons.monochrome": false,
   "bar.workspaces.numbered_active_indicator": "color",
   "theme.bar.buttons.workspaces.smartHighlight": true,
   "bar.workspaces.workspaceIconMap": {},
   "bar.workspaces.showAllActive": false,
   "bar.workspaces.applicationIconMap": {},
-  "bar.workspaces.showApplicationIcons": true,
-  "bar.workspaces.applicationIconOncePerWorkspace": true,
+  "bar.workspaces.showApplicationIcons": false,
+  "bar.workspaces.applicationIconOncePerWorkspace": false,
   "bar.workspaces.applicationIconEmptyWorkspace": "",
-  "bar.workspaces.spacing": 1.3,
+  "bar.workspaces.spacing": 1,
   "menus.transition": "crossfade",
   "bar.workspaces.applicationIconFallback": "",
   "bar.systray.ignore": [
@@ -119,14 +119,19 @@
     "steam": {
       "icon": "󰓓"
     },
-    "chrome_status_icon_1": {
-      "icon": ""
+    "TelegramDesktop": {
+      "icon": ""
     }
   },
   "theme.bar.buttons.clock.enableBorder": false,
   "menus.media.displayTimeTooltip": true,
   "menus.media.displayTime": true,
-  "scalingPriority": "hyprland",
+  "scalingPriority": "gdk",
   "theme.bar.scaling": 100,
-  "theme.bar.menus.menu.dashboard.scaling": 95
+  "theme.bar.menus.menu.dashboard.scaling": 100,
+  "theme.bar.border.location": "full",
+  "theme.bar.border.width": "0.15em",
+  "theme.bar.margin_top": "0.5em",
+  "theme.bar.buttons.media.enableBorder": false,
+  "bar.media.truncation_size": 40
 }
\ No newline at end of file
diff --git a/.config/hypr/themes/hyprpanel_latte.json b/.config/hypr/themes/hyprpanel_latte.json
index 91122da..77a9ba4 100644
--- a/.config/hypr/themes/hyprpanel_latte.json
+++ b/.config/hypr/themes/hyprpanel_latte.json
@@ -161,16 +161,16 @@
   "theme.bar.menus.menu.media.slider.puck": "#9ca0b0",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#bcc0cc",
   "theme.bar.menus.menu.media.slider.background": "#acb0be",
-  "theme.bar.menus.menu.media.slider.primary": "#ea76cb",
+  "theme.bar.menus.menu.media.slider.primary": "#40a02b",
   "theme.bar.menus.menu.media.buttons.text": "#dce0e8",
-  "theme.bar.menus.menu.media.buttons.background": "#7287fd",
-  "theme.bar.menus.menu.media.buttons.enabled": "#179299",
+  "theme.bar.menus.menu.media.buttons.background": "#4c4e69",
+  "theme.bar.menus.menu.media.buttons.enabled": "#40a02b",
   "theme.bar.menus.menu.media.buttons.inactive": "#acb0be",
   "theme.bar.menus.menu.media.border.color": "#ccd0da",
   "theme.bar.menus.menu.media.background.color": "#eff1f5",
-  "theme.bar.menus.menu.media.album": "#ea76cb",
-  "theme.bar.menus.menu.media.artist": "#179299",
-  "theme.bar.menus.menu.media.song": "#7287fd",
+  "theme.bar.menus.menu.media.album": "#6c6e85",
+  "theme.bar.menus.menu.media.artist": "#40a02b",
+  "theme.bar.menus.menu.media.song": "#4c4e69",
   "theme.bar.menus.tooltip.text": "#4c4f69",
   "theme.bar.menus.tooltip.background": "#dce0e8",
   "theme.bar.menus.dropdownmenu.divider": "#eff1f5",
@@ -354,7 +354,7 @@
   "theme.bar.menus.menu.network.switch.puck": "#bcc0cc",
   "theme.bar.buttons.systray.customIcon": "#4c4f69",
   "theme.bar.border.color": "#1e65f5",
-  "theme.bar.menus.menu.media.timestamp": "#4c4f69",
+  "theme.bar.menus.menu.media.timestamp": "#6c6e85",
   "theme.bar.buttons.borderColor": "#7287fd",
   "theme.bar.buttons.modules.hyprsunset.icon_background": "#df8e1d",
   "theme.bar.buttons.modules.hyprsunset.background": "#dcdfe8",
diff --git a/.config/hypr/themes/hyprpanel_macchiato.json b/.config/hypr/themes/hyprpanel_macchiato.json
index d131259..2c3e4ad 100644
--- a/.config/hypr/themes/hyprpanel_macchiato.json
+++ b/.config/hypr/themes/hyprpanel_macchiato.json
@@ -161,16 +161,16 @@
   "theme.bar.menus.menu.media.slider.puck": "#6e738d",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#494d64",
   "theme.bar.menus.menu.media.slider.background": "#5b6078",
-  "theme.bar.menus.menu.media.slider.primary": "#f5bde6",
+  "theme.bar.menus.menu.media.slider.primary": "#a5da95",
   "theme.bar.menus.menu.media.buttons.text": "#181926",
-  "theme.bar.menus.menu.media.buttons.background": "#b7bdf8",
-  "theme.bar.menus.menu.media.buttons.enabled": "#8bd5ca",
+  "theme.bar.menus.menu.media.buttons.background": "#a5da95",
+  "theme.bar.menus.menu.media.buttons.enabled": "#a5da95",
   "theme.bar.menus.menu.media.buttons.inactive": "#5b6078",
   "theme.bar.menus.menu.media.border.color": "#363a4f",
   "theme.bar.menus.menu.media.background.color": "#181926",
-  "theme.bar.menus.menu.media.album": "#f5bde6",
-  "theme.bar.menus.menu.media.artist": "#8bd5ca",
-  "theme.bar.menus.menu.media.song": "#b7bdf8",
+  "theme.bar.menus.menu.media.album": "#a5adcb",
+  "theme.bar.menus.menu.media.artist": "#a5da95",
+  "theme.bar.menus.menu.media.song": "#cad3f5",
   "theme.bar.menus.tooltip.text": "#cad3f5",
   "theme.bar.menus.tooltip.background": "#181926",
   "theme.bar.menus.dropdownmenu.divider": "#1e2030",
diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
index e3fb955..a45b09f 100644
--- a/.config/kitty/current-theme.conf
+++ b/.config/kitty/current-theme.conf
@@ -1,80 +1,80 @@
 # vim:ft=kitty
 
-## name:     Catppuccin-Latte
+## name:     Catppuccin-Macchiato
 ## author:   Pocco81 (https://github.com/Pocco81)
 ## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
+## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf
 ## blurb:    Soothing pastel theme for the high-spirited!
 
 
 
 # The basic colors
-foreground              #4C4F69
-background              #EFF1F5
-selection_foreground    #EFF1F5
-selection_background    #DC8A78
+foreground              #CAD3F5
+background              #24273A
+selection_foreground    #24273A
+selection_background    #F4DBD6
 
 # Cursor colors
-cursor                  #DC8A78
-cursor_text_color       #EFF1F5
+cursor                  #F4DBD6
+cursor_text_color       #24273A
 
 # URL underline color when hovering with mouse
-url_color               #DC8A78
+url_color               #F4DBD6
 
 # Kitty window border colors
-active_border_color     #7287FD
-inactive_border_color   #9CA0B0
-bell_border_color       #DF8E1D
+active_border_color     #B7BDF8
+inactive_border_color   #6E738D
+bell_border_color       #EED49F
 
 # OS Window titlebar colors
 wayland_titlebar_color system
 macos_titlebar_color system
 
 # Tab bar colors
-active_tab_foreground   #EFF1F5
-active_tab_background   #8839EF
-inactive_tab_foreground #4C4F69
-inactive_tab_background #9CA0B0
-tab_bar_background      #BCC0CC
+active_tab_foreground   #181926
+active_tab_background   #C6A0F6
+inactive_tab_foreground #CAD3F5
+inactive_tab_background #1E2030
+tab_bar_background      #181926
 
 # Colors for marks (marked text in the terminal)
-mark1_foreground #EFF1F5
-mark1_background #7287fD
-mark2_foreground #EFF1F5
-mark2_background #8839EF
-mark3_foreground #EFF1F5
-mark3_background #209FB5
+mark1_foreground #24273A
+mark1_background #B7BDF8
+mark2_foreground #24273A
+mark2_background #C6A0F6
+mark3_foreground #24273A
+mark3_background #7DC4E4
 
 # The 16 terminal colors
 
 # black
-color0 #5C5F77
-color8 #6C6F85
+color0 #494D64
+color8 #5B6078
 
 # red
-color1 #D20F39
-color9 #D20F39
+color1 #ED8796
+color9 #ED8796
 
 # green
-color2  #40A02B
-color10 #40A02B
+color2  #A6DA95
+color10 #A6DA95
 
 # yellow
-color3  #DF8E1D
-color11 #DF8E1D
+color3  #EED49F
+color11 #EED49F
 
 # blue
-color4  #1E66F5
-color12 #1E66F5
+color4  #8AADF4
+color12 #8AADF4
 
 # magenta
-color5  #EA76CB
-color13 #EA76CB
+color5  #F5BDE6
+color13 #F5BDE6
 
 # cyan
-color6  #179299
-color14 #179299
+color6  #8BD5CA
+color14 #8BD5CA
 
 # white
-color7  #ACB0BE
-color15 #BCC0CC
+color7  #B8C0E0
+color15 #A5ADCB
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index cee0821..746e4fc 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,5 +1,5 @@
 # BEGIN_KITTY_THEME
-# Catppuccin-Latte
+# Catppuccin-Macchiato
 include current-theme.conf
 # END_KITTY_THEME
 
diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak
index 746e4fc..cee0821 100644
--- a/.config/kitty/kitty.conf.bak
+++ b/.config/kitty/kitty.conf.bak
@@ -1,5 +1,5 @@
 # BEGIN_KITTY_THEME
-# Catppuccin-Macchiato
+# Catppuccin-Latte
 include current-theme.conf
 # END_KITTY_THEME
 
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index de110b8..560f08e 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -22,7 +22,7 @@ require "user.options"
 require "user.keymaps"
 
 require("catppuccin").setup {
-  flavour = "latte",
+  flavour = "macchiato",
 }
 
 -- setup must be called before loading
diff --git a/.config/rofi/colors/theme.rasi b/.config/rofi/colors/theme.rasi
index 4ec7b27..f2e45d6 100644
--- a/.config/rofi/colors/theme.rasi
+++ b/.config/rofi/colors/theme.rasi
@@ -7,10 +7,10 @@
  **/
 
 * {
-    background:     #eff1f5;
-    background-alt: #e6e9ef;
-    foreground:     #9ca0b0;
-    selected:       #1e66f5;
-    active:         #40a02b;
-    urgent:         #d20f39;
+    background:     #24273a;
+    background-alt: #1e2030;
+    foreground:     #6c7086;
+    selected:       #8aadf4;
+    active:         #a6da95;
+    urgent:         #ed8796;
 }
diff --git a/.config/zathura/theme b/.config/zathura/theme
index 3f38e5c..599520e 100644
--- a/.config/zathura/theme
+++ b/.config/zathura/theme
@@ -1,38 +1,38 @@
-set default-fg                rgba(76,79,105,1)
-set default-bg 			          rgba(239,241,245,1)
+set default-fg                rgba(202,211,245,1)
+set default-bg 			          rgba(36,39,58,1)
 
-set completion-bg		          rgba(204,208,218,1)
-set completion-fg		          rgba(76,79,105,1)
+set completion-bg		          rgba(54,58,79,1)
+set completion-fg		          rgba(202,211,245,1)
 set completion-highlight-bg	  rgba(87,82,104,1)
-set completion-highlight-fg	  rgba(76,79,105,1)
-set completion-group-bg		    rgba(204,208,218,1)
-set completion-group-fg		    rgba(30,102,245,1)
+set completion-highlight-fg	  rgba(202,211,245,1)
+set completion-group-bg		    rgba(54,58,79,1)
+set completion-group-fg		    rgba(138,173,244,1)
 
-set statusbar-fg		          rgba(76,79,105,1)
-set statusbar-bg		          rgba(204,208,218,1)
+set statusbar-fg		          rgba(202,211,245,1)
+set statusbar-bg		          rgba(54,58,79,1)
 
-set notification-bg		        rgba(204,208,218,1)
-set notification-fg		        rgba(76,79,105,1)
-set notification-error-bg	    rgba(204,208,218,1)
-set notification-error-fg	    rgba(210,15,57,1)
-set notification-warning-bg	  rgba(204,208,218,1)
+set notification-bg		        rgba(54,58,79,1)
+set notification-fg		        rgba(202,211,245,1)
+set notification-error-bg	    rgba(54,58,79,1)
+set notification-error-fg	    rgba(237,135,150,1)
+set notification-warning-bg	  rgba(54,58,79,1)
 set notification-warning-fg	  rgba(250,227,176,1)
 
-set inputbar-fg			          rgba(76,79,105,1)
-set inputbar-bg 		          rgba(204,208,218,1)
+set inputbar-fg			          rgba(202,211,245,1)
+set inputbar-bg 		          rgba(54,58,79,1)
 
 set recolor                   "true"
-set recolor-lightcolor		    rgba(239,241,245,1)
-set recolor-darkcolor		      rgba(76,79,105,1)
+set recolor-lightcolor		    rgba(36,39,58,1)
+set recolor-darkcolor		      rgba(202,211,245,1)
 
-set index-fg			            rgba(76,79,105,1)
-set index-bg			            rgba(239,241,245,1)
-set index-active-fg		        rgba(76,79,105,1)
-set index-active-bg		        rgba(204,208,218,1)
+set index-fg			            rgba(202,211,245,1)
+set index-bg			            rgba(36,39,58,1)
+set index-active-fg		        rgba(202,211,245,1)
+set index-active-bg		        rgba(54,58,79,1)
 
-set render-loading-bg		      rgba(239,241,245,1)
-set render-loading-fg		      rgba(76,79,105,1)
+set render-loading-bg		      rgba(36,39,58,1)
+set render-loading-fg		      rgba(202,211,245,1)
 
 set highlight-color		        rgba(87,82,104,0.5)
-set highlight-fg              rgba(234,118,203,0.5)
-set highlight-active-color	  rgba(234,118,203,0.5)
+set highlight-fg              rgba(245,189,230,0.5)
+set highlight-active-color	  rgba(245,189,230,0.5)