diff --git a/.config/hypr/hyprpanel.json b/.config/hypr/hyprpanel.json
index 60bfd05..8587549 100644
--- a/.config/hypr/hyprpanel.json
+++ b/.config/hypr/hyprpanel.json
@@ -59,7 +59,7 @@
   "bar.workspaces.monitorSpecific": false,
   "bar.workspaces.reverse_scroll": true,
   "bar.clock.format": "%A %d %b   %H:%M",
-  "menus.clock.weather.key": "/home/thomas/.config/hypr/weather_api_key.json",
+  "menus.clock.weather.key": "50177474d9b04f2993d150045230106",
   "menus.dashboard.powermenu.avatar.image": "/home/thomas/Images/face.png",
   "bar.network.label": true,
   "theme.bar.transparent": true,
@@ -129,4 +129,4 @@
   "scalingPriority": "hyprland",
   "theme.bar.scaling": 100,
   "theme.bar.menus.menu.dashboard.scaling": 95
-}
+}
\ No newline at end of file
diff --git a/.config/hypr/themes/hyprpanel_macchiato.json b/.config/hypr/themes/hyprpanel_macchiato.json
index 05dac9e..d131259 100644
--- a/.config/hypr/themes/hyprpanel_macchiato.json
+++ b/.config/hypr/themes/hyprpanel_macchiato.json
@@ -1,18 +1,18 @@
 {
   "theme.bar.menus.background": "#181926",
-  "theme.bar.background": "#181926",
-  "theme.bar.buttons.media.icon": "#b7bdf8",
-  "theme.bar.buttons.media.text": "#b7bdf8",
+  "theme.bar.background": "#1e2030",
+  "theme.bar.buttons.media.icon": "#a5da95",
+  "theme.bar.buttons.media.text": "#a5da95",
   "theme.bar.buttons.icon": "#b7bdf8",
   "theme.bar.buttons.text": "#b7bdf8",
   "theme.bar.buttons.hover": "#494d64",
-  "theme.bar.buttons.background": "#24273a",
+  "theme.bar.buttons.background": "#1e2030",
   "theme.bar.menus.text": "#cad3f5",
   "theme.bar.menus.border.color": "#363a4f",
-  "theme.bar.buttons.media.background": "#24273a",
+  "theme.bar.buttons.media.background": "#1e2030",
   "theme.bar.menus.menu.volume.text": "#cad3f5",
   "theme.bar.menus.menu.volume.card.color": "#1e2030",
-  "theme.bar.menus.menu.volume.label.color": "#ee99a0",
+  "theme.bar.menus.menu.volume.label.color": "#a5da95",
   "theme.bar.menus.popover.text": "#b7bdf8",
   "theme.bar.menus.popover.background": "#181926",
   "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#ed8796",
@@ -74,26 +74,26 @@
   "theme.bar.menus.menu.dashboard.border.color": "#363a4f",
   "theme.bar.menus.menu.dashboard.background.color": "#181926",
   "theme.bar.menus.menu.dashboard.card.color": "#1e2030",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f5bde6",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f5bde6",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f5bde6",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#91d7e3",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#8aadf4",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#8aadf4",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#8aadf4",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#7dc4e4",
   "theme.bar.menus.menu.clock.weather.thermometer.cold": "#8aadf4",
   "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#b7bdf8",
   "theme.bar.menus.menu.clock.weather.thermometer.hot": "#f5a97f",
   "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#ed8796",
-  "theme.bar.menus.menu.clock.weather.stats": "#f5bde6",
-  "theme.bar.menus.menu.clock.weather.status": "#8bd5ca",
+  "theme.bar.menus.menu.clock.weather.stats": "#8aadf4",
+  "theme.bar.menus.menu.clock.weather.status": "#7dc4e4",
   "theme.bar.menus.menu.clock.weather.temperature": "#cad3f5",
-  "theme.bar.menus.menu.clock.weather.icon": "#f5bde6",
+  "theme.bar.menus.menu.clock.weather.icon": "#8aadf4",
   "theme.bar.menus.menu.clock.calendar.contextdays": "#5b6078",
   "theme.bar.menus.menu.clock.calendar.days": "#cad3f5",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f5bde6",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f5bde6",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f5bde6",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#8bd5ca",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#8bd5ca",
-  "theme.bar.menus.menu.clock.time.time": "#f5bde6",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#8aadf4",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#8aadf4",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#8aadf4",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#7dc4e4",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#7dc4e4",
+  "theme.bar.menus.menu.clock.time.time": "#8aadf4",
   "theme.bar.menus.menu.clock.text": "#cad3f5",
   "theme.bar.menus.menu.clock.border.color": "#363a4f",
   "theme.bar.menus.menu.clock.background.color": "#181926",
@@ -145,16 +145,16 @@
   "theme.bar.menus.menu.volume.input_slider.puck": "#5b6078",
   "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#494d64",
   "theme.bar.menus.menu.volume.input_slider.background": "#5b6078",
-  "theme.bar.menus.menu.volume.input_slider.primary": "#ee99a0",
+  "theme.bar.menus.menu.volume.input_slider.primary": "#a5da95",
   "theme.bar.menus.menu.volume.audio_slider.puck": "#5b6078",
   "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#494d64",
   "theme.bar.menus.menu.volume.audio_slider.background": "#5b6078",
-  "theme.bar.menus.menu.volume.audio_slider.primary": "#ee99a0",
-  "theme.bar.menus.menu.volume.icons.active": "#ee99a0",
+  "theme.bar.menus.menu.volume.audio_slider.primary": "#a5da95",
+  "theme.bar.menus.menu.volume.icons.active": "#a5da95",
   "theme.bar.menus.menu.volume.icons.passive": "#939ab7",
-  "theme.bar.menus.menu.volume.iconbutton.active": "#ee99a0",
+  "theme.bar.menus.menu.volume.iconbutton.active": "#a5da95",
   "theme.bar.menus.menu.volume.iconbutton.passive": "#cad3f5",
-  "theme.bar.menus.menu.volume.listitems.active": "#ee99a0",
+  "theme.bar.menus.menu.volume.listitems.active": "#a5da95",
   "theme.bar.menus.menu.volume.listitems.passive": "#cad3f5",
   "theme.bar.menus.menu.volume.border.color": "#363a4f",
   "theme.bar.menus.menu.volume.background.color": "#181926",
@@ -202,43 +202,43 @@
   "theme.bar.buttons.notifications.total": "#b7bdf8",
   "theme.bar.buttons.notifications.icon": "#b7bdf8",
   "theme.bar.buttons.notifications.hover": "#494d64",
-  "theme.bar.buttons.notifications.background": "#24273a",
-  "theme.bar.buttons.clock.icon": "#f5bde6",
-  "theme.bar.buttons.clock.text": "#f5bde6",
+  "theme.bar.buttons.notifications.background": "#1e2030",
+  "theme.bar.buttons.clock.icon": "#8aadf4",
+  "theme.bar.buttons.clock.text": "#8aadf4",
   "theme.bar.buttons.clock.hover": "#494d64",
-  "theme.bar.buttons.clock.background": "#24273a",
+  "theme.bar.buttons.clock.background": "#1e2030",
   "theme.bar.buttons.battery.icon": "#eed49f",
   "theme.bar.buttons.battery.text": "#eed49f",
   "theme.bar.buttons.battery.hover": "#494d64",
-  "theme.bar.buttons.battery.background": "#24273a",
+  "theme.bar.buttons.battery.background": "#1e2030",
   "theme.bar.buttons.systray.hover": "#494d64",
-  "theme.bar.buttons.systray.background": "#24273a",
+  "theme.bar.buttons.systray.background": "#1e2030",
   "theme.bar.buttons.bluetooth.icon": "#91d7e3",
   "theme.bar.buttons.bluetooth.text": "#91d7e3",
   "theme.bar.buttons.bluetooth.hover": "#494d64",
-  "theme.bar.buttons.bluetooth.background": "#24273a",
+  "theme.bar.buttons.bluetooth.background": "#1e2030",
   "theme.bar.buttons.network.icon": "#c6a0f6",
   "theme.bar.buttons.network.text": "#c6a0f6",
   "theme.bar.buttons.network.hover": "#494d64",
-  "theme.bar.buttons.network.background": "#24273a",
-  "theme.bar.buttons.volume.icon": "#ee99a0",
-  "theme.bar.buttons.volume.text": "#ee99a0",
+  "theme.bar.buttons.network.background": "#1e2030",
+  "theme.bar.buttons.volume.icon": "#a5da95",
+  "theme.bar.buttons.volume.text": "#a5da95",
   "theme.bar.buttons.volume.hover": "#494d64",
-  "theme.bar.buttons.volume.background": "#24273a",
+  "theme.bar.buttons.volume.background": "#1e2030",
   "theme.bar.buttons.media.hover": "#494d64",
-  "theme.bar.buttons.windowtitle.icon": "#f5bde6",
-  "theme.bar.buttons.windowtitle.text": "#f5bde6",
+  "theme.bar.buttons.windowtitle.icon": "#8aadf4",
+  "theme.bar.buttons.windowtitle.text": "#8aadf4",
   "theme.bar.buttons.windowtitle.hover": "#494d64",
-  "theme.bar.buttons.windowtitle.background": "#24273a",
+  "theme.bar.buttons.windowtitle.background": "#1e2030",
   "theme.bar.buttons.workspaces.numbered_active_text_color": "#181926",
   "theme.bar.buttons.workspaces.active": "#8aadf4",
-  "theme.bar.buttons.workspaces.occupied": "#b7bcf8",
-  "theme.bar.buttons.workspaces.available": "#91d7e3",
-  "theme.bar.buttons.workspaces.hover": "#494d64",
-  "theme.bar.buttons.workspaces.background": "#24273a",
-  "theme.bar.buttons.dashboard.icon": "#eed49f",
+  "theme.bar.buttons.workspaces.occupied": "#7dc4e4",
+  "theme.bar.buttons.workspaces.available": "#b7bcf8",
+  "theme.bar.buttons.workspaces.hover": "#8aadf4",
+  "theme.bar.buttons.workspaces.background": "#1e2030",
+  "theme.bar.buttons.dashboard.icon": "#8aadf4",
   "theme.bar.buttons.dashboard.hover": "#494d64",
-  "theme.bar.buttons.dashboard.background": "#24273a",
+  "theme.bar.buttons.dashboard.background": "#1e2030",
   "theme.osd.label": "#b7bdf8",
   "theme.osd.icon": "#181926",
   "theme.osd.bar_overflow_color": "#ed8796",
@@ -257,20 +257,20 @@
   "theme.notification.actions.background": "#b7bdf8",
   "theme.notification.background": "#181926",
   "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#f5c2e7",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#8aadf4",
   "theme.bar.menus.menu.media.card.color": "#1e2030",
   "theme.bar.menus.check_radio_button.background": "#181826",
   "theme.bar.menus.check_radio_button.active": "#b7bcf8",
   "theme.bar.buttons.style": "default",
   "theme.bar.buttons.icon_background": "#24273a",
-  "theme.bar.buttons.volume.icon_background": "#ee99a0",
+  "theme.bar.buttons.volume.icon_background": "#a5da95",
   "theme.bar.buttons.network.icon_background": "#caa6f7",
   "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-  "theme.bar.buttons.windowtitle.icon_background": "#f5bde6",
-  "theme.bar.buttons.media.icon_background": "#b7bdf8",
+  "theme.bar.buttons.windowtitle.icon_background": "#8aadf4",
+  "theme.bar.buttons.media.icon_background": "#a5da95",
   "theme.bar.buttons.notifications.icon_background": "#b7bdf8",
   "theme.bar.buttons.battery.icon_background": "#eed49f",
-  "theme.bar.buttons.clock.icon_background": "#f5bde6",
+  "theme.bar.buttons.clock.icon_background": "#8aadf4",
   "theme.bar.menus.menu.notifications.pager.button": "#b7bdf8",
   "theme.bar.menus.menu.notifications.scrollbar.color": "#b7bdf8",
   "theme.bar.menus.menu.notifications.pager.label": "#939ab7",
@@ -280,7 +280,7 @@
   "theme.bar.menus.popover.border": "#181926",
   "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#91d7e3",
   "theme.bar.menus.menu.power.buttons.restart.text": "#f5a97f",
-  "theme.bar.buttons.modules.updates.background": "#24273a",
+  "theme.bar.buttons.modules.updates.background": "#1e2030",
   "theme.bar.buttons.modules.storage.icon": "#ed8796",
   "theme.bar.buttons.modules.netstat.background": "#24273a",
   "theme.bar.buttons.modules.weather.icon": "#b7bdf8",
@@ -309,7 +309,7 @@
   "theme.bar.menus.menu.power.buttons.sleep.background": "#1e2030",
   "theme.bar.buttons.modules.ram.text": "#eed49f",
   "theme.bar.menus.menu.power.buttons.logout.text": "#a6da95",
-  "theme.bar.buttons.modules.updates.icon_background": "#c6a0f6",
+  "theme.bar.buttons.modules.updates.icon_background": "#eed49f",
   "theme.bar.buttons.modules.kbLayout.background": "#24273a",
   "theme.bar.buttons.modules.power.background": "#24273a",
   "theme.bar.buttons.modules.weather.background": "#24273a",
@@ -318,32 +318,32 @@
   "theme.bar.buttons.modules.netstat.icon": "#a6da95",
   "theme.bar.buttons.modules.cpu.icon_background": "#ed8796",
   "theme.bar.menus.menu.power.buttons.logout.icon_background": "#a6da95",
-  "theme.bar.buttons.modules.updates.text": "#c6a0f6",
+  "theme.bar.buttons.modules.updates.text": "#eed49f",
   "theme.bar.menus.menu.power.buttons.sleep.icon": "#181926",
   "theme.bar.menus.menu.power.buttons.restart.background": "#1e2030",
-  "theme.bar.buttons.modules.updates.icon": "#c6a0f6",
+  "theme.bar.buttons.modules.updates.icon": "#eed49f",
   "theme.bar.buttons.modules.cpu.text": "#ed8796",
   "theme.bar.buttons.modules.netstat.icon_background": "#a6da95",
   "theme.bar.buttons.modules.kbLayout.text": "#91d7e3",
   "theme.bar.buttons.modules.power.border": "#ed8796",
   "theme.bar.buttons.modules.weather.border": "#b7bdf8",
-  "theme.bar.buttons.modules.updates.border": "#c6a0f6",
+  "theme.bar.buttons.modules.updates.border": "#eed49f",
   "theme.bar.buttons.modules.kbLayout.border": "#91d7e3",
   "theme.bar.buttons.modules.netstat.border": "#a6da95",
   "theme.bar.buttons.modules.storage.border": "#ed8796",
   "theme.bar.buttons.modules.cpu.border": "#ed8796",
   "theme.bar.buttons.modules.ram.border": "#eed49f",
   "theme.bar.buttons.notifications.border": "#b7bdf8",
-  "theme.bar.buttons.clock.border": "#f5bde6",
+  "theme.bar.buttons.clock.border": "#8aadf4",
   "theme.bar.buttons.battery.border": "#eed49f",
-  "theme.bar.buttons.systray.border": "#494d64",
+  "theme.bar.buttons.systray.border": "#1e2030",
   "theme.bar.buttons.bluetooth.border": "#91d7e3",
   "theme.bar.buttons.network.border": "#c6a0f6",
-  "theme.bar.buttons.volume.border": "#ee99a0",
-  "theme.bar.buttons.media.border": "#b7bdf8",
-  "theme.bar.buttons.windowtitle.border": "#f5bde6",
-  "theme.bar.buttons.workspaces.border": "#181926",
-  "theme.bar.buttons.dashboard.border": "#eed49f",
+  "theme.bar.buttons.volume.border": "#a5da95",
+  "theme.bar.buttons.media.border": "#a5da95",
+  "theme.bar.buttons.windowtitle.border": "#8aadf4",
+  "theme.bar.buttons.workspaces.border": "#8aadf4",
+  "theme.bar.buttons.dashboard.border": "#8aadf4",
   "theme.bar.buttons.modules.submap.background": "#24273a",
   "theme.bar.buttons.modules.submap.text": "#8bd5ca",
   "theme.bar.buttons.modules.submap.border": "#8bd5ca",
@@ -353,9 +353,9 @@
   "theme.bar.menus.menu.network.switch.disabled": "#363a4f",
   "theme.bar.menus.menu.network.switch.puck": "#494d64",
   "theme.bar.buttons.systray.customIcon": "#cad3f5",
-  "theme.bar.border.color": "#b7bdf8",
+  "theme.bar.border.color": "#8aadf4",
   "theme.bar.menus.menu.media.timestamp": "#cad3f5",
-  "theme.bar.buttons.borderColor": "#b7bdf8",
+  "theme.bar.buttons.borderColor": "#c01c28",
   "theme.bar.buttons.modules.hyprsunset.icon_background": "#eed49f",
   "theme.bar.buttons.modules.hyprsunset.background": "#24273a",
   "theme.bar.buttons.modules.hyprsunset.icon": "#eed49f",