diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc
index 63cb4b3..c84c4f8 100644
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -30,7 +30,6 @@ plug "your-tools/kak-subvert" do %{
 }
 
 plug "https://git.sr.ht/~nasmevka/repl.kak"
-plug "caksoylar/kakoune-smooth-scroll"
 
 plug "custom-filetypes" load-path "~/.config/kak/al"
 # # Color Themes
@@ -53,11 +52,6 @@ eval %sh{ kak-tree-sitter -dksvvv --init $kak_session }
 ## Popup ##
 evaluate-commands %sh{kak-popup init}
 
-hook global WinCreate [^*].* %{
-    hook -once window WinDisplay .* %{
-        smooth-scroll-enable
-    }
-}
 ## Highlighting ##
 hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor}
 add-highlighter global/ show-matching
diff --git a/config/.config/nvim/after/plugin/colors.lua b/config/.config/nvim/after/plugin/colors.lua
index 4fa143c..b0bacbc 100755
--- a/config/.config/nvim/after/plugin/colors.lua
+++ b/config/.config/nvim/after/plugin/colors.lua
@@ -1,6 +1,6 @@
 function colors(color, theme)
     color = os.getenv("BASE16_THEME")
-    alt_color = 'nord' or color
+    alt_color = 'rose-pine' or color
     -- Available values:   `'hard'`, `'medium'`, `'soft'`
     vim.g.gruvbox_material_background = 'medium'
     -- Available values:   `'material'`, `'mix'`, `'original'`
diff --git a/config/.config/qutebrowser/config.py b/config/.config/qutebrowser/config.py
index dd911e4..e9badcb 100644
--- a/config/.config/qutebrowser/config.py
+++ b/config/.config/qutebrowser/config.py
@@ -723,7 +723,7 @@ c.url.searchengines = { "DEFAULT" : "searx.mchalupiak.com/search?q={}" }
 ## given page, use the `content.blocking.enabled` setting with a URL
 ## pattern instead.
 ## Type: List of UrlPattern
- c.content.blocking.whitelist = []
+c.content.blocking.whitelist = []
 
 ## Enable support for the HTML 5 web application cache feature. An
 ## application cache acts like an HTTP cache in some sense. For documents
diff --git a/config/.config/qutebrowser/qsettings/QtProject.conf b/config/.config/qutebrowser/qsettings/QtProject.conf
index 45bb981..7a20df5 100644
--- a/config/.config/qutebrowser/qsettings/QtProject.conf
+++ b/config/.config/qutebrowser/qsettings/QtProject.conf
@@ -1,7 +1,7 @@
 [FileDialog]
-history=file:///home/mikec/Downloads, file:///usr/share/fonts/TTF, file:///home/mikec, file:///home/mikec/Documents/College/Resume
-lastVisited=file:///home/mikec/Documents/College/Resume
-qtVersion=6.7.2
+history=@Invalid()
+lastVisited=file:///home/mikec
+qtVersion=6.8.2
 shortcuts=file:, file:///home/mikec
 sidebarWidth=87
 treeViewHeader="@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xd1\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xf5\0\0\0\x1\0\0\0\0\0\0\0\x39\0\0\0\x1\0\0\0\0\0\0\0=\0\0\0\x1\0\0\0\0\0\0\0\x66\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff\0\0\0\0)"
diff --git a/config/.config/river/init b/config/.config/river/init
index a62666d..be98452 100755
--- a/config/.config/river/init
+++ b/config/.config/river/init
@@ -174,4 +174,9 @@ swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper &
 # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2
 pipewire-launch &
 waybar &
+<<<<<<< Updated upstream
 wlr-randr --output DP-1 --adaptive-sync enabled --mode 2560x1440@165Hz
+=======
+wlr-randr --output eDP-1 --scale 1.5
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP='river'
+>>>>>>> Stashed changes
diff --git a/config/.icons/default/index.theme b/config/.icons/default/index.theme
index 55180a3..21a3dbe 100644
--- a/config/.icons/default/index.theme
+++ b/config/.icons/default/index.theme
@@ -2,4 +2,8 @@
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme
+<<<<<<< Updated upstream
 Inherits=Chicago95_Animated_Hourglass_Cursors
+=======
+Inherits=BreezeX-RosePineDawn-Linux
+>>>>>>> Stashed changes
diff --git a/config/.scripts/store/projects b/config/.scripts/store/projects
index 522fc7a..8474063 100755
--- a/config/.scripts/store/projects
+++ b/config/.scripts/store/projects
@@ -1,3 +1,11 @@
 /home/mikec
 /home/mikec/Documents/Projects/crafting_interpreters 
 /home/mikec/Documents/Projects/crafting_interpreters/jlox 
+<<<<<<< Updated upstream
+=======
+/home/mikec/Documents/College/CSSE403 
+/home/mikec/Documents/College/CSSE403/csse403 
+/home/mikec/Documents/College/CSSE403/csse403/Homework 
+/home/mikec/Documents/College/CSSE142 
+/home/mikec/Documents/College/CSSE403/inclass.rs 
+>>>>>>> Stashed changes