diff --git a/.config/dconf/user b/.config/dconf/user
index 8de8540..287a85a 100644
Binary files a/.config/dconf/user and b/.config/dconf/user differ
diff --git a/.config/mako/config b/.config/mako/config
index f64cb4a..00d6c51 100644
--- a/.config/mako/config
+++ b/.config/mako/config
@@ -3,9 +3,9 @@ font=Adwaita Sans 10
 default-timeout=5000
 
 anchor=top-center
-margin=16
+margin=12
 padding=8
 
 background-color=#191919E5
-border-color=#505050E5
+border-color=#505050
 progress-color=source #909090E5
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5293e9c..742c5ea 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -172,73 +172,75 @@ vim.keymap.set("n", "<leader>dN", "]D", { desc = "Jump to last diagnostic" })
 vim.keymap.set("n", "<leader>dP", "[D", { desc = "Jump to first diagnostic" })
 vim.keymap.set("n", "<leader>ds", "<C-w>d", { desc = "Display diagnostic on current line" })
 
-vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" })
 
-local dap = require("dap")
-local dap_widgets = require("dap.ui.widgets")
-local dap_sidebar_s = dap_widgets.sidebar(dap_widgets.scopes)
-local dap_sidebar_f = dap_widgets.sidebar(dap_widgets.frames)
+vim.api.nvim_create_user_command("DapInit", function()
+	vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" })
 
-vim.keymap.set("n", "<leader>bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint"})
-vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "Continue execution"})
+	local dap = require("dap")
+	local dap_widgets = require("dap.ui.widgets")
+	local dap_sidebar_s = dap_widgets.sidebar(dap_widgets.scopes)
+	local dap_sidebar_f = dap_widgets.sidebar(dap_widgets.frames)
 
-dap.listeners.on_session["debug"] = function()
-	vim.keymap.set("n", "<leader>bs", dap_sidebar_s.toggle, { desc = "Show scopes"})
-	vim.keymap.set("n", "<leader>bf", dap_sidebar_f.toggle, { desc = "Show frames"})
+	vim.keymap.set("n", "<leader>bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint"})
+	vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "Continue execution"})
 
-	vim.keymap.set("n", "<Left>", dap.step_out, { desc = "Step out"})
-	vim.keymap.set("n", "<Right>", dap.step_into, { desc = "Step into"})
-	vim.keymap.set("n", "<Down>", dap.step_over, { desc = "Step over"})
-	vim.keymap.set("n", "<Up>", dap.restart_frame, { desc = "Restart frame"})
-end
+	dap.listeners.on_session["debug"] = function()
+		vim.keymap.set("n", "<leader>bs", dap_sidebar_s.toggle, { desc = "Show scopes"})
+		vim.keymap.set("n", "<leader>bf", dap_sidebar_f.toggle, { desc = "Show frames"})
 
-dap.adapters.gdb = {
-	type = "executable",
-	command = "gdb",
-	args = { "--interpreter=dap", "--eval-command", "set print pretty on" }
-}
+		vim.keymap.set("n", "<Left>", dap.step_out, { desc = "Step out"})
+		vim.keymap.set("n", "<Right>", dap.step_into, { desc = "Step into"})
+		vim.keymap.set("n", "<Down>", dap.step_over, { desc = "Step over"})
+		vim.keymap.set("n", "<Up>", dap.restart_frame, { desc = "Restart frame"})
+	end
 
-dap.configurations.c = {
-	{
-		name = "Launch",
-		type = "gdb",
-		request = "launch",
-		program = function()
-			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
-		end,
-		args = {}, -- provide arguments if needed
-		cwd = "${workspaceFolder}",
-		stopAtBeginningOfMainSubprogram = false,
-	},
-	{
-		name = "Select and attach to process",
-		type = "gdb",
-		request = "attach",
-		program = function()
-			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
-		end,
-		pid = function()
-			local name = vim.fn.input('Executable name (filter): ')
-			return require("dap.utils").pick_process({ filter = name })
-		end,
-		cwd = '${workspaceFolder}'
-	},
-	{
-		name = 'Attach to gdbserver :1234',
-		type = 'gdb',
-		request = 'attach',
-		target = 'localhost:1234',
-		program = function()
-			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
-		end,
-		cwd = '${workspaceFolder}'
+	dap.adapters.gdb = {
+		type = "executable",
+		command = "gdb",
+		args = { "--interpreter=dap", "--eval-command", "set print pretty on" }
 	}
-}
 
-dap.configurations.cpp = dap.configurations.c
-dap.configurations.rust = dap.configurations.c
+	dap.configurations.c = {
+		{
+			name = "Launch",
+			type = "gdb",
+			request = "launch",
+			program = function()
+				return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+			end,
+			args = {}, -- provide arguments if needed
+			cwd = "${workspaceFolder}",
+			stopAtBeginningOfMainSubprogram = false,
+		},
+		{
+			name = "Select and attach to process",
+			type = "gdb",
+			request = "attach",
+			program = function()
+				return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+			end,
+			pid = function()
+				local name = vim.fn.input('Executable name (filter): ')
+				return require("dap.utils").pick_process({ filter = name })
+			end,
+			cwd = '${workspaceFolder}'
+		},
+		{
+			name = 'Attach to gdbserver :1234',
+			type = 'gdb',
+			request = 'attach',
+			target = 'localhost:1234',
+			program = function()
+				return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+			end,
+			cwd = '${workspaceFolder}'
+		}
+	}
 
+	dap.configurations.cpp = dap.configurations.c
+	dap.configurations.rust = dap.configurations.c
 
+end, { desc = "Initialize Debug Adater Protocol support" })
 
 -- [[ UI Configuration ]]
 vim.pack.add({
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 1deec65..c17a967 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -3,12 +3,22 @@
   
   "modules-left": ["niri/workspaces"],
   "modules-center": ["niri/window"],
-  "modules-right": ["bluetooth", "network", "wireplumber#source", "wireplumber#sink", "battery", "clock"],
+  "modules-right": ["idle_inhibitor", "bluetooth", "network", "wireplumber#source", "wireplumber#sink", "battery", "clock"],
   
   "niri/window": {
     "max-length": 100
   },
 
+  "idle_inhibitor": {
+    "format": "{icon}",
+    "format-icons": {
+      "activated": "󰅶",
+      "deactivated": "󰾪"
+    },
+	"min-length": 2,
+	"tooltip": false
+  },
+
   "mpris": {
     "format": "{player_icon} {dynamic}",
     "format-paused": "{status_icon} <i>{dynamic}</i>",
@@ -43,7 +53,6 @@
     "tooltip-format-wifi": "{essid} ({signalStrength}%) 󰖩",
     "tooltip-format-ethernet": "{ifname} 󰈁",
     "tooltip-format-disconnected": "Disconnected",
-    "max-length": 50,
     "min-length": 2
   },
 
@@ -75,14 +84,14 @@
     },
     "events": {
       "on-discharging-warning": "notify-send -u normal 'Low Battery'",
-      "on-discharging-critical": "notify-send -u critical 'Very Low Battery'",
+      "on-discharging-critical": "notify-send -u critical 'Very Low Battery'"
     },
     "format": "{icon}",
     "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
     "tooltip-format": "{time} ({capacity}%)",
     "min-length": 2
   },
-  
+
   "clock": {
     "format-alt": "{:%a, %d. %b  %H:%M}",
     "tooltip": false
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index c35165b..23b5482 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -7,13 +7,14 @@
 
 tooltip {
 	font-weight: normal;
+	background: rgba(0, 0, 0, 229);
+	border: solid 2px #505050;
 	border-radius: 0px;
 }
 
 window#waybar {
-	background-color: rgba(0, 0, 0, 1.0);
-	/* border-bottom: 3px solid rgba(100, 114, 125, 0.5);*/
 	color: #ffffff;
+	background-color: rgba(0, 0, 0, 1.0);
 	transition-property: background-color;
 	transition-duration: .5s;
 }
@@ -22,28 +23,9 @@ window#waybar.hidden {
 	opacity: 0.2;
 }
 
-/*
-window#waybar.empty {
-    background-color: transparent;
-}
-window#waybar.solo {
-    background-color: #FFFFFF;
-}
-
-
-window#waybar.termite {
-	background-color: #3F3F3F;
-}
-
-window#waybar.chromium {
-	background-color: #000000;
-	border: none;
-}
-*/
-
 button {
 	/* Use box-shadow instead of border so the text isn't offset */
-	box-shadow: inset 0 -3px transparent;
+	box-shadow: inset 0 -2px transparent;
 	/* Avoid rounded borders under each button name */
 	border: none;
 	border-radius: 0;
@@ -57,18 +39,16 @@ button:hover {
 
 #workspaces button {
 	padding: 0 4px;
-	background-color: transparent;
 	color: #999999;
+	background-color: transparent;
 }
 
 #workspaces button:hover {
-	background: rgba(0, 0, 0, 0.2);
+	background: inherit;
 }
 
 #workspaces button.focused,
 #workspaces button.active {
-	/*background-color: #505050;*/
-	/*box-shadow: inset 0 -2px #7fc8ff;*/
 	color: #ffffff;
 }
 
@@ -76,11 +56,7 @@ button:hover {
 	background-color: #9b0000;
 }
 
-#mode {
-	background-color: #64727D;
-	box-shadow: inset 0 -3px #ffffff;
-}
-
+#mode,
 #clock,
 #battery,
 #cpu,
@@ -118,216 +94,6 @@ button:hover {
 	margin-right: 0;
 }
 
-/*
-clock {
-	background-color: #64727D;
-}
-
-
-#battery {
-	background-color: #ffffff;
-	color: #000000;
-}
-
-#battery.charging,
-#battery.plugged {
-	color: #ffffff;
-	background-color: #26A65B;
-}
-
-@keyframes blink {
-	to {
-		background-color: #ffffff;
-		color: #000000;
-	}
-}
-*/
-/* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.critical:not(.charging) {
 	color: #9b0000
 }
-
-/*
-#power-profiles-daemon {
-	padding-right: 15px;
-}
-
-#power-profiles-daemon.performance {
-	background-color: #f53c3c;
-	color: #ffffff;
-}
-
-#power-profiles-daemon.balanced {
-	background-color: #2980b9;
-	color: #ffffff;
-}
-
-#power-profiles-daemon.power-saver {
-	background-color: #2ecc71;
-	color: #000000;
-}
-
-label:focus {
-	background-color: #000000;
-}
-
-#cpu {
-	background-color: #2ecc71;
-	color: #000000;
-}
-
-#memory {
-	background-color: #9b59b6;
-}
-
-#disk {
-	background-color: #964B00;
-}
-
-#backlight {
-	background-color: #90b1b1;
-}
-
-
-#network {
-	background-color: #2980b9;
-}
-
-
-#network.disconnected {
-	background-color: #f53c3c;
-}
-
-#pulseaudio {
-	background-color: #f1c40f;
-	color: #000000;
-}
-
-#pulseaudio.muted {
-	background-color: #90b1b1;
-	color: #2a5c45;
-}
-
-#wireplumber {
-	background-color: #fff0f5;
-	color: #000000;
-}
-
-#wireplumber.muted {
-	background-color: #f53c3c;
-}
-
-#custom-media {
-	background-color: #66cc99;
-	color: #2a5c45;
-	min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-	background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
-	background-color: #ffa000;
-}
-
-#temperature {
-	background-color: #f0932b;
-}
-
-#temperature.critical {
-	background-color: #eb4d4b;
-}
-
-#tray {
-	background-color: #2980b9;
-}
-
-#tray>.passive {
-	-gtk-icon-effect: dim;
-}
-
-#tray>.needs-attention {
-	-gtk-icon-effect: highlight;
-	background-color: #eb4d4b;
-}
-
-#idle_inhibitor {
-	background-color: #2d3436;
-}
-
-#idle_inhibitor.activated {
-	background-color: #ecf0f1;
-	color: #2d3436;
-}
-
-#mpd {
-	background-color: #66cc99;
-	color: #2a5c45;
-}
-
-#mpd.disconnected {
-	background-color: #f53c3c;
-}
-
-#mpd.stopped {
-	background-color: #90b1b1;
-}
-
-#mpd.paused {
-	background-color: #51a37a;
-}
-
-#language {
-	background: #00b093;
-	color: #740864;
-	padding: 0 5px;
-	margin: 0 5px;
-	min-width: 16px;
-}
-
-#keyboard-state {
-	background: #97e1ad;
-	color: #000000;
-	padding: 0 0px;
-	margin: 0 5px;
-	min-width: 16px;
-}
-
-#keyboard-state>label {
-	padding: 0 5px;
-}
-
-#keyboard-state>label.locked {
-	background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad {
-	background: rgba(0, 0, 0, 0.2);
-}
-
-#scratchpad.empty {
-	background-color: transparent;
-}
-
-#privacy {
-	padding: 0;
-}
-
-#privacy-item {
-	padding: 0 5px;
-	color: white;
-}
-
-#privacy-item.screenshare {
-	background-color: #cf5700;
-}
-
-#privacy-item.audio-in {
-	background-color: #1ca000;
-}
-
-#privacy-item.audio-out {
-	background-color: #0069d4;
-}
-*/
diff --git a/.local/scripts/actionmenu.fish b/.local/scripts/actionmenu.fish
index 2917ae9..44de967 100755
--- a/.local/scripts/actionmenu.fish
+++ b/.local/scripts/actionmenu.fish
@@ -29,7 +29,7 @@ function open_location
 end
 
 function audio_source
-	set dump (string trim -c '"' (pw-dump | jq '.[] | select(.info.props."media.class" == "Audio/Source")' | jq '.id, .info.props."node.nick"'))
+	set dump (string trim -c '"' (pw-dump | jq '.[] | select(.info.props."media.class" == "Audio/Source")' | jq '.id, .info.props."node.description"'))
 	
 	set ids
 	set names
@@ -48,7 +48,7 @@ function audio_source
 end
 
 function audio_sink
-	set dump (string trim -c '"' (pw-dump | jq '.[] | select(.info.props."media.class" == "Audio/Sink")' | jq '.id, .info.props."node.nick"'))
+	set dump (string trim -c '"' (pw-dump | jq '.[] | select(.info.props."media.class" == "Audio/Sink")' | jq '.id, .info.props."node.description"'))
 	
 	set ids
 	set names