diff --git a/.config/desktop-common/pfps/freya.png b/.config/desktop-common/pfps/freya.png
new file mode 100644
index 0000000..758ea9f
Binary files /dev/null and b/.config/desktop-common/pfps/freya.png differ
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini
index 754e025..2d60b26 100644
--- a/.config/gtk-2.0/gtkfilechooser.ini
+++ b/.config/gtk-2.0/gtkfilechooser.ini
@@ -1,6 +1,6 @@
 [Filechooser Settings]
 LocationMode=path-bar
-ShowHidden=true
+ShowHidden=false
 ShowSizeColumn=true
 GeometryX=0
 GeometryY=0
diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
index 40f41bc..e2576aa 100644
--- a/.config/gtk-3.0/bookmarks
+++ b/.config/gtk-3.0/bookmarks
@@ -1,4 +1,6 @@
+file:///home/freya/.config
 file:///home/freya/downloads
 file:///home/freya/documents
 file:///home/tylerm/code
 file:///home/tylerm/sync
+file:///home/freya/sync/nextcloud
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index eb57287..3a5d8d7 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,23 +1,23 @@
 [Settings]
-gtk-application-prefer-dark-theme=true
-gtk-button-images=true
-gtk-cursor-theme-name=breeze_cursors
+gtk-theme-name=Adwaita
+gtk-icon-theme-name=Adwaita
+gtk-font-name=Noto Sans,  10
+gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=24
+gtk-toolbar-style=3
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintslight
+gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=1
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=breeze-dark
-gtk-menu-images=true
 #gtk-modules=colorreload-gtk-module
 gtk-primary-button-warps-slider=true
 gtk-sound-theme-name=ocean
-gtk-theme-name=Lavanda-Sea-Dark
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=3
-gtk-xft-antialias=1
 gtk-xft-dpi=122880
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
diff --git a/.config/hypr/config.d/autostart.sh b/.config/hypr/config.d/autostart.sh
deleted file mode 100755
index b506e3d..0000000
--- a/.config/hypr/config.d/autostart.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-waybar --config $HOME/.config/waybar/config.hypr &
-
-nm-applet --indicator &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-discord &
-element-desktop &
-thunderbird &
diff --git a/.config/sway/config.d/idle b/.config/hypr/config.d/idle
similarity index 100%
rename from .config/sway/config.d/idle
rename to .config/hypr/config.d/idle
diff --git a/.config/hypr/config.d/input.conf b/.config/hypr/config.d/input.conf
index 0ea3797..69fe174 100644
--- a/.config/hypr/config.d/input.conf
+++ b/.config/hypr/config.d/input.conf
@@ -7,7 +7,7 @@ input {
     kb_layout = us
     kb_variant =
     kb_model =
-    kb_options = gtp:alt_shit_toggle, compose:rctrl
+    kb_options = gtp:alt_shit_toggle, compose:ralt
     kb_rules =
 
     follow_mouse = 1
diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf
index 09a624d..ff284b2 100644
--- a/.config/hypr/config.d/theme.conf
+++ b/.config/hypr/config.d/theme.conf
@@ -1,15 +1,17 @@
 general {
     gaps_in = 6
-    gaps_out = $gaps
+    gaps_out = 10
     border_size = $border
     col.active_border = 0xffaaaaaa
     col.inactive_border = 0xff777777
     layout = dwindle
+    resize_on_border = yes
+    extend_border_grab_area = 20
 }
 
 group {
-    col.border_active = 0x14171d 0x14171d 360deg
-    col.border_inactive = 0x14171d 0x14171d 360deg
+    col.border_active = rgb(14171d) rgb(14171d) 0deg
+    col.border_inactive = rgb(14171d) rgb(14171d) 0deg
     col.border_locked_active = rgb(14171d) rgb(14171d) 0deg
     col.border_locked_inactive = rgb(14171d) rgb(14171d) 0deg
     groupbar {
@@ -31,6 +33,12 @@ decoration {
     shadow_range = 4
     shadow_render_power = 3
     col.shadow = rgba(1a1a1aee)
+
+    blur {
+        enabled = true
+        size = 5
+        passes = 2
+    }
 }
 
 animations {
@@ -45,8 +53,8 @@ animations {
 }
 
 xwayland {
-  force_zero_scaling = true
-  use_nearest_neighbor = false
+    force_zero_scaling = true
+    use_nearest_neighbor = false
 }
 
 env = GDK_BACKEND,wayland,x11
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index b0b267b..8674248 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,5 +1,3 @@
-exec-once = ~/.config/hypr/scripts.d/systemd.sh
-
 $mod = SUPER
 
 $term = kitty
@@ -8,12 +6,13 @@ $menu = wofi --allow-images --show drun --prompt "Search Program"
 
 $scale = 1.25
 
-$radius = 5
-$gaps = 10
+$radius = 0
 $border = 0
 
 $browser = librewolf
 
+exec-once = ~/.config/hypr/scripts.d/systemd.sh
+
 source = ~/.config/hypr/config.d/keybinds.conf
 source = ~/.config/hypr/config.d/theme.conf
 source = ~/.config/hypr/config.d/input.conf
diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf
index af042dd..045cac0 100644
--- a/.config/hypr/monitors.conf
+++ b/.config/hypr/monitors.conf
@@ -1,4 +1,4 @@
-# Generated by nwg-displays on 2024-05-08 at 19:19:19. Do not edit manually.
+# Generated by nwg-displays on 2024-06-05 at 18:46:28. Do not edit manually.
 
-monitor=eDP-1,2560x1600@90.0,0x0,1.25,bitdepth,10
-monitor=HDMI-A-1,2560x1440@59.95,2048x0,1.0
+monitor=eDP-1,2560x1600@90.0,2560x0,1.25
+monitor=DP-2,2560x1440@59.95,0x0,1.0
diff --git a/.config/hypr/scripts.d/autostart.sh b/.config/hypr/scripts.d/autostart.sh
index 01a34e2..7da98a9 100755
--- a/.config/hypr/scripts.d/autostart.sh
+++ b/.config/hypr/scripts.d/autostart.sh
@@ -9,7 +9,8 @@ wl-clip-persist --clipboard both &
 
 gtk-launch discord &
 gtk-launch io.element.Element &
-thunderbird &
+gtk-launch org.gajim.Gajim &
+gtk-launch org.mozilla.Thunderbird &
 
 hyprpaper &
 hypridle &
diff --git a/.config/hypr/scripts.d/systemd.sh b/.config/hypr/scripts.d/systemd.sh
index 8fd5c39..32b5528 100755
--- a/.config/hypr/scripts.d/systemd.sh
+++ b/.config/hypr/scripts.d/systemd.sh
@@ -4,9 +4,13 @@ systemctl --user set-environment XDG_CURRENT_DESKTOP=Hyprland
 systemctl --user import-environment DISPLAY \
 									WAYLAND_DISPLAY \
 									XDG_CURRENT_DESKTOP \
-									GTK_THEME
+									GTK_THEME \
+									QT_QPA_PLATFORMTHEME
+
 
 hash dbus-update-activation-environment 2>/dev/null && \
 	 dbus-update-activation-environment --systemd DISPLAY \
 												  XDG_CURRENT_DESKTOP=Hyprland \
-												  WAYLAND_DISPLAY
+												  WAYLAND_DISPLAY \
+												  GTK_THEME \
+												  QT_QPA_PLATFORMTHEME
diff --git a/.config/hypr/workspaces.conf b/.config/hypr/workspaces.conf
deleted file mode 100644
index 38de981..0000000
--- a/.config/hypr/workspaces.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Generated by nwg-displays on 2024-04-15 at 22:15:31. Do not edit manually.
-
-workspace=9,monitor:eDP-1,default:true
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index ce38aee..a548518 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -74,7 +74,7 @@ lsp.setup()
 require('phpactor').setup {
 	install = {
 		branch = "master",
-		bin = "/home/freya/.local/bin/phpactor",
+		bin = "/usr/bin/phpactor",
 		php_bin = "php",
 		composer_bin = "composer",
 		git_bin = "git",
diff --git a/.config/sway/config b/.config/sway/config
index de658df..79b2c6c 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -11,14 +11,14 @@ set $menu wofi --allow-images --show=drun --prompt "Search Program"
 set $scale 1.25
 
 # Set background
-set $bg ~/.config/desktop-common/wallpapers/blue.jpg
+set $bg ~/.config/desktop-common/wallpapers/davekat.png
 
 # Set lockscreen
-set $lock swaylock
+set $lock hyprlock
 
 # Set Efects
 set $gaps 10
-set $radius 5
+set $radius 0
 set $shadows on
 set $shadow_blur 15
 set $blur enable
diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh
index 4b2334e..b3456d0 100755
--- a/.config/sway/scripts.d/auto.sh
+++ b/.config/sway/scripts.d/auto.sh
@@ -2,7 +2,13 @@
 
 nm-applet --indicator &
 autotiling &
-discord &
-element-desktop &
-thunderbird &
-dino &
+
+/usr/bin/gnome-keyring-daemon --foreground &
+wl-clip-persist --clipboard both &
+
+gtk-launch discord &
+gtk-launch fluffychat &
+gtk-launch org.gajim.Gajim &
+gtk-launch org.mozilla.Thunderbird &
+
+hypridle &
diff --git a/.config/waybar/config.hypr b/.config/waybar/config.hypr
index 7d9cabb..d2d6322 100644
--- a/.config/waybar/config.hypr
+++ b/.config/waybar/config.hypr
@@ -1,5 +1,5 @@
 {
-    "height": 24,
+    "height": 30,
     "position": "top",
     "layer": "top",
     "spacing": 4,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0e61f84..ca65862 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -6,25 +6,18 @@
     padding: 0;
 }
 
-/*
-#waybar {
-    background-color: rgba(20, 23, 29, 0.85);
-    color: #c7c6c3;
-}
-*/
-
 window#waybar {
-    background-color: rgba(30, 30, 46, 0.85);
-    color: #c7c6c3;
+    background-color: transparent;
 }
 
-/*
 window#waybar > box {
-    margin-bottom: 8px;
     color: #c7c6c3;
-    box-shadow: 0px 0px 3px 2px rgba(20, 23, 29, 0.70);
+    margin-bottom: 8px;
+    box-shadow: 1px 1px 3px 1px #151515;
+    background-color: rgba(30, 30, 46, 0.85);
+    transition-property: background-color;
+    transition-duration: .5s;
 }
-*/
 
 button {
     border: none;
@@ -98,7 +91,6 @@ button {
     margin: 0 4px;
 }
 
-
 #battery {
     color: #97bd5e;
 }
@@ -111,11 +103,13 @@ button {
     color: #cc5c5c;
 }
 
-#network.disconnected, #wireplumber.muted {
+#network.disconnected,
+#wireplumber.muted {
     color: #cc5c5c;
 }
 
-#network.wifi, #network.ethernet {
+#network.wifi,
+#network.ethernet {
     color: #789ebf;
 }
 
@@ -143,10 +137,6 @@ button {
     color: #cc5c5c;
 }
 
-#custom-newsboat {
-    color: #de7e54;
-}
-
 #tray > .passive {
     -gtk-icon-effect: dim;
 }
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index a912038..cea1af5 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -1,20 +1,19 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
+# DO NOT EDIT! This file will be overwritten by nwg-look.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Lavanda-Sea-Dark"
-gtk-icon-theme-name="breeze-dark"
+include "/home/freya/.gtkrc-2.0.mine"
+gtk-theme-name="Adwaita"
+gtk-icon-theme-name="Adwaita"
 gtk-font-name="Noto Sans,  10"
-gtk-cursor-theme-name="breeze_cursors"
+gtk-cursor-theme-name="Adwaita"
 gtk-cursor-theme-size=24
 gtk-toolbar-style=3
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
+gtk-button-images=0
+gtk-menu-images=0
 gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
+gtk-enable-input-feedback-sounds=0
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle="hintfull"
-gtk-enable-animations=1
-gtk-primary-button-warps-slider=1
-gtk-sound-theme-name="ocean"
+gtk-xft-hintstyle="hintslight"
+gtk-xft-rgba="rgb"
diff --git a/.zprofile b/.zprofile
index 8b1d0a7..a86e45d 100644
--- a/.zprofile
+++ b/.zprofile
@@ -9,15 +9,9 @@ export EDITOR=nvim
 export _JAVA_AWT_WM_NONREPARENTING=1
 export MOZ_ENABLE_WAYLAND=1
 export MOZ_USE_XINPUT2=1
-<<<<<<< HEAD
-
-# xdg
-export XDG_CURRENT_DESKTOP=sway
-=======
 export WLR_NO_HARDWARE_CURSORS=1
 
 # xdg
->>>>>>> f9676b9 (a)
 export XDG_CONFIG_HOME=$HOME/.config
 export XDG_DATA_HOME=$HOME/.local/share
 export XDG_DATA_DIRS=/usr/local/share:/usr/share
@@ -35,6 +29,13 @@ if [ -n "$TMUX" ]; then
     return
 fi
 
+# graphics
+#export NOUVEAU_USE_ZINK=1
+#export __GLX_VENDOR_LIBRARY_NAME=mesa
+#export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json
+#export MESA_LOADER_DRIVER_OVERRIDE=zink
+#export GALLIUM_DRIVER=zink
+
 clear
 printf "\t\n\t\n\t\n\t\n"
 echo "\tPlease select an environment..."
diff --git a/aur b/aur
index fb847e9..bf0ab7d 100644
--- a/aur
+++ b/aur
@@ -1,30 +1,20 @@
 autotiling
 bento4
 cider-bin
-flashplayer-standalone
 gconf
-gleam
-hyprlock-git
 i686-elf-gcc
-icecast
 librewolf-bin
 mkinitcpio-firmware
 nwg-displays
-pandoc-bin
 paru
 pfetch-rs
+phpactor
 prismlauncher-qt5-bin
 python-eyed3
 qt5-styleplugins
-qt6gtk2
-rebar3
-ruffle-git
-swayfx
-swaylock-effects
 ttf-twemoji-color
 units
 unofficial-homestuck-collection-bin
 uwuify
 vencord-installer-cli-bin
-wd719x-firmware
 wl-clip-persist-git
diff --git a/packages b/packages
index 2b4247c..cf88a15 100644
--- a/packages
+++ b/packages
@@ -2,7 +2,6 @@ acpi
 alsa-tools
 alsa-utils
 amd-ucode
-android-tools
 base
 base-devel
 bcachefs-tools
@@ -20,17 +19,20 @@ cups
 cups-pdf
 discord
 docker
+docker-buildx
 docker-compose
+dosfstools
 easyeffects
 efibootmgr
 element-desktop
-elixir
-evtest
+exfatprogs
 figlet
+firefox
 flatpak
 fontforge
 freealut
 gajim
+gamescope
 gdb
 gdu
 gimp
@@ -38,17 +40,17 @@ git
 gnome-keyring
 gnome-themes-extra
 gnu-netcat
-gradle
 grim
-grub
 gsound
+gspell
 gst-libav
+gst-plugin-gtk
 gst-plugins-bad
 gst-plugins-ugly
-highlight
 htop
 hypridle
 hyprland
+hyprlock
 hyprpaper
 imv
 jdk-openjdk
@@ -68,7 +70,9 @@ lynx
 mako
 man-db
 man-pages
+mangohud
 maven
+mesa-utils
 mpv
 mtools
 nasm
@@ -77,13 +81,17 @@ neovim
 network-manager-applet
 networkmanager
 networkmanager-openvpn
+nextcloud-client
 nmap
 nodejs
 noto-fonts-cjk
 npm
+ntfs-3g
 nvme-cli
 nwg-look
+obs-studio
 openal
+opencl-rusticl-mesa
 opendoas
 openldap
 p7zip
@@ -91,14 +99,15 @@ pacman-contrib
 parallel
 pavucontrol
 perl-image-exiftool
+php
 pipewire-alsa
 pipewire-pulse
 polkit-gnome
-python-pip
 python-pynvim
-python-yaml
+python-sphinx
 qbittorrent
 qemu-full
+qpwgraph
 qt5-wayland
 qt6ct
 ranger
@@ -109,23 +118,19 @@ rustup
 sassc
 sbctl
 sbsigntools
-shellcheck
 sl
 slurp
-smartmontools
 sof-firmware
-sshfs
 starship
 steam
 strace
-swaybg
-swayidle
 syncthing
 thunderbird
 tlp
 tpm2-tools
 traceroute
 tree
+tree-sitter-cli
 ttf-dejavu
 ttf-fira-code
 ufw
@@ -144,14 +149,15 @@ wireguard-tools
 wl-clipboard
 wl-mirror
 wofi
-xcur2png
 xdg-desktop-portal
 xdg-desktop-portal-gtk
 xdg-desktop-portal-hyprland
+xdg-desktop-portal-wlr
 xorg-xwayland
 yt-dlp
 zathura
 zathura-pdf-mupdf
 zip
+zram-generator
 zsh
 zsh-syntax-highlighting