diff --git a/themes/base/.config/xdg-desktop-portal/portals.conf b/themes/base/.config/xdg-desktop-portal/portals.conf
index d292d89..78125d2 100644
--- a/themes/base/.config/xdg-desktop-portal/portals.conf
+++ b/themes/base/.config/xdg-desktop-portal/portals.conf
@@ -1,3 +1,3 @@
 [preferred]
-default=hyprland;gtk;
+default=wlr;gtk;
 org.freedesktop.impl.portal.FileChooser=termfilechooser;
diff --git a/themes/dracula/.config/sway/config b/themes/dracula/.config/sway/config
index be8d8e9..3ef62c7 100644
--- a/themes/dracula/.config/sway/config
+++ b/themes/dracula/.config/sway/config
@@ -22,10 +22,12 @@ set $up k
 set $right l
 
 set $term kitty
-set $menu rofi -show drun
+set $menu kitty --app-id fsel fsel -r -d
+set $launcher kitty --app-id otter-launcher otter-launcher
 set $browser /home/henry/AppImages/helium.appimage
 set $filemanager kitty -e yazi
-for_window [app_id="rofi"] floating enable
+for_window [app_id="fsel"] border pixel 2
+for_window [app_id="otter-launcher"] border pixel 2
 
 # -Key bindings-
 
@@ -33,6 +35,7 @@ for_window [app_id="rofi"] floating enable
     bindsym $mod+Return exec $term
     bindsym $mod+q kill
     bindsym $mod+space exec $menu
+    bindsym $mod+d exec $launcher
     floating_modifier $mod normal
     bindsym $mod+Shift+r reload
     bindsym $mod+Shift+e exit
@@ -40,12 +43,10 @@ for_window [app_id="rofi"] floating enable
 # App launchers:
     bindsym $mod+b exec $browser
     bindsym $mod+e exec $filemanager
-    bindsym $mod+w exec ~/.config/rofi/wallpaper_selector.sh
     bindsym $mod+p exec wlogout
     bindsym $mod+s exec steam
     bindsym $mod+a exec mumble
     bindsym $mod+z exec swaylock -f -c 282a36
-    bindsym $mod+o exec killall -SIGUSR2 waybar
 
 # Moving around:
     bindsym $mod+$left focus left
@@ -80,31 +81,31 @@ for_window [app_id="rofi"] floating enable
     bindsym $mod+n workspace number 11
     bindsym $mod+m workspace number 12
 
-# Move window silently to workspace:
-    bindsym $mod+Shift+1 move container to workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9
-    bindsym $mod+Shift+0 move container to workspace number 10
-    bindsym $mod+Shift+n move container to workspace number 11
-    bindsym $mod+Shift+m move container to workspace number 12
-
 # Move window to workspace and follow:
-    bindsym $mod+Ctrl+1 move container to workspace number 1; workspace number 1
-    bindsym $mod+Ctrl+2 move container to workspace number 2; workspace number 2
-    bindsym $mod+Ctrl+3 move container to workspace number 3; workspace number 3
-    bindsym $mod+Ctrl+4 move container to workspace number 4; workspace number 4
-    bindsym $mod+Ctrl+5 move container to workspace number 5; workspace number 5
-    bindsym $mod+Ctrl+6 move container to workspace number 6; workspace number 6
-    bindsym $mod+Ctrl+7 move container to workspace number 7; workspace number 7
-    bindsym $mod+Ctrl+8 move container to workspace number 8; workspace number 8
-    bindsym $mod+Ctrl+9 move container to workspace number 9; workspace number 9
-    bindsym $mod+Ctrl+0 move container to workspace number 10; workspace number 10
+    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10; workspace number 10
+    bindsym $mod+Shift+n move container to workspace number 11; workspace number 11
+    bindsym $mod+Shift+m move container to workspace number 12; workspace number 12
+
+# Move window silently to workspace:
+    bindsym $mod+Ctrl+1 move container to workspace number 1
+    bindsym $mod+Ctrl+2 move container to workspace number 2
+    bindsym $mod+Ctrl+3 move container to workspace number 3
+    bindsym $mod+Ctrl+4 move container to workspace number 4
+    bindsym $mod+Ctrl+5 move container to workspace number 5
+    bindsym $mod+Ctrl+6 move container to workspace number 6
+    bindsym $mod+Ctrl+7 move container to workspace number 7
+    bindsym $mod+Ctrl+8 move container to workspace number 8
+    bindsym $mod+Ctrl+9 move container to workspace number 9
+    bindsym $mod+Ctrl+0 move container to workspace number 10
     bindsym $mod+Ctrl+Left move container to workspace prev; workspace prev
     bindsym $mod+Ctrl+Right move container to workspace next; workspace next
 
diff --git a/themes/dracula/.config/sway/exec b/themes/dracula/.config/sway/exec
index a67e3de..b7a53fb 100644
--- a/themes/dracula/.config/sway/exec
+++ b/themes/dracula/.config/sway/exec
@@ -1,8 +1,9 @@
 exec_always autotiling
+exec swayidle -w \
+    timeout 1800 'swaymsg "output * dpms off"' \
+    resume 'swaymsg "output * dpms on"'
 exec export QT_QPA_PLATFORMTHEME=qt6ct
 exec export XDG_CURRENT_DESKTOP=sway
 exec systemctl --user set-environment XDG_CURRENT_DESKTOP=sway
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
 exec systemctl --user start xdg-desktop-portal-wlr.service
-exec waybar -c ~/.config/waybar/sway-config -s ~/.config/waybar/style.css
-exec $term
diff --git a/themes/dracula/.config/sway/theme b/themes/dracula/.config/sway/theme
index 148478b..2d2cc26 100644
--- a/themes/dracula/.config/sway/theme
+++ b/themes/dracula/.config/sway/theme
@@ -9,7 +9,25 @@ seat seat0 xcursor_theme Dracula 24
 
 # Status Bar:
 bar {
-  swaybar_command waybar
+  swaybar_command swaybar
+  font Iosevka Term 12
+  position top
+  workspace_min_width 36
+  tray_padding 4
+  status_command while echo "$(df / --output=pcent | tail -1 | tr -d ' ')  $(date +'%m/%d/%Y %I:%M %p')"; do sleep 30; done
+  colors {
+    background         #282a36
+    statusline         #f8f8f2
+    separator          #44475a
+    focused_background #282a36
+    focused_statusline #f8f8f2
+    focused_separator  #44475a
+    focused_workspace  #bd93f9 #282a36 #bd93f9
+    active_workspace   #6272a4 #282a36 #6272a4
+    inactive_workspace #282a36 #282a36 #44475a
+    urgent_workspace   #ff5555 #282a36 #ff5555
+    binding_mode       #ffb86c #282a36 #ffb86c
+  }
 }
 
 # -Colors-
@@ -21,7 +39,6 @@ client.urgent             #ff5555   #282a36   #f8f8f2   #ff5555   #ff5555
 client.placeholder        #282a36   #282a36   #f8f8f2   #282a36   #282a36
 
 # Swayfx
-# comment these out if you don't use swayfx
 #blur enable
 #corner_radius 4
 #shadows enable