diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf
deleted file mode 100644
index 6250fa6..0000000
--- a/.config/hypr/autostart.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-exec-once = nm-applet &
-exec-once = waybar &
-exec-once = hyprpm reload -n
\ No newline at end of file
diff --git a/.config/hypr/bindings.conf b/.config/hypr/bindings.conf
index a4eb51b..01e6409 100644
--- a/.config/hypr/bindings.conf
+++ b/.config/hypr/bindings.conf
@@ -2,8 +2,8 @@
 
 $terminal = alacritty
 $fileManager = thunar
-$menu = rofi -show drun -config "$HOME/.config/rofi/config.rasi"
-$browser = librewolf
+$menu = rofi -show drun -config ~/.config/rofi/config.rasi
+$browser = brave
 $code = code
 $lock = hyprlock
 
@@ -16,6 +16,7 @@ bind = $mainMod, B, exec, $browser
 bind = $mainMod, L, exec, $lock
 bind = $mainMod, C, exec, $code
 bind = $mainMod, RETURN, exec, $terminal
+bind = $mainMod SHIFT, E, exit
 
 # Window control
 bind = $mainMod, Q, killactive,
diff --git a/.config/hypr/env.conf b/.config/hypr/env.conf
deleted file mode 100644
index ff61e79..0000000
--- a/.config/hypr/env.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# https://wiki.hyprland.org/Configuring/Environment-variables
-
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
\ No newline at end of file
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index bebe3e7..cb60fb8 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,14 +1,18 @@
 # https://wiki.hyprland.org/Configuring/
 
-source = autostart.conf
 source = bindings.conf
-source = env.conf
 source = input.conf
 source = monitors.conf
 source = rules.conf
 
+exec-once = nm-applet &
+exec-once = waybar &
 exec-once = hyprpm reload -n
 
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+env = HYPRCURSOR_THEME,Bibata-Modern-Ice
+
 general {
     # https://wiki.hyprland.org/Configuring/Variables/#general
     gaps_in = 5
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 7ba8031..292df4f 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,12 +1,53 @@
-# sample hyprlock.conf
-# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
+background {
+    monitor =
+    path = ~/wallpapers/solace1.jpg
+    color = rgba(25, 20, 20, 1.0)
+    blur_passes = 2
+}
 
 input-field {
-  monitor = DP-3
-  fade_on_empty = false
+    monitor =
+    size = 10%, 5%
+    outline_thickness = 4
+    inner_color = rgba(255, 255, 255, 1) # white fill
+    shadow_passes = 6 # shadow
+
+    outer_color=000000
+    check_color=000000
+    fail_color=#ff
+
+    font_color = rgb(30, 30, 30)
+    fade_on_empty = true
+    rounding = 16
+
+    position = 0, -20
+    halign = center
+    valign = center
 }
 
-background {
-  color = #313244;
+label {
+    monitor =
+    text = Hi there, $USER
+    color = rgba(240, 240, 240, 0.8)
+    font_size = 25
+    font_family = Fira Sans
+    shadow_passes = 4
+    shadow_size = 3
+
+    position = 0, 80
+    halign = center
+    valign = center
 }
 
+label {
+    monitor =
+    text = $TIME12
+    color = rgba(255,255,255,1)
+    font_size = 35
+    font_family = Fira Sans Bold
+    shadow_passes = 6
+    
+    position = 0, 120
+    halign = center
+    valign = center
+}
\ No newline at end of file
diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf
index 951378e..de19f86 100644
--- a/.config/hypr/rules.conf
+++ b/.config/hypr/rules.conf
@@ -4,6 +4,9 @@
 windowrulev2 = suppressevent maximize, class:.*
 windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
+# Fix some dragging issues with XWayland
+windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
 # Fix odd behaviors in IntelliJ IDEs
 windowrulev2 = center,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
 windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index a95c176..ce4be8a 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -2,4 +2,8 @@
 
 configuration {
 	font: "JetBrainsMono Nerd Font 12";
+}
+
+* {
+    color1: #191414;
 }
\ No newline at end of file
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index a02e1f6..e510f51 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -6,7 +6,7 @@
     "passthrough": false,
     "gtk-layer-shell": true,
     "height": 50,
-    "modules-left": ["custom/launch_wofi","hyprland/workspaces","cpu","memory","disk","clock"],
+    "modules-left": ["custom/launch_rofi","hyprland/workspaces","cpu","memory","disk","clock"],
     "modules-center": ["wlr/taskbar"],
     "modules-right": ["network","battery","backlight","pulseaudio","pulseaudio#microphone","tray"],
     
@@ -15,9 +15,9 @@
         "format": "{}"
     },
 
-    "custom/launch_wofi": {
+    "custom/launch_rofi": {
         "format": "",
-        "on-click": "sh -c '(killall wofi; wofi --show drun)' & disown",
+        "on-click": "sh -c 'rofi -show drun -config ~/.config/rofi/config.rasi' & disown",
         "tooltip": false
     },
 
diff --git a/setup.sh b/setup.sh
index 21ee887..abae13c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,14 +1,26 @@
 #!/bin/bash
 
-stow . --adopt
-git reset --hard
+curl -sS https://starship.rs/install.sh | sh
 
 sudo pacman -Syu --noconfirm
 sudo pacman -S --noconfirm \
-    librewolf \
     code \
     alacritty \
-    thunar
+    thunar \
+    ttf-jetbrains-mono-nerd \
+    ttf-font-awesome \
+    stow \
+    nwg-look \
+    nwg-displays \
+    cmake \
+    meson \
+    cpio \
+    network-manager-applet \
+    nm-connection-editor \
+    pavucontrol \
+    wl-clipboard \
+    orchis-theme \
+    swaync
 
 if ! command -v yay 2>&1 >/dev/null
 then
@@ -37,7 +49,9 @@ yay -S --noconfirm  \
     aquamarine-git \
     hyprgraphics-git \
     hyprland-qtutils-git \
-    rofi-lbonn-wayland-git
+    hyprland-git \
+    rofi-lbonn-wayland-git \
+    librewolf-bin
 
 hyprpm add https://github.com/Duckonaut/split-monitor-workspaces
 hyprpm enable split-monitor-workspaces