diff --git a/alacritty/toolbox-ephemeral.toml b/alacritty/toolbox-ephemeral.toml
new file mode 100644
index 000000000..e94181745
--- /dev/null
+++ b/alacritty/toolbox-ephemeral.toml
@@ -0,0 +1,15 @@
+import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/toolbox.toml"]
+
+[env]
+TERM_TITLE = "Alacritty (Fedora Ephemeral)"
+
+[shell]
+args = ["ephemeral", "-i", "fedora:37"]
+program = "/usr/bin/distrobox"
+
+[window]
+title = "Alacritty - Fedora (Ephemeral)"
+
+[window.class]
+general = "Alacritty-toolbox-ephemeral"
+instance = "Alacritty-toolbox-ephemeral"
diff --git a/alacritty/toolbox.toml b/alacritty/toolbox.toml
new file mode 100644
index 000000000..52ce76e86
--- /dev/null
+++ b/alacritty/toolbox.toml
@@ -0,0 +1,58 @@
+import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml"]
+
+[colors.bright]
+black = "#5E5C64"
+blue = "#83A598"
+cyan = "#8EC07C"
+green = "#B8BB26"
+magenta = "#D3869B"
+red = "#FB4934"
+white = "#EBDBB2"
+yellow = "#FABD2F"
+
+[colors.normal]
+black = "#282828"
+blue = "#458588"
+cyan = "#689D6A"
+green = "#98971A"
+magenta = "#B16386"
+red = "#CC240A"
+white = "#A89984"
+yellow = "#D79921"
+
+[colors.primary]
+background = "#282828"
+foreground = "#EBDBB2"
+
+[env]
+TERM_TITLE = "Alacritty (Fedora)"
+
+[font]
+size = 11.0
+
+[font.bold]
+family = "Anonymice Nerd Font"
+style = "Bold"
+
+[font.bold_italic]
+family = "Anonymice Nerd Font"
+style = "SemiBold"
+
+[font.italic]
+family = "Anonymice Nerd Font"
+style = "Light"
+
+[font.normal]
+family = "Anonymice Nerd Font"
+style = "Regular"
+
+[shell]
+args = ["enter", "toolbox"]
+program = "/usr/bin/distrobox"
+
+[window]
+title = "Alacritty - Fedora (Distrobox)"
+
+[window.class]
+general = "Alacritty-toolbox"
+instance = "Alacritty-toolbox"
diff --git a/fastfetch/toolbox.jsonc b/fastfetch/toolbox.jsonc
new file mode 100644
index 000000000..a38d0aa78
--- /dev/null
+++ b/fastfetch/toolbox.jsonc
@@ -0,0 +1,5 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "modules": [
+  ]
+}
diff --git a/mako.conf b/mako.conf
index 659957325..4b6de33de 100644
--- a/mako.conf
+++ b/mako.conf
@@ -1,5 +1,5 @@
 font=Anonymice Nerd Font Mono Regular 11
-width=300
+width=400
 height=100
 icon-path=/var/home/jpm/.dotfiles/icons/Gruvbox/
 #max-history=100
@@ -15,13 +15,13 @@ on-button-middle=exec makoctl menu -n "$id" dmenu -p ’Select action: ’
 # space around all notifications
 outer-margin=0
 # space between each notification
-margin=10,0,0,10
+margin=25,0,0,0
 padding=5
 border-size=2
 border-color=#83a598
 border-radius=0
 #Progress can be indicated in a notification by setting a hint, "value" to an  integer  between 0 and 100 inclusive.
-progress-color=over #ebdbb2
+progress-color=source #83a598
 icons=1
 max-icon-size=64
 #icon-path=
@@ -40,12 +40,20 @@ group-by=app-name
 max-visible=10
 output=
 layer=top
-anchor=bottom-right
+anchor=top-right
 background-color=#458588
 text-color=#ebdbb2
 
+[urgency="low"]
+background-color=#282828
+border-color=#928374
+
 [app-name="Rocket.Chat"]
 ignore-timeout=1
 
+[summary="Backlight"]
+progress-color=source #d79921
+#progress-color=source #fabd2f
+
 [app-name="some-app-id" actionable]
 #on-button-left=invoke-action mail-reply-sender
diff --git a/waybar/config.template b/waybar/config.template
index c26ecb8e9..d9764c5a8 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -18,7 +18,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/window"],
     "modules-center": [],
-    "modules-right": ["sway/mode", "custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio","tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/sleep_modes", "custom/clock", "custom/power"],
+    "modules-right": ["sway/mode", "custom/weather", "network", "network#wireguard", "backlight", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio","tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/sleep_modes", "custom/clock", "custom/power"],
     // Modules configuration
     "sway/workspaces": {
         // "disable-scroll": true,
@@ -105,8 +105,16 @@
         "critical-threshold": 80,
         "format": "{temperatureC}°C"
     },
+    "backlight": {
+        "device": "acpi_video1",
+        "format": "{icon} {percent}%",
+        "format-icons": [ "☼", "", ""],
+        "on-click": "notify-send $(brightnessctl info)",
+        "on-scroll-up": "${HOME}/scripts/waybar/waybar-backlight.sh up",
+        "on-scroll-down": "${HOME}/scripts/waybar/waybar-backlight.sh down"
+    },
     //"backlight": {
-        // "device": "acpi_video1",
+        //"device": "acpi_video1",
         //"format": "{icon} {percent}%",
         //"format-icons": [ "•", "☼", "o", "", ""],
         //"on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
@@ -121,7 +129,7 @@
         "on-click": "${HOME}/scripts/waybar/waybar-battery.sh notify"
     },
     "pulseaudio": {
-        //"scroll-step": 1,
+        "scroll-step": 1,
         "format": "{icon} {volume}%",
         "format-bluetooth": "{icon}{volume}%",
         "format-muted": "",
@@ -134,7 +142,9 @@
             "car": "",
             "default": ["", ""]
         },
-        "on-click": "${HOME}/scripts/waybar/waybar-audio.sh"
+        "on-scroll-up": "${HOME}/scripts/waybar/waybar-volume.sh up",
+        "on-scroll-down": "${HOME}/scripts/waybar/waybar-volume.sh down",
+        "on-click": "${HOME}/scripts/waybar/waybar-volume.sh"
     },
     "tray": {
         "icon-size": 24,
@@ -147,7 +157,7 @@
     },
     "custom/todo": {
         "interval": 86400,
-        "exec": "echo '\u200a🗈\nTo-do list\n'",
+        "exec": "echo '☑\nTo-do list\n'",
         "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
     },
     "custom/osk": {