diff --git a/.bashrc b/.bashrc
index 3197776..295fa44 100644
--- a/.bashrc
+++ b/.bashrc
@@ -23,6 +23,9 @@ alias sw='i3-swallow'
 
 export EDITOR=vim
 export PATH=$PATH:~/.local/bin
+export HISTSIZE=1000
+export HISTFILESIZE=2000
+export PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
 
 complete -cf sudo
 complete -cf swallow
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 5bd6fde..534e2db 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -215,6 +215,16 @@
     # notification height to avoid clipping text and/or icons.
     corner_radius = 0
 
+    ### Wayland ###
+    # These settings are Wayland-specific. They have no effect when using X11
+
+    # Uncomment this if you want to let notications appear under fullscreen
+    # applications (default: overlay)
+    # layer = top
+
+    # Set this to true to use X11 output on Wayland.
+    force_xwayland = false
+    
     ### Legacy
 
     # Use the Xinerama extension instead of RandR for multi-monitor support.
diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
index ede4820..3e3ac20 100644
--- a/.config/gtk-3.0/bookmarks
+++ b/.config/gtk-3.0/bookmarks
@@ -1 +1,5 @@
-file:///home/logan/Nextcloud
+file:///mnt/hdd/Documents Documents
+file:///mnt/hdd/Downloads Downloads
+file:///home/logan/Music Music
+file:///home/logan/Pictures Pictures
+file:///mnt/hdd/Videos Videos
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index a289048..aba85ec 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,8 +1,10 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 2 46 47 39 109 110 49 1
+fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=46
 sort_direction=1
+tree_sort_key=46
+tree_sort_direction=1
 hide_kernel_threads=1
 hide_userland_threads=0
 shadow_other_users=0
@@ -17,19 +19,21 @@ find_comm_in_cmdline=1
 strip_exe_from_cmdline=1
 show_merged_command=0
 tree_view=0
+tree_view_always_by_pid=0
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_one=1
+cpu_count_from_one=0
 show_cpu_usage=1
 show_cpu_frequency=1
-show_cpu_temperature=0
+show_cpu_temperature=1
 degree_fahrenheit=0
 update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
 enable_mouse=1
 delay=15
-left_meters=LeftCPUs4 CPU Blank Memory Zram Swap
-left_meter_modes=1 1 2 1 1 1
-right_meters=RightCPUs4 Blank Hostname LoadAverage Tasks Uptime
-right_meter_modes=1 2 2 2 2 2
+left_meters=LeftCPUs2 Memory Swap
+left_meter_modes=1 1 1
+right_meters=RightCPUs2 Tasks LoadAverage Uptime
+right_meter_modes=1 2 2 2
+hide_function_bar=0
diff --git a/.config/i3/config b/.config/i3/config
index f321c06..b4053bd 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -220,7 +220,7 @@ exec --no-startup-id autorandr -c -f 2>&1
 
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh 2>&1
 exec_always --no-startup-id ~/.fehbg &
-exec_always --no-startup-id ~/.config/i3/customalways.sh 2>&1
+exec_always --no-startup-id bash ~/.config/i3/customalways.sh 2>&1
 exec_always --no-startup-id jgmenu --at-pointer --hide-on-startup
 
 exec --no-startup-id QT_QPA_PLATFORMTHEME=qt5ct flameshot 2>&1 &
@@ -232,7 +232,7 @@ exec --no-startup-id syncthingtray --wait 2>&1 &
 exec --no-startup-id kdeconnect-indicator 2>&1 &
 exec --no-startup-id xfce4-power-manager 2>&1 &
 exec --no-startup-id xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10 2>&1 &
-exec --no-startup-id ~/.config/i3/customonce.sh 2>&1
+exec --no-startup-id bash ~/.config/i3/customonce.sh 2>&1
 
 # Borders
 default_border pixel 0
diff --git a/.config/i3/customonce.sh b/.config/i3/customonce.sh
new file mode 100644
index 0000000..05a7907
--- /dev/null
+++ b/.config/i3/customonce.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 18ea7f4..e270384 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -191,11 +191,11 @@ blur-background-exclude = [
 # `xrender` is the default one.
 #
 # backend = "glx"
-backend = "xrender";
+backend = "glx";
 
 # Enable/disable VSync.
 # vsync = false
-vsync = true;
+vsync = false;
 
 # Enable remote control via D-Bus. See the *D-BUS API* section below for more details.
 # dbus = false
diff --git a/.config/qt5ct/qt5ct.conf b/.config/qt5ct/qt5ct.conf
index e7d82f8..9196de3 100644
--- a/.config/qt5ct/qt5ct.conf
+++ b/.config/qt5ct/qt5ct.conf
@@ -28,4 +28,4 @@ wheel_scroll_lines=3
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x2}\0\0\x1\x6\0\0\x4\xff\0\0\x2\xf8\0\0\x2}\0\0\x1\x6\0\0\x4\xff\0\0\x2\xf8\0\0\0\0\0\0\0\0\a\x80\0\0\x2}\0\0\x1\x6\0\0\x4\xff\0\0\x2\xf8)
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\x9e\0\0\0k\0\0\f\a\0\0\x3\xd5\0\0\x6\x9e\0\0\0k\0\0\f\a\0\0\x3\xd5\0\0\0\0\0\0\0\0\a\x80\0\0\x6\x9e\0\0\0k\0\0\f\a\0\0\x3\xd5)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\xcc\0\0\x1\x18\0\0\x6-\0\0\x3\xff\0\0\x1\xcc\0\0\x1\x18\0\0\x6-\0\0\x3\xff\0\0\0\0\0\0\0\0\a\x80\0\0\x1\xcc\0\0\x1\x18\0\0\x6-\0\0\x3\xff)
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index d75d74d..9368ad6 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -4,6 +4,6 @@ configuration {
   icon-theme: "Papirus-Dark";
   show-icons: true;
   font: "hack 10";
-  combi-modi: "window,drun,ssh";
+  combi-modi: "window,drun,run,ssh";
 }
 
diff --git a/.gitignore b/.gitignore
index 6994995..e341e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 
 !.config/
 !.config/**
+!.icons/
+!.icons/**
 !.vimrc
 !.Xresources
 !.xinitrc
diff --git a/.profile b/.profile
index 8d646da..6924461 100644
--- a/.profile
+++ b/.profile
@@ -1,3 +1,4 @@
 export QT_QPA_PLATFORMTHEME=qt5ct
 export TERMINAL=alacritty
 export PATH=$PATH:~/.local/bin
+export SAL_USE_VCLPLUGIN=gtk
diff --git a/.vimrc b/.vimrc
index bc78f6a..ffec94d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,6 +9,7 @@ set nowrap                      " don't wrap lines
 set tabstop=2 shiftwidth=2      " a tab is two spaces (or set this to 4)
 set expandtab                   " use spaces, not tabs (optional)
 set backspace=indent,eol,start  " backspace through everything in insert mode
+autocmd BufWritePre *.py :%s/\s\+$//e " Trim whitespace on file save
 
 "" Searching
 set hlsearch                    " highlight matches
@@ -22,3 +23,5 @@ set number
 "" Copy and paste
 vnoremap <C-c> "+y
 map <C-p> "+P
+
+