diff --git a/README.md b/README.md
index b69aa8174..bfe4be092 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,9 @@
-# Drake's Dotfiles (Void Linux - Sway Compositor)
+# neodotfiles - sway
 
-This is just a personal repository where i store all my dotfiles, you're free
-clone them and edit them as you wish. Part of this work was based on other
-people's dotfiles (Distrotube for example), and it may contain scripts or
-binaries that they made or modify.
-
-This is a rice made specifically for Void Linux and it uses the sway wayland
+This is a rice made specifically for Arch Linux and it uses the sway wayland
 compositor.
 
 ### Dependencies
 ``` sh
-sudo xbps-install sway swaybg swayidle swaylock wezterm mako fuzzel Waybar wl-clipboard cliphist pamixer light playerctl xdg-desktop-portal-wlr xdg-desktop-portal-gtk wdisplays grim slurp gsettings-desktop-schemas
+paru -S sway swaybg swayidle swaylock foot mako fuzzel waybar wl-clipboard cliphist swayosd-git playerctl xdg-desktop-portal-wlr xdg-desktop-portal-gtk wdisplays grim slurp gsettings-desktop-schemas chayang kanshi starship bat eza fish fd ripgrep yazi mpv zathura zathura-pdf-poppler zathura-cb ueberzugpp gnome-keyring polkit-gnome wf-recorder pulsemixer ani-cli-git ytfzf-git musikcube newsboat btop wdisplays
 ```
diff --git a/config/btop/btop.conf b/config/btop/btop.conf
index 42753d077..44e27c64b 100644
--- a/config/btop/btop.conf
+++ b/config/btop/btop.conf
@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.2.13
+#? Config file for btop v. 1.3.2
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -37,6 +37,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -46,21 +49,21 @@ graph_symbol_net = "default"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_proc = "default"
 
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
 shown_boxes = "cpu mem net proc"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
-update_ms = 200
+update_ms = 500
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "pid"
+proc_sorting = "memory"
 
 #* Reverse sorting order, True or False.
 proc_reversed = False
 
 #* Show processes as a tree.
-proc_tree = False
+proc_tree = True
 
 #* Use the cpu graph colors in the process list.
 proc_colors = True
@@ -86,6 +89,9 @@ proc_left = False
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
 proc_filter_kernel = False
 
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = False
+
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_upper = "total"
@@ -94,6 +100,9 @@ cpu_graph_upper = "total"
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_lower = "total"
 
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
 #* Toggles if the lower CPU graph should be inverted.
 cpu_invert_lower = True
 
@@ -207,6 +216,33 @@ show_battery = True
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
+#* Show power stats of battery next to charge indicator.
+show_battery_watts = True
+
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
\ No newline at end of file
+log_level = "WARNING"
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = True
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = True
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""
diff --git a/config/foot/foot.ini b/config/foot/foot.ini
index f6c826311..f0e782aa7 100644
--- a/config/foot/foot.ini
+++ b/config/foot/foot.ini
@@ -8,7 +8,7 @@ shell=fish
 # title=foot
 # locked-title=no
 
-font=Mononoki Nerd Font:size=14
+font=Mononoki Nerd Font:size=12
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
diff --git a/config/fuzzel/fuzzel.ini b/config/fuzzel/fuzzel.ini
index 277905314..5f19a07c9 100644
--- a/config/fuzzel/fuzzel.ini
+++ b/config/fuzzel/fuzzel.ini
@@ -1,4 +1,4 @@
-font=Mononoki Nerd Font:size=14
+font=Mononoki Nerd Font:size=12
 dpi-aware=no
 prompt=" "
 icon-theme=Papirus-Dark
diff --git a/config/fuzzel/scripts/rs_emoji b/config/fuzzel/scripts/rs_emoji
index aa3b31167..10b192c80 100755
--- a/config/fuzzel/scripts/rs_emoji
+++ b/config/fuzzel/scripts/rs_emoji
@@ -44,7 +44,7 @@ check_dependencies() {
 check_dependencies
 
 # Pass emoji data into the menu
-sed '1,/^### DATA ###$/d' $0 | $RUNNER -i -p "[󰙃 Select Emoji] " | cut -d ' ' -f 1 | tr -d '\n' | wl-copy
+sed '1,/^### DATA ###$/d' $0 | $RUNNER -i -p "[󰙃 Select Emoji]  " | cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 ##############
 # Emoji Data #
diff --git a/config/fuzzel/scripts/rs_scrot b/config/fuzzel/scripts/rs_scrot
index 5e9df58b8..bc370620a 100755
--- a/config/fuzzel/scripts/rs_scrot
+++ b/config/fuzzel/scripts/rs_scrot
@@ -102,12 +102,12 @@ CheckDependencies() {
 
 # Prompt user for screenshot action
 ShotActionPrompt() {
-    shotActionCases=$(echo -e "$subShotChoices" | $RUNNER -l 3 -i -p "[  What do you want to do with this screenshot?] ")
+    shotActionCases=$(echo -e "$subShotChoices" | $RUNNER -l 3 -i -p "[  What do you want to do with this screenshot?]  ")
 }
 
 # Prompt user for screenshot delay
 DelayPrompt() {
-    delayActionsCases=$(echo -e "$delayChoices" | $RUNNER -l 4 -i -p "[ Select Delay] ")
+    delayActionsCases=$(echo -e "$delayChoices" | $RUNNER -l 4 -i -p "[ Select Delay]  ")
 }
 
 # Take a full screen screenshot without delay
@@ -218,7 +218,7 @@ VidArea() {
 
 # Record the entire screen with audio
 VidScreenAudio() {
-    local chosenPrettyDevice=$(echo -e "$audioDescriptions" | $RUNNER -i -p "󰕾 Select audio input")
+    local chosenPrettyDevice=$(echo -e "$audioDescriptions" | $RUNNER -i -p "[󰕾 Select audio input]  ")
     local chosenDevice="${audioMap["$chosenPrettyDevice"]}"
     if [ -n "$chosenDevice" ]; then
         for ((i = 3; i >= 1; i--)); do
@@ -270,14 +270,14 @@ fi
 CheckDependencies
 
 # Display main menu and execute selected option
-mainCase=$(echo -e "$mainChoices" | $RUNNER -l 3 -i -p "[ Screenshot/Screencast Utility] ")
+mainCase=$(echo -e "$mainChoices" | $RUNNER -l 3 -i -p "[ Screenshot/Screencast Utility]  ")
 if [ -z "$mainCase" ]; then
     exit 0
 fi
 
 case $mainCase in
     "$mainChoice1")
-        shotCases=$(echo -e "$shotChoices" | $RUNNER -l 5 -i -p "[ Screenshot Menu] ") # screenshot menu prompt
+        shotCases=$(echo -e "$shotChoices" | $RUNNER -l 5 -i -p "[ Screenshot Menu]  ") # screenshot menu prompt
         case $shotCases in
             "$shotChoice1")
                 ShotScreen
@@ -297,7 +297,7 @@ case $mainCase in
         esac
         ;;
     "$mainChoice2")
-        vidCases=$(echo -e "$vidChoices" | $RUNNER -l 5 -i -p "[󰕧 Screencast Menu] ")
+        vidCases=$(echo -e "$vidChoices" | $RUNNER -l 5 -i -p "[󰕧 Screencast Menu]  ")
         case $vidCases in
             "$vidChoice1")
                 VidScreen
diff --git a/config/git/config b/config/git/config
index 250bc9707..b27ba990b 100644
--- a/config/git/config
+++ b/config/git/config
@@ -1,4 +1,4 @@
 [user]
 	mail = maverick.xero@proton.me
-	name = Clay Gomera
+	name = Lian Drake
 	email = maverick.xero@proton.me
diff --git a/config/sway/modules/autostart b/config/sway/modules/autostart
index f2f84531f..94784ef8b 100644
--- a/config/sway/modules/autostart
+++ b/config/sway/modules/autostart
@@ -4,14 +4,11 @@ exec {
     systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
     /usr/lib/xdg-desktop-portal-wlr
     kanshi
-    swayidle -w \
-        lock 'swaylock -f -i "$HOME/.config/sway/wallpaper/locked.*"' \
-        timeout 300 'swaylock -f -i "$HOME/.config/sway/wallpaper/locked.*"' \
-        timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-        before-sleep 'swaylock -f -i "$HOME/.config/sway/wallpaper/locked.*"'
+    $HOME/.config/sway/scripts/idle
     wl-paste --type text --watch cliphist store
     wl-paste --type image --watch cliphist store
     mako -c ~/.config/mako/config
+    swayosd-server
     /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
     gnome-keyring-daemon --start --components=secrets
 }
diff --git a/config/sway/modules/binds b/config/sway/modules/binds
index 0e3f5e6f4..9a6236cde 100644
--- a/config/sway/modules/binds
+++ b/config/sway/modules/binds
@@ -9,19 +9,19 @@ set $right l
 
 # Apps
 set $term foot
-set $chat flatpak run org.signal.Signal
+set $chat signal-desktop
 set $office flatpak run org.libreoffice.LibreOffice
 set $browser flatpak run com.brave.Browser
 set $file foot -T yazi -a yazi yazi
 set $editor neovide --neovim-bin $HOME/.local/bin/lvim
 set $music foot -T musikcube -a musikcube musikcube
+set $rss foot -T newsboat -a newsboat newsboat
 set $ani-cli foot -T ani-cli -a ani-cli ani-cli
 set $ytfzf foot -T ytfzf -a ytfzf ytfzf -flst
 set $ytfzf-music foot -T ytfzf-music -a ytfzf-music ytfzf -mlst
 set $flix-cli foot -T flix-cli -a flix-cli flix-cli
 set $audiomixer foot -T audiomixer -a audiomixer pulsemixer
 set $monitor foot -T monitor -a monitor btop
-set $newsboat foot -T newsboat -a newsboat newsboat
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -42,18 +42,18 @@ bindsym $mod+Return exec $term
 bindsym $mod+q kill
 
 # XF86 Keys
-bindsym XF86AudioRaiseVolume        exec pamixer -i 5
-bindsym XF86AudioLowerVolume        exec pamixer -d 5
-bindsym XF86AudioMute               exec pamixer -t
-bindsym XF86AudioMicMute            exec pamixer --default-source -t
+bindsym XF86AudioRaiseVolume        exec swayosd-client --output-volume +5
+bindsym XF86AudioLowerVolume        exec swayosd-client --output-volume -5
+bindsym XF86AudioMute               exec swayosd-client --output-volume mute-toggle
+bindsym XF86AudioMicMute            exec swayosd-client --input-volume mute-toggle
 bindsym XF86AudioPause              exec playerctl play-pause
 bindsym XF86AudioPlay               exec playerctl play-pause
 bindsym XF86AudioNext               exec playerctl next
 bindsym XF86AudioPrev               exec playerctl previous
 bindsym XF86AudioStop               exec playerctl stop
-bindsym XF86News                    exec $newsboat
-bindsym XF86MonBrightnessUp         exec brightnessctl s 5%+
-bindsym XF86MonBrightnessDown       exec brightnessctl s 5%-
+bindsym XF86MonBrightnessUp         exec swayosd-client --brightness +5
+bindsym XF86MonBrightnessDown       exec swayosd-client --brightness -5
+bindsym XF86News                    exec $rss
 bindsym XF86Display                 exec wdisplays
 
 # Drag floating windows by holding down $mod and left mouse button.
@@ -120,18 +120,26 @@ bindsym $mod+Shift+0 [con_id=__focused__] move container to workspace number 10,
 
 ### Layout stuff:
 # You can "split" the current object of your focus with
-# $mod+b or $mod+v, for horizontal and vertical splits
+# $mod+s or $mod+v, for horizontal and vertical splits
 # respectively.
-bindsym $mod+b splith
-bindsym $mod+v splitv
+mode "split" {
+    bindsym v splith; mode "default"
+    bindsym s splitv; mode "default"
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+w mode "split"
 
 # Switch the current container between different layout styles
-bindsym $mod+e layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+d layout toggle split
-
-# Make the current focus fullscreen
-bindsym $mod+f fullscreen
+mode "layout" {
+    bindsym s layout stacking; mode "default"
+    bindsym w layout tabbed; mode "default"
+    bindsym t layout toggle split; mode "default"
+    bindsym f fullscreen; mode "default"
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+e mode "layout"
 
 # Toggle the current focus between tiling and floating mode
 bindsym $mod+Alt+space floating toggle
@@ -147,11 +155,11 @@ bindsym $mod+Shift+Return focus parent
 # You can send windows there and get them back later.
 
 # Move the currently focused window to the scratchpad
-bindsym $mod+Shift+minus move scratchpad
+bindsym $mod+Shift+s move scratchpad
 
 # Show the next scratchpad window or hide the focused scratchpad window.
 # If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
+bindsym $mod+s scratchpad show
 
 ### Resizing containers:
 mode "resize" {
@@ -179,26 +187,26 @@ bindsym $mod+r mode "resize"
 ### Mode for launching apps
 mode "apps" {
     # Start apps
-    bindsym v exec $file; mode "default"
+    bindsym f exec $file; mode "default"
     bindsym e exec $editor; mode "default"
     bindsym w exec $browser; mode "default"
     bindsym c exec $chat; mode "default"
     bindsym o exec $office; mode "default"
     bindsym m exec $music; mode "default"
-    bindsym b exec $monitor; mode "default"
-    bindsym p exec $audiomixer; mode "default"
-    bindsym n exec $ytfzf-music; mode "default"
-    bindsym a exec $ani-cli; mode "default"
-    bindsym y exec $ytfzf; mode "default"
-    bindsym f exec $flix-cli; mode "default"
-    bindsym r exec $newsboat; mode "default"
+    bindsym r exec $rss; mode "default"
+    bindsym Shift+b exec $monitor; mode "default"
+    bindsym Shift+p exec $audiomixer; mode "default"
+    bindsym Shift+y exec $ytfzf; mode "default"
+    bindsym Shift+m exec $ytfzf-music; mode "default"
+    bindsym Shift+a exec $ani-cli; mode "default"
+    bindsym Shift+f exec $flix-cli; mode "default"
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
 bindsym $mod+a mode "apps"
 
 # Run launcher scripts
-mode "launchers" {
+mode "launcher" {
     bindsym d exec $menu; mode "default"
     bindsym q exec $menu-power; mode "default"
     bindsym e exec $menu-emoji; mode "default"
@@ -210,4 +218,4 @@ mode "launchers" {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-bindsym $mod+s mode "launchers"
+bindsym $mod+p mode "launcher"
diff --git a/config/sway/modules/theme b/config/sway/modules/theme
index 46a7d2dc1..2b7657a2f 100644
--- a/config/sway/modules/theme
+++ b/config/sway/modules/theme
@@ -1,5 +1,5 @@
 # Font
-font pango: Mononoki Nerd Font 14
+font pango: Mononoki Nerd Font 12
 
 # Color scheme (Gruvbox dark)
 set $color_normal_white  #a89984
@@ -36,4 +36,5 @@ exec gsettings set org.gnome.desktop.interface {
     document-font-name 'Liberation Serif 12'
     monospace-font-name 'Mononoki Nerd Font 12'
     enable-animations true
+    color-scheme 'prefer-dark'
 }
diff --git a/config/sway/scripts/idle b/config/sway/scripts/idle
new file mode 100755
index 000000000..19f20e8a5
--- /dev/null
+++ b/config/sway/scripts/idle
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+lockcmd="swaylock -f -i '$HOME/.config/sway/wallpaper/locked.*'"
+screenoff="chayang -d 5 && swaymsg 'output * power off'"
+screenon="swaymsg 'output * power on'"
+
+swayidle -w \
+    lock "$lockcmd" \
+    timeout 300 "$lockcmd" \
+    timeout 600 "$screenoff" \
+    resume "$screenon" \
+    before-sleep "$lockcmd"
diff --git a/config/sway/winitrc b/config/sway/scripts/init
similarity index 94%
rename from config/sway/winitrc
rename to config/sway/scripts/init
index 620690ca1..458f18395 100755
--- a/config/sway/winitrc
+++ b/config/sway/scripts/init
@@ -11,12 +11,14 @@ export SDL_VIDEODRIVER=wayland
 export CLUTTER_PLATFORM=wayland
 export QT_QPA_PLATFORM=wayland
 export QT_STYLE_OVERRIDE=kvantum
+export GDK_BACKEND=wayland
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 export XKB_DEFAULT_LAYOUT=us
 export MOZ_ENABLE_WAYLAND=1
 export MOZ_WAYLAND_USE_VAAPI=1
 export MOZ_DISABLE_RDD_SANDBOX=1 
 export ELECTRON_OZONE_PLATFORM_HINT=auto
+#export GTK_CSD=0
 
 # GTK & cursor stuff
 export XCURSOR_PATH="$XDG_DATA_HOME/icons/"
diff --git a/config/sway/wallpaper/background.png b/config/sway/wallpaper/background.png
index 227045615..a6c0b7d62 100644
Binary files a/config/sway/wallpaper/background.png and b/config/sway/wallpaper/background.png differ
diff --git a/config/sway/wallpaper/locked.png b/config/sway/wallpaper/locked.png
index 227045615..a6c0b7d62 100644
Binary files a/config/sway/wallpaper/locked.png and b/config/sway/wallpaper/locked.png differ
diff --git a/config/waybar/config b/config/waybar/config
index c97784b98..4692ac0f6 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1,6 +1,7 @@
 {
+    "reload-style-on-change": true,
     "position": "top",
-    "height": 26,
+    "height": 25,
     "spacing": 0,
     "layer": "top",
 
@@ -16,11 +17,12 @@
 
     "modules-right": [
         "custom/arrow1",
-        "sway/language",
+        "clock",
         "custom/arrow2",
-        "pulseaudio",
+        "cpu",
+        "memory",
         "custom/arrow3",
-        "backlight",
+        "sway/language",
         "custom/arrow4",
         "idle_inhibitor",
         "power-profiles-daemon",
@@ -29,7 +31,7 @@
         "custom/arrow5",
         "network",
         "custom/arrow6",
-        "clock"
+        "bluetooth"
     ],
     
     // Modules
@@ -53,14 +55,28 @@
     },
 
     "sway/window": {
+        "tooltip": false,
         "format": "{title}",
         "icon": true,
-        "icon-size": 24,
-        "separate-outputs": true
+        "icon-size": 16,
+        "separate-outputs": true,
+        "max-length": 80
+    },
+
+    "cpu": {
+        "interval": 1,
+        "format": "\uf4bc {usage}%",
+        "on-click": "foot -T btop -a btop btop"
+    },
+
+    "memory": {
+        "interval": 1,
+        "format": "\uefc5 {percentage}%",
+        "on-click": "foot -T btop -a btop btop"
     },
 
     "sway/language": {
-        "format": "{} \udb80\udf0c",
+        "format": "\udb80\udf0c {}",
         "on-click": "swaymsg input type:keyboard xkb_switch_layout next",
         "tooltip": false,
     },
@@ -77,43 +93,6 @@
         "tooltip-format": "{app}: {title}"
     },
 
-    "pulseaudio": {
-        "scroll-step": 1, // %, can be a float
-        "tooltip-format": "{volume}% - {desc}",
-        "format": "{icon} {format_source}",
-        "format-bluetooth": "{icon}\udb80\udcaf {format_source}",
-        "format-bluetooth-muted": "\udb81\udd81 {icon}\udb80\udcaf {format_source}",
-        "format-muted": "\udb81\udd81 {format_source}",
-        "format-source": "\udb80\udf6c",
-        "format-source-muted": "\udb80\udf6d",
-        "format-icons": {
-            "headphone": "\udb80\udecb",
-            "hands-free": "\udb86\udc4f",
-            "headset": "\udb80\udece",
-            "phone": "\udb80\udff2",
-            "portable": "\udb80\udff2",
-            "car": "\udb80\udd0b",
-            "default": ["\udb81\udd7f", "\udb81\udd80", "\udb81\udd7e"]
-        },
-        "on-click": "foot -T audiomixer -a audiomixer pulsemixer"
-    },
-
-    "backlight": {
-        "format": "{icon}",
-        "format-icons": [
-            "\udb86\ude4e",
-            "\udb86\ude4f",
-            "\udb86\ude50",
-            "\udb86\ude51",
-            "\udb86\ude52",
-            "\udb86\ude53",
-            "\udb86\ude54",
-            "\udb86\ude55",
-            "\udb81\udee8"
-        ],
-        "tooltip-format": "{percent}%"
-    },
-
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
@@ -152,7 +131,7 @@
             "\udb80\udc80",
             "\udb80\udc79"
         ],
-        "tooltip-format": "{capacity}% - {timeTo}",
+        "tooltip-format": "{timeTo}",
         "on-click": "$HOME/.config/rofi/scripts/rs_power"
     },
 
@@ -174,7 +153,7 @@
             "\udb80\udc80",
             "\udb80\udc79"
         ],
-        "tooltip-format": "{capacity}% - {timeTo}",
+        "tooltip-format": "{timeTo}",
         "on-click": "$HOME/.config/fuzzel/scripts/rs_power"
     },
 
@@ -182,9 +161,27 @@
         "format-wifi": "\udb81\udda9",
         "format-ethernet": "\udb80\ude00",
         "format-disconnected": "\udb80\udd5b",
-        "tooltip-format": "{essid} ({signalStrength}%) - {ifname}: {ipaddr}/{cidr}",
+        "tooltip-format": "({essid} - {signalStrength}%) - {ifname}: {ipaddr}/{cidr}",
         "on-click": "$HOME/.config/fuzzel/scripts/rs_wifi"
     },
+    
+    "bluetooth": {
+        "format": "\udb80\udcb2",
+        "format-on": "\udb80\udcaf",
+        "fotmat-off": "\udb80\udcb2",
+        "fotmat-disabled": "\udb80\udcb2",
+    	"format-connected": "\udb80\udcb1",
+    	"tooltip-format": "{controller_alias}\t{controller_address} ON",
+    	"tooltip-format-on": "{controller_alias}\t{controller_address} ON",
+    	"tooltip-format-off": "{controller_alias}\t{controller_address} OFF",
+    	"tooltip-format-disabled": "{controller_alias}\t{controller_address} OFF",
+    	"tooltip-format-connected": "{controller_alias}\t{controller_address} ON\n\n{num_connections} connected\n\n{device_enumerate}",
+    	"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+    	"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+        "on-click": "$HOME/.config/fuzzel/scripts/rs_blue",
+        "on-click-right": "bluetoothctl disconnect",
+        "on-click-middle": "bluetoothctl power off"
+    },
 
     "clock": {
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 4ae0884b0..b3dec2ab6 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -36,15 +36,15 @@
 @define-color critical              @brred;
 @define-color unfocused             @braqua;
 @define-color focused               @red;
-@define-color inactive              @drgray;
+@define-color inactive              @brgray;
+@define-color clock                 @drpurple;
+@define-color monitor               @drblue;
+@define-color language              @draqua;
 @define-color idle                  @drgreen;
-@define-color backlight             @dryellow;
-@define-color pulseaudio            @drblue;
 @define-color powerprofile          @drgreen;
-@define-color network               @drred;
-@define-color language              @drpurple;
 @define-color battery               @drgreen;
-@define-color clock                 @draqua;
+@define-color network               @dryellow;
+@define-color bluetooth             @drorange;
 @define-color wbackground           rgba(29, 32, 33, 0.95);
 
 /* =====================================
@@ -96,8 +96,8 @@ window#waybar {
    ===================================== */
 #workspaces button {
     font-family: Symbols Nerd Font Mono;
-    font-size: 18px;
-    padding: 0 2pt;
+    font-size: 16px;
+    padding: 4px 0px;
     color: @white;
 }
 
@@ -160,16 +160,16 @@ window#waybar {
 /* =====================================
    Individual Module Styles
    ===================================== */
-#clock,
+#cpu,
+#memory,
+#language,
+#idle_inhibitor,
 #power-profiles-daemon,
 #battery,
-#backlight,
 #network,
-#pulseaudio,
-#idle_inhibitor,
-#language {
+#bluetooth,
+#clock {
     color: @white;
-    padding: 0 1px;
     padding-left: 4px;
 }
 
@@ -184,8 +184,12 @@ window#waybar {
     animation: blink 0.5s linear infinite alternate;
 }
 
-#backlight {
-    background-color: @backlight;
+#cpu {
+    background-color: @monitor;
+}
+
+#memory {
+    background-color: @monitor;
 }
 
 #network,
@@ -193,6 +197,12 @@ window#waybar {
     background-color: @network;
 }
 
+#bluetooth,
+#bluetooth.disconnected {
+    background-color: @bluetooth;
+    padding-right: 10px;
+}
+
 #pulseaudio,
 #pulseaudio.muted {
     background-color: @pulseaudio;
@@ -208,7 +218,6 @@ window#waybar {
 
 #clock {
     background-color: @clock;
-    padding-right: 10px;
 }
 
 #idle_inhibitor {
@@ -224,27 +233,27 @@ window#waybar {
 #custom-arrow4,
 #custom-arrow5,
 #custom-arrow6 {
-    font-size: 25pt;
+    font-size: 18pt;
 }
 
 /* Individual Modeline Arrow Styles */
 #custom-arrow1 {
     background: transparent;
-    color: @language;
+    color: @clock;
 }
 
 #custom-arrow2 {
-    background: @language;
-    color: @pulseaudio;
+    background: @clock;
+    color: @monitor;
 }
 
 #custom-arrow3 {
-    background: @pulseaudio;
-    color: @backlight;
+    background: @monitor;
+    color: @language;
 }
 
 #custom-arrow4 {
-    background: @backlight;
+    background: @language;
     color: @battery;
 }
 
@@ -255,5 +264,5 @@ window#waybar {
 
 #custom-arrow6 {
     background: @network;
-    color: @clock;
+    color: @bluetooth;
 }
diff --git a/home/.bash_profile b/home/.bash_profile
index 3c41fe175..ac89d8731 100644
--- a/home/.bash_profile
+++ b/home/.bash_profile
@@ -23,7 +23,7 @@ export GOPATH="$HOME/.go"
 export TERMINAL="foot"
 export EDITOR="$HOME/.local/bin/lvim"
 export VISUAL="neovide --neovim-bin $EDITOR"
-export BROWSER="brave"
+export BROWSER="flatpak run com.brave.Browser"
 export VIEWER="zathura"
 
 # Set path
@@ -70,6 +70,6 @@ source "$BASHRC"
 
 # Starting wayland session
 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-    sh "$HOME/.config/sway/winitrc" &>/dev/null
+    sh "$HOME/.config/sway/scripts/init" &>/dev/null
     logout
 fi