diff --git a/home-manager/packages/river/river.nix b/home-manager/packages/river/river.nix
index 443378d..b4a3742 100644
--- a/home-manager/packages/river/river.nix
+++ b/home-manager/packages/river/river.nix
@@ -13,6 +13,7 @@
     enable = true;
     settings = {
       default-layout = "wideriver";
+      send-layout-cmd="wideriver \"--layout left --stack dwindle --count 1 --ratio 0.5\"";
       map = {
         normal = {
           "Super Return" = "spawn alacritty";
@@ -21,14 +22,9 @@
           "Super K" = "focus-view previous";
           "Super+Shift J" = "swap next";
           "Super+Shift K" = "swap previous";
-          
+          "Super R" = "fuzzel";
         };
       };
-      extraConfig = "
-        ``
-        wideriver -view-padding 6 -outer-padding 6 &
-        ``
-      ";
     };    
   };
   
diff --git a/home-manager/packages/starship/starship.toml b/home-manager/packages/starship/starship.toml
index 604f94a..a8972a7 100644
--- a/home-manager/packages/starship/starship.toml
+++ b/home-manager/packages/starship/starship.toml
@@ -114,8 +114,13 @@ symbol = ""
 style = "fg:#d3c6aa bg:#D162A4"
 format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
 
+[nix]
+symbol = "󱄅"
+style = "fg:#d3c6aa bg:#D162a4"
+format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#d126a4)]($style)'
+
 [nim]
-symbol = " "
+symbol = ""
 style = "fg:#d3c6aa bg:#D162A4"
 format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
 
@@ -125,12 +130,14 @@ style = "fg:#d3c6aa bg:#D162A4"
 format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
 
 [ruby]
+symbol = ""
 style = "fg:#d3c6aa bg:#D162A4"
 format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
 
 [python]
+symbol = ""
 style = "fg:#d3c6aa bg:#D162A4"
-format = '[[ Py ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
+format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)'
 
 [time]
 disabled = false
diff --git a/home-manager/packages/waybar/waybar.css b/home-manager/packages/waybar/waybar.css
new file mode 100644
index 0000000..97c0221
--- /dev/null
+++ b/home-manager/packages/waybar/waybar.css
@@ -0,0 +1,191 @@
+* {
+  font-family: JetBrains Mono, Font Awesome 6 Free;
+  font-size: 13px;
+}
+
+window#waybar {
+  color: #ffffff;
+  background-color: #1e3b28;
+  border-bottom: 3px solid #8f2fef;
+  transition-property: background-color;
+  transition-duration: .5s;
+}
+
+window#waybar.hidden {
+  opacity: 0.2;
+}
+
+button {
+  box-shadow: inset 0 -3px transparent;
+  border: none;
+  border-radius: 0;
+}
+
+button:hover {
+  background: inherit;
+  box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button {
+  padding: 0 15px;
+  background-color: transparent;
+  border: 2px solid #8f2fef
+}
+
+#workspaces button:hover {
+  background: rgba(255, 255, 255, 0.2);
+}
+
+#workspaces button.focused {
+  background-color: #8f2fef;
+  box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+  background-color: #f38ba8;
+}
+
+#backlight,
+#battery,
+#clock,
+#cpu,
+#memory,
+#mode,
+#network,
+#pulseaudio,
+#temperature,
+#tray,
+#idle_inhibitor,
+#keyboard-state,
+#power-profiles-daemon {
+  padding: 0 8px;
+}
+
+#window,
+#workspaces {
+  margin: 0 8px;
+}
+
+.modules-left>widget:first-child>#workspaces {
+  margin-left: 0;
+}
+
+.modules-right>widget:last-child>#workspaces {
+  margin-right: 0;
+}
+
+#backlight {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #cba6f7;
+}
+
+#battery {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
+
+#battery.critical.discharging {
+  background-color: #f38ba8;
+  animation: blink 1s infinite;
+}
+
+#battery.warning.discharging {
+  background-color: #f9e2af;
+  animation: blink 1s infinite;
+}
+
+@keyframes blink {
+  to {
+    background-color: transparent;
+  }
+}
+
+#clock {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
+
+#cpu {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #cba6f7;
+}
+
+#memory {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f9e2af;
+}
+
+#mode {
+  color: #ffffff;
+  background-color: #8f2fef;
+  border-bottom: 3px solid #ffffff;
+}
+
+#network {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
+
+#network.disconnected {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
+
+#pulseaudio {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
+
+#pulseaudio.muted {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
+
+#temperature {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
+
+#temperature.critical {
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
+
+#tray {
+  background-color: transparent;
+  border-bottom: 3px solid #8f2fef;
+}
+
+#idle_inhibitor {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f9e2af;
+}
+
+#idle_inhibitor.activated {
+  color: #1e3b28;
+  background-color: #f9e2af;
+  border-bottom: 3px solid #f9e2af;
+}
+
+#keyboard-state {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #fab387;
+}
+
+#power-profiles-daemon {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #94e2d5;
+}
diff --git a/home-manager/packages/waybar/waybar.nix b/home-manager/packages/waybar/waybar.nix
index 8ef103f..8b5c2a2 100644
--- a/home-manager/packages/waybar/waybar.nix
+++ b/home-manager/packages/waybar/waybar.nix
@@ -16,14 +16,6 @@ home.packages = with pkgs; [
         spacing = 4;
          
         # Module layout
-        modules-left = [
-          "sway/workspaces"
-          "sway/mode"
-          "sway/scratchpad"
-        ];
-        modules-center = [
-          "sway/window"
-        ];
         modules-right = [
           "idle_inhibitor"
           "pulseaudio"
@@ -53,17 +45,6 @@ home.packages = with pkgs; [
           };
         };
           
-        "sway/mode" = {
-          format = "<span style=\"italic\">{}</span>";
-        };
-          
-          "sway/scratchpad" = {
-            format = "{icon} {count}";
-            show-empty = false;
-            format-icons = ["" ""];
-            tooltip = true;
-            tooltip-format = "{app}: {title}";
-          };
           
           "idle_inhibitor" = {
             format = "{icon}";
@@ -182,202 +163,204 @@ home.packages = with pkgs; [
           on-click = "pavucontrol";
         };
       };
+    };
       
       # Waybar styling inspired by the referenced swayhome configuration
       style = ''
-        * {
-          font-family: "JetBrains Mono", "Font Awesome 6 Free";
-          font-size: 13px;
-        }
+          * {
+  font-family: "JetBrains Mono", "Font Awesome 6 Free";
+  font-size: 13px;
+}
 
-        window#waybar {
-          color: #ffffff;
-          background-color: #1e3b28;
-          border-bottom: 3px solid #8f2fef;
-          transition-property: background-color;
-          transition-duration: .5s;
-        }
+window#waybar {
+  color: #ffffff;
+  background-color: #1e3b28;
+  border-bottom: 3px solid #8f2fef;
+  transition-property: background-color;
+  transition-duration: .5s;
+}
 
-        window#waybar.hidden {
-          opacity: 0.2;
-        }
+window#waybar.hidden {
+  opacity: 0.2;
+}
 
-        button {
-          box-shadow: inset 0 -3px transparent;
-          border: none;
-          border-radius: 0;
-        }
+button {
+  box-shadow: inset 0 -3px transparent;
+  border: none;
+  border-radius: 0;
+}
 
-        button:hover {
-          background: inherit;
-          box-shadow: inset 0 -3px #ffffff;
-        }
+button:hover {
+  background: inherit;
+  box-shadow: inset 0 -3px #ffffff;
+}
 
-        #workspaces button {
-          padding: 0 15px;
-          background-color: transparent;
-          border: 2px solid #8f2fef
-        }
+#workspaces button {
+  padding: 0 15px;
+  background-color: transparent;
+  border: 2px solid #8f2fef
+}
 
-        #workspaces button:hover {
-          background: rgba(255, 255, 255, 0.2);
-        }
+#workspaces button:hover {
+  background: rgba(255, 255, 255, 0.2);
+}
 
-        #workspaces button.focused {
-          background-color: #8f2fef;
-          box-shadow: inset 0 -3px #ffffff;
-        }
+#workspaces button.focused {
+  background-color: #8f2fef;
+  box-shadow: inset 0 -3px #ffffff;
+}
 
-        #workspaces button.urgent {
-          background-color: #f38ba8;
-        }
+#workspaces button.urgent {
+  background-color: #f38ba8;
+}
 
-        #backlight,
-        #battery,
-        #clock,
-        #cpu,
-        #memory,
-        #mode,
-        #network,
-        #pulseaudio,
-        #temperature,
-        #tray,
-        #idle_inhibitor,
-        #keyboard-state,
-        #power-profiles-daemon {
-          padding: 0 8px;
-        }
+#backlight,
+#battery,
+#clock,
+#cpu,
+#memory,
+#mode,
+#network,
+#pulseaudio,
+#temperature,
+#tray,
+#idle_inhibitor,
+#keyboard-state,
+#power-profiles-daemon {
+  padding: 0 8px;
+}
 
-        #window,
-        #workspaces {
-          margin: 0 8px;
-        }
+#window,
+#workspaces {
+  margin: 0 8px;
+}
 
-        .modules-left > widget:first-child > #workspaces {
-          margin-left: 0;
-        }
+.modules-left>widget:first-child>#workspaces {
+  margin-left: 0;
+}
 
-        .modules-right > widget:last-child > #workspaces {
-          margin-right: 0;
-        }
+.modules-right>widget:last-child>#workspaces {
+  margin-right: 0;
+}
 
-        #backlight {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #cba6f7;
-        }
+#backlight {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #cba6f7;
+}
 
-        #battery {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #a6e3a1;
-        }
+#battery {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
 
-        #battery.critical.discharging {
-          background-color: #f38ba8;
-          animation: blink 1s infinite;
-        }
+#battery.critical.discharging {
+  background-color: #f38ba8;
+  animation: blink 1s infinite;
+}
 
-        #battery.warning.discharging {
-          background-color: #f9e2af;
-          animation: blink 1s infinite;
-        }
+#battery.warning.discharging {
+  background-color: #f9e2af;
+  animation: blink 1s infinite;
+}
 
-        @keyframes blink {
-          to {
-            background-color: transparent;
-          }
-        }
+@keyframes blink {
+  to {
+    background-color: transparent;
+  }
+}
 
-        #clock {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #a6e3a1;
-        }
+#clock {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
 
-        #cpu {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #cba6f7;
-        }
+#cpu {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #cba6f7;
+}
 
-        #memory {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #f9e2af;
-        }
+#memory {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f9e2af;
+}
 
-        #mode {
-          color: #ffffff;
-          background-color: #8f2fef;
-          border-bottom: 3px solid #ffffff;
-        }
+#mode {
+  color: #ffffff;
+  background-color: #8f2fef;
+  border-bottom: 3px solid #ffffff;
+}
 
-        #network {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #a6e3a1;
-        }
+#network {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
 
-        #network.disconnected {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #f38ba8;
-        }
+#network.disconnected {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
 
-        #pulseaudio {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #a6e3a1;
-        }
+#pulseaudio {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
 
-        #pulseaudio.muted {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #f38ba8;
-        }
+#pulseaudio.muted {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
 
-        #temperature {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #a6e3a1;
-        }
+#temperature {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #a6e3a1;
+}
 
-        #temperature.critical {
-          background-color: transparent;
-          border-bottom: 3px solid #f38ba8;
-        }
+#temperature.critical {
+  background-color: transparent;
+  border-bottom: 3px solid #f38ba8;
+}
 
-        #tray {
-          background-color: transparent;
-          border-bottom: 3px solid #8f2fef;
-        }
+#tray {
+  background-color: transparent;
+  border-bottom: 3px solid #8f2fef;
+}
 
-        #idle_inhibitor {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #f9e2af;
-        }
-        #idle_inhibitor.activated {
-          color: #1e3b28;
-          background-color: #f9e2af;
-          border-bottom: 3px solid #f9e2af;
-        }
+#idle_inhibitor {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #f9e2af;
+}
 
-        #keyboard-state {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #fab387;
-        }
+#idle_inhibitor.activated {
+  color: #1e3b28;
+  background-color: #f9e2af;
+  border-bottom: 3px solid #f9e2af;
+}
 
-        #power-profiles-daemon {
-          color: #ffffff;
-          background-color: transparent;
-          border-bottom: 3px solid #94e2d5;
-        }
-      '';
+#keyboard-state {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #fab387;
+}
+
+#power-profiles-daemon {
+  color: #ffffff;
+  background-color: transparent;
+  border-bottom: 3px solid #94e2d5;
+}
+        '';
     };
-  };
+  
   
 }