diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix
index cc1ca35b..f4c32bb8 100644
--- a/configurations/laptop/home.nix
+++ b/configurations/laptop/home.nix
@@ -6,7 +6,9 @@
       # Global Config, always to be included
       ./../../global-home.nix
       ./../../modules/nixos/cspark-desktop-plasma/home.nix
+      ./../../modules/nixos/cspark-desktop-gnome/home.nix
       ./../../modules/nixos/cspark-desktop-sway/home.nix
+      ./../../modules/nixos/cspark-desktop-niri/home.nix
     ];
 
   # KDE Connect
@@ -15,7 +17,9 @@
 
   # Custom Desktop Configurations
   # cspark-desktop-plasma-config-1.enable = true;
+  # cspark-desktop-gnome-config-1.enable = true;
   # cspark-desktop-sway-config-1.enable = true;
+  cspark-desktop-niri-config-1.enable = true;
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
index dc397ad5..637dcd70 100644
--- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
+++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
@@ -15,17 +15,17 @@
             "warning": 30,
             "critical": 15
         },
-        "bat":"BAT1",
-        "format": "{icon}   {capacity}%",
-        "format-charging": "   {capacity}%",
-        "format-plugged": "   {capacity}%",
-        "format-discharging": "   {capacity}%",
+        "bat":"BAT0",
+        "format": "{icon} {capacity}%",
+        "format-charging": "󰂄  {capacity}%",
+        "format-plugged": "  {capacity}%",
+        "format-discharging": "  {capacity}%",
         "format-alt": "{icon} {time}",
         "format-icons": ["", "", "", "", ""]
     },
     "network": {
         "format": "{ifname}",
-        "format-wifi": " {essid}",
+        "format-wifi": "  {essid}",
         "format-ethernet": "  {ifname}",
         "format-disconnected": "  No Internet",
         "tooltip-format-wifi": "{signalStrength}%",
diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
index e84fb2e7..ce7c5104 100644
--- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
+++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
@@ -15,6 +15,7 @@ window#waybar {
   background: @background-color;
   color: @foreground-color;
   padding: 5px;
+  border-radius: 10px;
 }
 
 #clock {