diff --git a/sway-home/.config/nwg-panel/archlabs.json b/sway-home/.config/nwg-panel/archlabs.json
index 7ea29764..3c8ee20c 100644
--- a/sway-home/.config/nwg-panel/archlabs.json
+++ b/sway-home/.config/nwg-panel/archlabs.json
@@ -104,6 +104,10 @@
 		},
 		"sway-workspaces": {
 			"show-layout": false,
+			"show-icon": true,
+			"name-length": 40,
+			"mark-autotiling": false,
+			"mark-content": true,
 			"numbers": [
 				"1",
 				"2",
@@ -132,7 +136,7 @@
 			"interval": 900,
 			"icon-size": 16,
 			"on-left-click": "foot bash -c 'baph -unN ; read -p \"Press Enter to finish\"'",
-			"tooltip-text": "",
+			"tooltip-text": "AUR & Official Updates",
 			"on-middle-click": "",
 			"on-right-click": "",
 			"on-scroll-up": "",
diff --git a/sway-home/.config/nwg-panel/config b/sway-home/.config/nwg-panel/config
index 7ea29764..3c8ee20c 100644
--- a/sway-home/.config/nwg-panel/config
+++ b/sway-home/.config/nwg-panel/config
@@ -104,6 +104,10 @@
 		},
 		"sway-workspaces": {
 			"show-layout": false,
+			"show-icon": true,
+			"name-length": 40,
+			"mark-autotiling": false,
+			"mark-content": true,
 			"numbers": [
 				"1",
 				"2",
@@ -132,7 +136,7 @@
 			"interval": 900,
 			"icon-size": 16,
 			"on-left-click": "foot bash -c 'baph -unN ; read -p \"Press Enter to finish\"'",
-			"tooltip-text": "",
+			"tooltip-text": "AUR & Official Updates",
 			"on-middle-click": "",
 			"on-right-click": "",
 			"on-scroll-up": "",
diff --git a/sway-home/.config/sway/config b/sway-home/.config/sway/config
index 29f0bd75..a3badcca 100644
--- a/sway-home/.config/sway/config
+++ b/sway-home/.config/sway/config
@@ -321,9 +321,11 @@ bindsym $Mod+Control+Shift+minus gaps outer all     minus 5
 ############    application settings   ############
 
 # focus, floating, & sticky
-for_window [app_id="(?i)(?:pavucontrol|blueman-manager|galculator|azote|gnome-disks|gsimplecal)"] floating enable
+for_window [app_id="(?i)(?:blueman-manager|azote|gnome-disks|nwg-shell-config|nwg-panel-config)"] floating enable
+for_window [app_id="(?i)(?:pavucontrol|nm-connection-editor|gsimplecal|galculator)"] floating enable
 for_window [class="(?i)(?:lxappearance)"] floating enable
 for_window [app_id="(?i)(?:firefox|chromium)"] border none
 for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
 
+
 popup_during_fullscreen smart
diff --git a/sway-home/.local/share/nwg-shell-config/settings b/sway-home/.local/share/nwg-shell-config/settings
new file mode 100644
index 00000000..0b543b6a
--- /dev/null
+++ b/sway-home/.local/share/nwg-shell-config/settings
@@ -0,0 +1,18 @@
+{
+  "keyboard-layout": "",
+  "autotiling-workspaces": "1 2 3 4 5 6 7 8",
+  "autotiling-on": true,
+  "night-lat": -1,
+  "night-long": -1,
+  "night-temp-low": 4500,
+  "night-temp-high": 6500,
+  "night-gamma": 1.0,
+  "night-on": true,
+  "terminal": "foot",
+  "file-manager": "thunar",
+  "editor": "mousepad",
+  "browser": "chromium --disable-gpu-memory-buffer-video-frames --enable-features=UseOzonePlatform --ozone-platform=wayland",
+  "panel-preset": "custom",
+  "panel-custom": "archlabs.json",
+  "show-on-startup": true
+}