diff --git a/jaci/dotfiles/waybar/style.css b/jaci/dotfiles/waybar/style.css
index 82e5601..328573f 100644
--- a/jaci/dotfiles/waybar/style.css
+++ b/jaci/dotfiles/waybar/style.css
@@ -7,49 +7,51 @@
 @define-color egg_shell #f8f1dd;
 
 * {
-    border: none;
-    border-radius: 0;
-    margin: 0;
-    padding: 0;
-    color: @egg_shell;
-    font-family: "GohuFont 14 Nerd Font";
-    font-size: 16px;
-    font-weight: normal;
+  border: none;
+  border-radius: 0;
+  margin: 0;
+  padding: 0;
+  color: @egg_shell;
+  font-family: "GohuFont 14 Nerd Font";
+  font-size: 16px;
+  font-weight: normal;
 }
 
 /* The whole bar */
 #waybar {
-    background: transparent;
-    background-color: transparent;
+  background: transparent;
+  background-color: transparent;
 }
 
 #taskbar {
-    background: transparent;
-    color: @egg_shell;
+  background: transparent;
+  color: @egg_shell;
 }
+
 #taskbar button {
-    padding-left: 3px;
-    padding-right: 3px;
-    margin-left: 3px;
-    margin-right: 3px;
-    color: transparent;
-    border-bottom: 2px solid;
+  padding-left: 3px;
+  padding-right: 3px;
+  margin-left: 3px;
+  margin-right: 3px;
+  color: transparent;
+  border-bottom: 2px solid;
 }
 
 #taskbar button.active {
-    color: @celeste;
+  color: @celeste;
 }
 
 .modules-left,
 .modules-right,
 .modules-center {
-    margin: 8px 8px 1px 8px;
-    background: transparent;
-    color: @egg_shell;
-    background-color: @english_violet;
-    border-radius: 25px;
-    padding: 0px 10px 0px 10px;
+  margin: 8px 8px 1px 8px;
+  background: transparent;
+  color: @egg_shell;
+  background-color: @english_violet;
+  border-radius: 25px;
+  padding: 0px 10px 0px 10px;
 }
+
 /* Every modules */
 #clock,
 #cpu,
@@ -58,8 +60,8 @@
 #network,
 #pulseaudio,
 #taskbar {
-    padding:0.5rem 0.6rem;
-    margin: 1px 0px;
+  padding: 0.5rem 0.6rem;
+  margin: 1px 0px;
 }
 
 /* -----------------------------------------------------------------------------
@@ -67,7 +69,7 @@
  * -------------------------------------------------------------------------- */
 
 #clock {
-    min-width: 140px;
+  min-width: 140px;
 }
 
 #cpu.warning,
@@ -75,24 +77,24 @@
 #memory.warning,
 #memory.critical,
 #network.disconnected {
-    color: @indian_red;
+  color: @indian_red;
 }
 
 #pulseaudio {
-    padding-top:6px;
+  padding-top: 6px;
 }
 
 #pulseaudio.muted {
-    color: @celeste;
+  color: @celeste;
 }
 
 #custom-spotify {
-    color: @celadon;
+  color: @celadon;
 }
 
 #custom-power {
-    margin-left:15px;
-    margin-right:15px;
-    font-size:15px;
-    color: @indian_red;
-}
+  margin-left: 15px;
+  margin-right: 15px;
+  font-size: 15px;
+  color: @indian_red;
+}
\ No newline at end of file
diff --git a/nate/dotfiles/mako/config b/nate/dotfiles/mako/config
index ae4922a..286de2f 100644
--- a/nate/dotfiles/mako/config
+++ b/nate/dotfiles/mako/config
@@ -1,19 +1,19 @@
-font=UbuntuMono 12.5
+font=Overpass Nerd Font 20
 
-background-color=#404552
-text-color=#e5e9f0
-width=315
-height=200
+background-color=#24273a
+text-color=#cad3f5
+width=630
+height=400
 padding=10
-margin=10
+margin=20
 progress-color=over #eceff480
 icon-path=/usr/share/icons/Arc-X-D
-max-icon-size=70
+max-icon-size=140
 layer=overlay
 
 border-size=5
-border-radius=0
-border-color=#5294e2
+border-radius=8
+border-color=#b7bdf8
 
 default-timeout=5000
 
diff --git a/nate/dotfiles/sway/config.d/default b/nate/dotfiles/sway/config.d/default
index 0e740bb..2d73c74 100644
--- a/nate/dotfiles/sway/config.d/default
+++ b/nate/dotfiles/sway/config.d/default
@@ -225,7 +225,7 @@ bindsym $mod+r mode "resize"
 #
 # Screenshots
 #
-    bindsym $mod+Shift+p exec /usr/share/sway/scripts/grimshot --notify save output
+    bindsym $mod+Shift+p exec ~/.config/sway/scripts/screenshot.sh clipboard
     bindsym $mod+p exec ~/.config/sway/scripts/screenshot.sh
 #
 # Keybindings List
diff --git a/nate/dotfiles/sway/config.d/output b/nate/dotfiles/sway/config.d/output
index 6cc4419..b8d6e7a 100644
--- a/nate/dotfiles/sway/config.d/output
+++ b/nate/dotfiles/sway/config.d/output
@@ -9,5 +9,5 @@
 # Wacom Tablet - Example
 #   input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1
 #   input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1
-output DP-3 resolution 2560x1440@164.956Hz position 0,0
+output DP-3 resolution 3840x2160@240.084Hz position 0,0
 output * adaptive_sync off
diff --git a/nate/dotfiles/sway/config.d/theme b/nate/dotfiles/sway/config.d/theme
index 6499a37..d0d114e 100644
--- a/nate/dotfiles/sway/config.d/theme
+++ b/nate/dotfiles/sway/config.d/theme
@@ -41,8 +41,8 @@ font pango:Overpass Nerd Font 12
 smart_borders on
 
 # Set wallpaper:
-#exec_always swaybg -i /home/nate/.config/sway/wallpapers/ign-0000.png
-exec_always /home/nate/.config/sway/scripts/background.sh
+exec_always swaybg -i /home/nate/.config/sway/wallpapers/nix-black-4k.png
+# exec_always /home/nate/.config/sway/scripts/background.sh
 
 # Title format for windows
 for_window [shell="xdg_shell"] title_format "%title (%app_id)"
diff --git a/nate/dotfiles/sway/scripts/screenshot.sh b/nate/dotfiles/sway/scripts/screenshot.sh
index 43d5dab..4221889 100755
--- a/nate/dotfiles/sway/scripts/screenshot.sh
+++ b/nate/dotfiles/sway/scripts/screenshot.sh
@@ -3,16 +3,31 @@
 entries="Active Screen Output Area Window"
  
 selected=$(printf '%s\n' $entries | wofi --style=$HOME/.config/wofi/style.widgets.css --conf=$HOME/.config/wofi/config.screenshot | awk '{print tolower($1)}')
- 
-case $selected in
-  active)
-    grimshot --notify save active;;
-  screen)
-    grimshot --notify save screen;;
-  output)
-    grimshot --notify save output;;
-  area)
-    grimshot --notify save area;;
-  window)
-    grimshot --notify save window;;
-esac
+
+if [ "$1" == "clipboard" ]; then
+  case $selected in
+    active)
+      grimshot --notify copy active;;
+    screen)
+      grimshot --notify copy screen;;
+    output)
+      grimshot --notify copy output;;
+    area)
+      grimshot --notify copy area;;
+    window)
+      grimshot --notify copy window;;
+  esac
+else 
+  case $selected in
+    active)
+      grimshot --notify save active;;
+    screen)
+      grimshot --notify save screen;;
+    output)
+      grimshot --notify save output;;
+    area)
+      grimshot --notify save area;;
+    window)
+      grimshot --notify save window;;
+  esac
+fi
diff --git a/nate/dotfiles/sway/wallpapers/nix-black-4k.png b/nate/dotfiles/sway/wallpapers/nix-black-4k.png
new file mode 100644
index 0000000..7b5094e
Binary files /dev/null and b/nate/dotfiles/sway/wallpapers/nix-black-4k.png differ
diff --git a/nate/dotfiles/waybar/config b/nate/dotfiles/waybar/config
index b4c0de5..55c702d 100644
--- a/nate/dotfiles/waybar/config
+++ b/nate/dotfiles/waybar/config
@@ -2,13 +2,13 @@
 {
     "layer": "top",
     "position": "top",
-    "margin-top": 8,
+    "margin-top": 3,
     "margin-left": 10,
     "margin-right": 10,
-    "margin-bottom": 8,
+    "margin-bottom": 3,
 
     // If height property would be not present, it'd be calculated dynamically
-    "height": 30,
+    "height": 60,
 
     "modules-left": [
         "custom/launcher",
@@ -17,6 +17,13 @@
     ],
  
     "modules-center": [
+        "custom/signal",
+        "custom/steam",
+        "custom/spotify",
+        "custom/firefox",
+        "custom/slack",
+        "custom/files",
+        "custom/pomo",
     ],
 
     "modules-right": [
@@ -25,12 +32,11 @@
         "memory",
         "cpu",
         "pulseaudio",
-        "custom/spotify",
         "custom/keyboard-layout",
         "battery",
         //"custom/PBPbattery",
-        "backlight#icon",
-        "backlight#value",
+        // "backlight#icon",
+        // "backlight#value",
         "clock",
         "tray",
         //"custom/weather",
@@ -173,6 +179,12 @@
         "interval": 600,
     },
 
+    // "custom/temp": {
+    //     "exec": "notify-send \"temp thing\"",
+    //     "interval": "once",
+    //     "signal": 8,
+    // },
+
     "tray": {
         "icon-size": 18,
         "spacing":10,
@@ -191,28 +203,54 @@
          "on-scroll-up": "brightnessctl -c backlight set +1%"
     },
 
-    "custom/firefox": {
-        "format": " ",
-        "on-click": "exec firefox",
-        "tooltip": false
+   "custom/signal": {
+        "format": "  ",
+        "on-click": "exec signal",
+        "tooltip": false,
+    },
+
+    "custom/steam": {
+        "format": "  ",
+        "on-click": "exec steam",
+        "tooltip": false,
     },
 
     "custom/spotify": {
         "format": "  ",
         "on-click": "foot -e 'ncspot'",
-        "tooltip": false
+        "tooltip": false,
     },
 
-    "custom/terminal": {
-        "format": " ",
-        "on-click": "exec foot",
-        "tooltip": false
+    "custom/firefox": {
+        "format": "  ",
+        "on-click": "exec firefox",
+        "tooltip": false,
     },
 
-    "custom/files": {
-        "format": " ",
+
+    "custom/slack": {
+        "format": "  ",
+        "on-click": "slack",
+        "tooltip": false,
+        "exec if": "pgrep slack"
+    },
+
+
+   "custom/files": {
+        "format": " 󰉋 ",
         "on-click": "exec thunar",
-        "tooltip": false
+        "tooltip": false,
+    },
+
+
+    "custom/pomo": {
+        "format": " {} ",
+        "exec": "/home/nate/source/pomozoro/zig-out/bin/pomozoro",
+        "return-type": "json",
+        "on-click": "echo 's' > ~/.local/share/pomozoro/pomopipe",
+        "on-click-right": "echo 'p' > ~/.local/share/pomozoro/pomopipe",
+        "on-click-middle": "echo 'r' > ~/.local/share/pomozoro/pomopipe",
+        // "signal": 8,
     },
 
     "custom/launcher": {
diff --git a/nate/dotfiles/waybar/style.css b/nate/dotfiles/waybar/style.css
index 12969fa..00aa873 100644
--- a/nate/dotfiles/waybar/style.css
+++ b/nate/dotfiles/waybar/style.css
@@ -6,67 +6,110 @@
  *
  * =========================================================================== */
 
+@define-color rosewater #f4dbd6;
+@define-color flamingo #f0c6c6;
+@define-color pink #f5bde6;
+@define-color mauve #c6a0f6;
+@define-color red #ed8796;
+@define-color maroon #ee99a0;
+@define-color peach #f5a97f;
+@define-color yellow #eed49f;
+@define-color green #a6da95;
+@define-color teal #8bd5ca;
+@define-color sky #91d7e3;
+@define-color sapphire #7dc4e4;
+@define-color blue #8aadf4;
+@define-color lavender #b7bdf8;
+@define-color text #cad3f5;
+@define-color subtext1 #b8c0e0;
+@define-color subtext0 #a5adcb;
+@define-color overlay2 #939ab7;
+@define-color overlay1 #8087a2;
+@define-color overlay0 #6e738d;
+@define-color surface2 #5b6078;
+@define-color surface1 #494d64;
+@define-color surface0 #363a4f;
+@define-color base #24273a;
+@define-color mantle #1e2030;
+@define-color crust #181926;
+
+
 /* -----------------------------------------------------------------------------
  * Keyframes
  * -------------------------------------------------------------------------- */
-
-/*
-Nordic Color Scheme
-*/
-@define-color nord2         #434c5e;
-@define-color nord3         #4c566a;
-@define-color nord4         #d8dee9;
-@define-color nord8         #88c0d0;
-@define-color nord9         #81a1c1;
-@define-color nord_cyan     #8fbcbb;
-@define-color nord_orange   #d08770;
-@define-color nord_red      #bf616a;
-@define-color nord_green    #a3be8c;
-@define-color nord_yellow   #ebcb8b;
-
 @keyframes blink-warning {
-    70% {
-        color: white;
-    }
+  70% {
+    color: @overlay0;
+  }
 
-    to {
-        color: white;
-        background-color: @nord_orange;
-    }
+  to {
+    color: @overlay0;
+    background-color: @crust;
+  }
 }
 
 @keyframes blink-critical {
-    70% {
-      color: white;
-    }
+  70% {
+    color: @overlay2;
+  }
 
-    to {
-        color: white;
-        background-color: @nord_red;
-    }
+  to {
+    color: @overlay2;
+    background-color: @base;
+  }
 }
 
+
 /* -----------------------------------------------------------------------------
  * Base styles
  * -------------------------------------------------------------------------- */
-
 /* Reset all styles */
 * {
-    border: none;
-    border-radius: 0;
-    min-height: 0;
-    margin: 1px;
-    padding: 0;
+  border: none;
+  border-radius: 0;
+  min-height: 0;
+  margin: 1px;
+  padding: 0;
 }
 
 /* The whole bar */
 #waybar {
-    background: transparent;
-    color: @nord4;
-    background-color: @nord3;
-    font-family: Overpass Nerd Font;
-    font-size: 16px;
-    border-radius: 15px;
+  background: transparent;
+  background-color: transparent;
+  font-family: Overpass Nerd Font;
+  font-size: 20px;
+  color: @text;
+}
+
+#taskbar {
+  background: transparent;
+}
+
+#taskbar button {
+  padding-left: 3px;
+  padding-right: 3px;
+  margin-left: 3px;
+  margin-right: 3px;
+  color: transparent;
+  border-bottom: 2px solid;
+}
+
+#taskbar button.active {
+  color: @lavender;
+}
+
+.modules-left,
+.modules-right,
+.modules-center {
+  /* margin: 8px 8px 1px 8px; */
+  background: transparent;
+  /* color: @; */
+  background-color: @base;
+  border-radius: 25px;
+  padding: 0px 10px 0px 10px;
+  border-style: solid;
+  border-width: 3px;
+  border-color: @surface0;
 }
 
 /* Every modules */
@@ -84,8 +127,8 @@ Nordic Color Scheme
 #tray,
 #idle_inhibitor,
 #custom-PBPbattery {
-    padding:0.5rem 0.6rem;
-    margin: 1px 0px;
+  padding: 0.5rem 0.6rem;
+  margin: 1px 0px;
 }
 
 /* -----------------------------------------------------------------------------
@@ -93,127 +136,179 @@ Nordic Color Scheme
  * -------------------------------------------------------------------------- */
 
 #battery {
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
 }
 
 #battery.warning {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #battery.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #battery.warning.discharging {
-    animation-name: blink-warning;
-    animation-duration: 3s;
+  animation-name: blink-warning;
+  animation-duration: 3s;
 }
 
 #battery.critical.discharging {
-    animation-name: blink-critical;
-    animation-duration: 2s;
+  animation-name: blink-critical;
+  animation-duration: 2s;
 }
 
 #cpu.warning {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #cpu.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #memory {
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
 }
 
 #memory.warning {
-    color: @nord_orange;
- }
+  color: @flamingo;
+}
 
 #memory.critical {
-    color: @nord_red;
-    animation-name: blink-critical;
-    animation-duration: 2s;
-    padding-left:5px;
-    padding-right:5px;
+  color: @red;
+  animation-name: blink-critical;
+  animation-duration: 2s;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 #mode {
-    background: @nord8;
-    border-bottom: 3px transparent;
-    color:white;
-    margin-left: 5px;
-    padding: 7px;
+  background: @overlay0;
+  border-bottom: 3px transparent;
+  color: @text;
+  margin-left: 5px;
+  margin-right: 5px;
+  border-radius: 20px;
 }
 
 #network.disconnected {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #pulseaudio {
-    padding-top:6px;
+  padding-top: 6px;
 }
 
 #pulseaudio.muted {
-
-    color: @nord_cyan;
+  color: @sky;
 }
 
 #temperature.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #window {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 #workspaces {
-    font-size:13px;
+  font-size: 13px;
 }
 
 #workspaces button {
-    border-bottom: 3px solid transparent;
-    margin-bottom: 0px;
-    padding:0px;
+  border-bottom: 3px solid transparent;
+  margin-bottom: 0px;
+  padding: 0px;
 }
 
 #custom-launcher {
-    color: @nord9;
+  color: @lavenderblush;
+}
+
+/* @define-color rosewater #f4dbd6; */
+/* @define-color flamingo #f0c6c6; */
+/* @define-color pink #f5bde6; */
+/* @define-color mauve #c6a0f6; */
+/* @define-color red #ed8796; */
+/* @define-color maroon #ee99a0; */
+/* @define-color peach #f5a97f; */
+/* @define-color yellow #eed49f; */
+/* @define-color green #a6da95; */
+/* @define-color teal #8bd5ca; */
+/* @define-color sky #91d7e3; */
+/* @define-color sapphire #7dc4e4; */
+/* @define-color blue #8aadf4; */
+/* @define-color lavender #b7bdf8; */
+
+
+#custom-signal {
+  color: @lavender;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-steam {
+  color: @teal;
+  padding: 0px 5px 0px 5px;
 }
 
 #custom-spotify {
-    color: @nord_green;
+  color: @green;
+  padding: 0px 5px 0px 5px;
 }
 
+#custom-firefox {
+  color: @yellow;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-slack {
+  color: @peach;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-files {
+  color: @pink;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-pomo {
+  color: @red;
+  padding: 0px 5px 0px 5px;
+}
+
+#wiggle {
+  animation-name: blink-warning;
+}
+
+
 #workspaces button.focused {
-    border-bottom: 3px solid  @nord_green;
-    margin-bottom: 1px;
-    padding-left:0;
+  border-bottom: 3px solid @green;
+  margin-bottom: 1px;
+  padding-left: 0;
 }
 
 #workspaces button.urgent {
-    border-color: @nord2;
-    color: @nord_yellow;
+  border-color: @lavender;
+  color: @yellow;
 }
 
 #custom-power {
-    margin-left:15px;
-    margin-right:15px;
-    font-size:15px;
-    color: @nord_orange;
+  margin-left: 15px;
+  margin-right: 15px;
+  font-size: 15px;
+  color: @flamingo;
 }
 
 #custom-launcher {
-    font-size:15px;
-    margin-left:15px;
-    margin-right:10px;
+  font-size: 15px;
+  margin-left: 15px;
+  margin-right: 10px;
 }
 
 #backlight.icon {
-    padding-right:1px;
-    font-size: 13px;
-}
+  padding-right: 1px;
+  font-size: 13px;
+}
\ No newline at end of file
diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix
index 4e076f3..b12f4e8 100644
--- a/nate/modules/home-manager/home.nix
+++ b/nate/modules/home-manager/home.nix
@@ -107,6 +107,8 @@
     neofetch
     # Normies
     unzip
+    llpp
+    nmap
 
     #
     # Photo / Video
@@ -144,6 +146,7 @@
     libsForQt5.qtstyleplugin-kvantum
     libsForQt5.qt5ct
     # Install fonts
+    lato
     (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
     recursive
   ];
diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix
index 1343991..cddb93b 100644
--- a/nate/modules/sway/sway_conf.nix
+++ b/nate/modules/sway/sway_conf.nix
@@ -75,7 +75,8 @@
                 syncthingtray
                 swaylock
                 swayidle
-                swww
+                swaybg
+                # swww
                 tailscale-systray
                 wl-clipboard
                 waybar
@@ -165,7 +166,7 @@
           };
         };
 
-        services.xserver.videoDrivers = [ "amdgpu" ];
+        # services.xserver.videoDrivers = [ "amdgpu" ];
         # Enable HIP
         systemd.tmpfiles.rules = [
             "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
@@ -174,13 +175,12 @@
         hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
         hardware.opengl = {
             # Mesa
-            enable = true;
+            # enable = true;
             # Vulkan
-            driSupport = true;
+            # driSupport = true;
             # Rocm support and vulkan drivers
             extraPackages = with pkgs; [
                 rocmPackages.clr.icd
-                amdvlk
             ];
         };
     };