diff --git a/sway/config b/sway/config
index b00ca34..daca776 100755
--- a/sway/config
+++ b/sway/config
@@ -26,7 +26,7 @@ set $filemanager nemo
 set $dmenu tofi
 set $menu j4-dmenu-desktop --no-generic --dmenu="$dmenu"
 set $background ~/.wallpaper
-set $lock swaylock -i $background
+set $lock swaylock -i $background -F
 set $bar yambar
 ### Output configuration
 #
@@ -51,10 +51,25 @@ output * bg $background fill
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
+
+exec swayidle -w timeout 120 "$lock"
+
 exec_always ~/.config/dotfiles/sway/lock.sh
 exec_always libinput-gestures
 
 
+# Assign Windows to Workspaces
+for_window [app_id="kitty"] move container to workspace 1; workspace 1
+for_window [app_id="zen"] move container to workspace 2; workspace 2
+for_window [app_id="firefox"] move container to workspace 2; workspace 2
+for_window [app_id="dev.zed.Zed"] move container to workspace 3; workspace 3
+for_window [app_id="Code"] move container to workspace 3; workspace 3
+for_window [app_id="Element"] move container to workspace 5; workspace 5
+
+# Floating Rules
+for_window [app_id="org.pulseaudio.pavucontrol"] floating enable
+
+
 default_border pixel
 blur enable
 corner_radius 10
@@ -71,6 +86,12 @@ layer_effects "launcher" {
 }
 gaps inner 2
 
+
+# Colorscheme
+client.focused #84A0C6 #84A0C6 #ffffff
+client.urgent #E27878 #E27878 #ffffff
+client.focused_inactive #2E313F #2E313F #ffffff
+
 ### Input configuration
 #
 # Example configuration:
@@ -274,6 +295,6 @@ bindsym $mod+r mode "resize"
 #          inactive_workspace #32323288 #32323288 #ffffff
 #      }
 # }
-exec_always $bar
+exec $bar
 
 include /etc/sway/config.d/*
diff --git a/sway/dmenu-bluetooth.sh b/sway/dmenu-bluetooth.sh
index fddaafe..0fc013c 100755
--- a/sway/dmenu-bluetooth.sh
+++ b/sway/dmenu-bluetooth.sh
@@ -329,7 +329,7 @@ run_dmenu() {
             DMENU_BLUETOOTH_LAUNCHER="fuzzel --dmenu"
             ;;
     esac
-    $DMENU_BLUETOOTH_LAUNCHER -i -p "$DMENU_BLUETOOTH_PROMPT" "${dmenu_args[@]}"
+    $DMENU_BLUETOOTH_LAUNCHER "${dmenu_args[@]}"
 }
 
 print_help() {