diff --git a/hosts/gorgon/home/default.nix b/hosts/gorgon/home/default.nix
index 62165ce..6541c9b 100644
--- a/hosts/gorgon/home/default.nix
+++ b/hosts/gorgon/home/default.nix
@@ -10,6 +10,7 @@ let
     "kitty"
     "keyring"
     "ssh"
+    "sway"
     "syncthing"
     "tmux"
     "xdg"
diff --git a/modules/home/sway/config b/modules/home/sway/config
index f5a8382..610a33b 100644
--- a/modules/home/sway/config
+++ b/modules/home/sway/config
@@ -1,4 +1,3 @@
-set $wallpaper ~/.config/nixpkgs/modules/sway/wallpaper
 set $foreground	#a3a3a3ff
 set $background	#1f2022e5
 set $dark_black	#1f2022ff
@@ -32,7 +31,7 @@ bindsym $mod+Shift+r restart
 # the font to be used for i3bar and window decorations
 font pango:Source Code Pro 8
 
-bindsym $mod+Return exec termite
+bindsym $mod+Return exec kitty
 bindsym $mod+Space exec bemenu-run
 
 # switch keyboard to neo
@@ -107,13 +106,13 @@ workspace_layout tabbed
 workspace_auto_back_and_forth yes
 
 # messaging
-workspace 2 output LVDS-1
+#workspace 2 output LVDS-1
 
 # web and doc
-workspace 1 output VGA-1
+#workspace 1 output VGA-1
 
 # editor and IDE
-workspace 3 output DP-2
+#workspace 3 output DP-2
 
 # change focus
 bindsym $mod+h focus left
@@ -197,7 +196,7 @@ mode "$mode_move" {
 }
 
 # lock the screen
-bindsym $mod+equal exec ~/bin/lock-session
+bindsym $mod+equal exec lock-session
 
 # control volume
 bindsym --locked XF86AudioRaiseVolume exec amixer set 'Master' 5%+ && pkill -RTMIN+10 i3blocks
@@ -220,7 +219,7 @@ bindsym --locked XF86MonBrightnessDown exec brightnessctl set -d intel_backlight
 # Basic bar configuration using the Base16 variables.
 bar {
 	id bar
-	status_command i3blocks
+	status_command i3status
 	mode dock
 	modifier $mod
 	position bottom
@@ -265,22 +264,6 @@ input 2:7:SynPS/2_Synaptics_TouchPad {
 	events disabled
 }
 
-output VGA-1 {
-	background $wallpaper fill
-	pos 0 0
-}
-
-output DP-2 {
-	background $wallpaper fill
-	pos 1280 0
-}
-
-output LVDS-1 {
-	background $wallpaper fill
-	pos 3840 0
-}
-
-
 seat * {
 	hide_cursor 5000
 }
@@ -298,9 +281,3 @@ assign [app_id="org.keepassxc.KeePassXC"] workspace 10
 
 exec xset s off
 exec mako
-#exec swayidle -w timeout 300 '$HOME/bin/lock-session' timeout 240 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep '$HOME/bin/lock-session' lock '$HOME/bin/lock-session'
-#exec redshift
-#exec keepassxc
-#exec firefox
-#exec thunderbird
-#exec riot-desktop 
diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix
index 604a308..cd3883f 100644
--- a/modules/home/sway/default.nix
+++ b/modules/home/sway/default.nix
@@ -14,11 +14,15 @@ in
       xwayland
       mako
       kanshi
-      i3blocks
-      termite
+      kitty
+      i3status
+      kitty
       bemenu
       xss-lock
       swaylock
+      brightnessctl
+      playerctl
+      dadadaScripts
     ];
 
     wayland.windowManager.sway = {