diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json
index db42a12..50f3b85 100644
--- a/.config/Code/User/settings.json
+++ b/.config/Code/User/settings.json
@@ -1,5 +1,5 @@
 {
-  "workbench.iconTheme": "Monokai Pro Light Icons",
+  "workbench.iconTheme": "Monokai Pro Icons",
   "editor.fontFamily": "JetBrains Mono Semibold, Fira Code, Menlo, Monaco, 'Courier New', monospace",
   "editor.fontSize": 18,
   "editor.fontWeight": "normal",
@@ -8,7 +8,6 @@
   "editor.minimap.renderCharacters": false,
   "editor.suggestSelection": "first",
   "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
-  "window.titleBarStyle": "custom",
   "workbench.sideBar.location": "right",
   //
   // Excluded files and directories
@@ -26,7 +25,8 @@
   //
   // File associations with languages
   "files.associations": {
-    "*.pgpass" : "yaml",
+    "*.pgpass": "yaml",
+    "apple-app-site-association": "json"
   },
   //
   // Settings Sync
@@ -136,4 +136,8 @@
   "workbench.editor.editorActionsLocation": "hidden",
   "editor.overtypeCursorStyle": "block-outline",
   "editor.cursorStyle": "block",
+  "workbench.experimental.modernUI": true,
+  "extensions.supportAgentsWindow": {
+    "monokai.theme-monokai-pro-vscode": true
+  },
 }
\ No newline at end of file
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index ec9f3a6..3680d1b 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -48,7 +48,8 @@ bindings = [
 [keyboard]
 bindings = [
     { key = "Back", mods = "Control", chars = "\u001b\u007f"},
-    { key = "N", mods = "Control", action = "SpawnNewInstance" }
+    { key = "N", mods = "Control", action = "SpawnNewInstance" },
+    { key = "Return", mods = "Shift", chars = "\u001B\r"}
 ]
 
 [scrolling]
diff --git a/.config/hypr/hyprland/autostart.lua b/.config/hypr/hyprland/autostart.lua
index 8cb5c5a..d631928 100644
--- a/.config/hypr/hyprland/autostart.lua
+++ b/.config/hypr/hyprland/autostart.lua
@@ -16,5 +16,5 @@ hl.on("hyprland.start", function ()
     hl.exec_cmd("localsend", { workspace = workspaces.special.files .. " silent"})
 
     hl.exec_cmd("ratbagctl list")
-    hl.exec_cmd("~/code/ha-notifications/ha-notifications")
+    -- hl.exec_cmd("~/code/ha-notifications/ha-notifications")
 end)
\ No newline at end of file
diff --git a/.config/hypr/hyprland/binds.lua b/.config/hypr/hyprland/binds.lua
index 21e0179..e7e4a0f 100644
--- a/.config/hypr/hyprland/binds.lua
+++ b/.config/hypr/hyprland/binds.lua
@@ -1,4 +1,5 @@
 local programs = require("hyprland.variables.programs")
+local monitors = require("hyprland.variables.monitors")
 
 hl.config({
     binds = {
@@ -66,7 +67,7 @@ local order = { workspaces.special.term, workspaces.special.social, workspaces.s
 for i, workspace in ipairs(order) do
     local specialWorkspace = string.match(workspace, "special:(.+)")
     local fkey = 12 - (i - 1)
-    hl.bind(mainMod .. " + F" .. fkey, hl.dsp.focus({ monitor = "DP-1"}))
+    hl.bind(mainMod .. " + F" .. fkey, hl.dsp.focus({ monitor = monitors.primary }))
     hl.bind(mainMod .. " + F" .. fkey, hl.dsp.workspace.toggle_special(specialWorkspace))
     hl.bind(mainMod .. " + SHIFT + F" .. fkey, hl.dsp.window.move({ workspace = workspace }))
 end
diff --git a/.config/hypr/hyprland/rules/windows.lua b/.config/hypr/hyprland/rules/windows.lua
index 632f09f..1088928 100644
--- a/.config/hypr/hyprland/rules/windows.lua
+++ b/.config/hypr/hyprland/rules/windows.lua
@@ -115,4 +115,11 @@ hl.window_rule({
 
     stay_focused = true,
     dim_around = true,
+})
+
+hl.window_rule({
+    name = "float-uxplay",
+    match = { class = "GStreamer", title = "Pauls PC" },
+
+    float = true
 })
\ No newline at end of file
diff --git a/.config/hypr/hyprland/rules/workspaces.lua b/.config/hypr/hyprland/rules/workspaces.lua
index 7fb0fd6..3539414 100644
--- a/.config/hypr/hyprland/rules/workspaces.lua
+++ b/.config/hypr/hyprland/rules/workspaces.lua
@@ -14,9 +14,9 @@ end
 
 
 
--- Set gaps for special workspaces
+-- Set gaps for special workspaces and assign to primary monitor
 for _, workspace in pairs(workspaces.special) do
-    hl.workspace_rule({ workspace = workspace, gaps_out = 64 })
+    hl.workspace_rule({ workspace = workspace, gaps_out = 64, monitor = monitors.primary })
 end
 
 -- Configure layouts
diff --git a/.config/hypr/hyprland/variables/monitors.lua b/.config/hypr/hyprland/variables/monitors.lua
index b210902..ac48b4f 100644
--- a/.config/hypr/hyprland/variables/monitors.lua
+++ b/.config/hypr/hyprland/variables/monitors.lua
@@ -1,7 +1,7 @@
 local M = {}
 
-M.primary = "DP-1"
-M.secondary = "DP-2"
+M.primary = "DP-2"
+M.secondary = "DP-1"
 
 M.tv = "HDMI-A-1"
 
diff --git a/.config/systemd/user/default.target.wants/playerctld.service b/.config/systemd/user/default.target.wants/playerctld.service
new file mode 120000
index 0000000..e4d6146
--- /dev/null
+++ b/.config/systemd/user/default.target.wants/playerctld.service
@@ -0,0 +1 @@
+/home/paul/.config/systemd/user/playerctld.service
\ No newline at end of file
diff --git a/.config/systemd/user/homeassistant.service b/.config/systemd/user/homeassistant.service
new file mode 100644
index 0000000..003ee84
--- /dev/null
+++ b/.config/systemd/user/homeassistant.service
@@ -0,0 +1,9 @@
+[Unit]
+Description="Homeassistant utilities, such as notifications."
+
+[Service]
+ExecStart=
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/playerctld.service b/.config/systemd/user/playerctld.service
new file mode 100644
index 0000000..5450064
--- /dev/null
+++ b/.config/systemd/user/playerctld.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=MPRIS proxy daemon for playerctl
+
+[Service]
+ExecStart=/usr/bin/playerctld
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
diff --git a/.config/systemd/user/uxplay.service b/.config/systemd/user/uxplay.service
new file mode 100644
index 0000000..50f0c27
--- /dev/null
+++ b/.config/systemd/user/uxplay.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=AirPlay Unix mirroring server
+Requires=avahi-daemon
+After=avahi-daemon
+
+[Service]
+Type=simple
+ExecStart=uxplay
+Restart=on-failure
+#StandardOutput=file:%h/uxplay.log
+
+[Install]
+WantedBy=default.target
diff --git a/.config/uxplayrc b/.config/uxplayrc
index 3a77bcd..a06e518 100644
--- a/.config/uxplayrc
+++ b/.config/uxplayrc
@@ -1,3 +1,4 @@
 n "Pauls PC"
 nh
 fps 60
+p 7000
diff --git a/.config/vicinae/settings.json b/.config/vicinae/settings.json
index 73fb94d..fa8e511 100644
--- a/.config/vicinae/settings.json
+++ b/.config/vicinae/settings.json
@@ -13,5 +13,34 @@
    "imports": [
       "appeareance.jsonc",
       "general.jsonc"
-   ]
+   ],
+   "providers": {
+      "@HarshNarayanJha/store.vicinae.timer": {
+         "preferences": {
+            "presets": "1m,2m,5m,10m"
+         }
+      },
+      "@gebeto/store.raycast.translate": {
+         "entrypoints": {
+            "instant-translate-copy": {
+               "enabled": false
+            },
+            "instant-translate-paste": {
+               "enabled": false
+            },
+            "instant-translate-view": {
+               "enabled": false
+            },
+            "quick-translate": {
+               "enabled": false
+            },
+            "translate-form": {
+               "enabled": false
+            }
+         }
+      },
+      "@nikbpetrov/store.vicinae.it-tools": {
+         "enabled": false
+      }
+   }
 }
\ No newline at end of file
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 570d31d..b630dde 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,6 +1,6 @@
 {
   "layer": "top",
-  "output": "DP-1",
+  "output": "DP-2",
   "modules-left": [
     "custom/power",
     "hyprland/workspaces",
@@ -29,7 +29,7 @@
     "format": "{}",
     "return-type": "json",
     "interval": 1,
-    "on-click": "pidof hypridle >/dev/null && killall hypridle || hyprctl dispatch exec hypridle"
+    "on-click": "pidof hypridle >/dev/null && killall hypridle || hyprctl --instance 0 eval 'hl.exec_cmd(\"hypridle\")'"
   },
   "hyprland/workspaces": {
     "format": "{name}",
diff --git a/.zshrc b/.zshrc
index 6a0b695..cbf8c1e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -89,9 +89,6 @@ alias wsrecupdevdb="psql -h ep-broad-base-ag8vy0hl-pooler.c-2.eu-central-1.aws.n
 # Fix ls colors for synology directories
 LS_COLORS+=':ow=01;33'
 
-# Fix colors for ssh sessions
-TERM=xterm-256color
-
 # history
 HISTFILE=~/.histfile
 HISTSIZE=10000