diff --git a/config/geany/geany.conf b/config/geany/geany.conf
index 398fb153..c8ddc187 100644
--- a/config/geany/geany.conf
+++ b/config/geany/geany.conf
@@ -123,7 +123,7 @@ pref_template_datetime=%d.%m.%Y %H:%M:%S %Z
 context_action_cmd=
 sidebar_visible=false
 statusbar_visible=true
-msgwindow_visible=false
+msgwindow_visible=true
 fullscreen=false
 color_picker_palette=
 scribble_text=Yoo Sup!
@@ -131,7 +131,7 @@ scribble_pos=8
 treeview_position=209
 msgwindow_position=534
 geometry=0;0;941;498;1;
-custom_date_format=
+custom_date_format=%d.%m.%Y
 tab_label_length=1000
 show_line_endings_only_when_differ=false
 symbols_group_by_type=true
@@ -205,7 +205,7 @@ scrollback_lines=500
 shell=/usr/bin/zsh
 colour_fore=#F8F8F8
 colour_back=#161925
-last_dir=/home/proxzima
+last_dir=
 
 [tools]
 terminal_cmd=x-terminal-emulator -e "/bin/sh %c"
@@ -223,14 +223,9 @@ page_header_datefmt=%c
 
 [project]
 session_file=
-project_file_path=/home/proxzima/Documents/PROxZIMA
+project_file_path=
 
 [files]
-recent_files=/home/proxzima/.scripts/screenshot_full;/home/proxzima/.config/gamemode.ini;/home/proxzima/Documents/PROxZIMA/DarkSpider/modules/visualization.py;/home/proxzima/.config/user-dirs.dirs;/home/proxzima/.config/user-dirs.locale;/home/proxzima/.scripts/screenshot;/home/proxzima/.config/hypr/hyprland.conf;/home/proxzima/.scripts/wttr;/home/proxzima/.scripts/appindicator.py;/home/proxzima/Downloads/a/x.sh;
+recent_files=
 recent_projects=
 current_page=4
-FILE_NAME_0=919;Python;0;EUTF-8;0;1;1;%2Fhome%2Fproxzima%2FDocuments%2FPROxZIMA%2FDarkSpider%2Fmodules%2Fhelper%2Fhelper.py;0;4
-FILE_NAME_1=2488;Python;0;EUTF-8;0;1;1;%2Fhome%2Fproxzima%2F.local%2Flib%2Fpython3.10%2Fsite-packages%2Fmatplotlib%2Fbackends%2Fbackend_gtk4.py;0;4
-FILE_NAME_2=80;Python;0;EUTF-8;0;1;1;%2Fhome%2Fproxzima%2F.python_startup.py;0;4
-FILE_NAME_3=5419;Python;0;EUTF-8;0;1;1;%2Fhome%2Fproxzima%2F.scripts%2Fappindicator.py;0;4
-FILE_NAME_4=5432;Conf;0;EUTF-8;0;1;1;%2Fhome%2Fproxzima%2F.config%2Fhypr%2Fhyprland.conf;0;4
diff --git a/config/geany/session.conf b/config/geany/session.conf
index e96a5132..e738bf93 100644
--- a/config/geany/session.conf
+++ b/config/geany/session.conf
@@ -1,6 +1,6 @@
 [files]
 current_page=-1
-recent_files=/home/sankalp/Downloads/New Empty File;/home/proxzima/.scripts/screenshot_full;/home/proxzima/.config/gamemode.ini;/home/proxzima/Documents/PROxZIMA/DarkSpider/modules/visualization.py;/home/proxzima/.config/user-dirs.dirs;/home/proxzima/.config/user-dirs.locale;/home/proxzima/.scripts/screenshot;/home/proxzima/.config/hypr/hyprland.conf;/home/proxzima/.scripts/wttr;/home/proxzima/.scripts/appindicator.py;
+recent_files=/home/sankalp/Documents/git/hyprland/config/hypr/initial-boot.sh;/home/sankalp/Templates/web/html.html;/home/sankalp/Templates/web/css.css;/home/sankalp/Templates/web/javascript.js;/home/sankalp/Templates/web/php.php;/home/sankalp/Templates/web/xml.xml;/home/sankalp/.config/hypr/UserConfigs/WindowRules.conf;/home/sankalp/dotfiles/.config/hypr/themes/luna/rules.conf;/home/sankalp/.config/hypr/hyprland.conf;/home/sankalp/.config/hypr/UserConfigs/UserKeybinds.conf;
 recent_projects=
 
 [project]
@@ -9,8 +9,8 @@ project_file_path=/home/proxzima/Documents/PROxZIMA
 
 [geany]
 treeview_position=209
-msgwindow_position=534
-geometry=0;0;946;1026;1;
+msgwindow_position=943
+geometry=0;0;944;1017;1;
 sidebar_page=0
 
 [search]
diff --git a/config/hypr/.current_wallpaper b/config/hypr/.current_wallpaper
index bad0f1fd..28d0e80c 120000
--- a/config/hypr/.current_wallpaper
+++ b/config/hypr/.current_wallpaper
@@ -1 +1 @@
-/home/sankalp/Pictures/wallpapers//25.jpg
\ No newline at end of file
+/home/sankalp/Pictures/wallpapers/43.jpg
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index a597c92b..e2e83fb5 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -29,6 +29,8 @@ exec-once = nm-applet --indicator &
 exec-once = udiskie &
 exec-once = blueman-applet &
 
+# screen sharing
+exec-once = xwaylandvideobridge &
 
 #clipboard manager
 exec-once = wl-paste --type text --watch cliphist store
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 8b00c3bf..d1656530 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -57,7 +57,7 @@ bind = ALT,      R,        exec, $scriptsDir/MusicControl.sh -k # Resume
 
 
 # Recorder (wf-recorder)
-bind = $mainMod, R,        exec, wf-recorder --force-yuv -c libx264rgb -t -f "$HOME/Videos/$(date +'%H:%M:%S_%d-%m-%Y.mp4')" --audio=alsa_output.pci-0000_03_00.6.analog-stereo.monitor
+bind = $mainMod, R,        exec, wf-recorder --force-yuv -c libx264rgb -t -f "$HOME/Videos/screencast--$(date +'%H:%M:%S_%d-%m-%Y.mp4')" --audio=alsa_output.pci-0000_03_00.6.analog-stereo.monitor
 bind = $mainMod_SHIFT, R,  exec, pkill wf-recorder --signal SIGINT && notify-send "🛑 Recording stopped" && pkill -RTMIN+8 waybar
 
 
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 2d432351..c476266a 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -86,7 +86,7 @@ windowrulev2 = float, title:(.*Compress.*), class:(thunar)
 windowrulev2 = size 516 158, title:(.*Rename.*), class:(thunar)
 windowrulev2 = center, title:(.*Rename.*), class:(thunar)
 
-windowrulev2 = size 840 270, title:(Confirm to replace files), class:(thunar)
+windowrulev2 = size 950 270, title:(Confirm to replace files), class:(thunar)
 windowrulev2 = center, title:(Confirm to replace files), class:(thunar)
 windowrulev2 = float,title:^(Confirm to replace files)
 
@@ -164,7 +164,7 @@ windowrulev2 = center, class:(org.qbittorrent.qBittorrent), title:(.*qbittorrent
 
 # Discord
 windowrulev2 = opacity 0.80 0.80, class:^(discord)$
-windowrulev2 = workspace 5, class:(.*discord.*)
+windowrulev2 = workspace 5 silent, class:(.*discord.*)
 
 # Discord Updater
 windowrulev2 = size 300 350, class:(.*iscord.*), title:(Discord Updater)
@@ -196,6 +196,13 @@ windowrulev2 = size 665 637, class:(blueberry)
 windowrulev2 = center, class:(blueberry)
 
 
+####### IMV image viewer
+$center-float-large = class:^(center-float-large)$|^(.*imv.*)$|^(.*imv-dir.*)$
+windowrulev2 = float, $center-float-large
+windowrulev2 = size 70% 70%, $center-float-large
+windowrulev2 = center 1, $center-float-large
+
+
 # qt5ct / qt6ct
 windowrulev2 = float, class:(qt5ct)
 windowrulev2 = float, class:(qt6ct)
@@ -226,7 +233,12 @@ windowrulev2 = float, title:(File Operation Progress)
 windowrulev2 = center, title:(File Operation Progress)
 
 
-
+## Specific App Rules
+$videobridge = class:^(.*xwaylandvideobridge.*)$
+windowrulev2 = opacity 0.0 override 0.0 override, $videobridge
+windowrulev2 = noanim, $videobridge
+windowrulev2 = nofocus, $videobridge
+windowrulev2 = noinitialfocus, $videobridge
 
 
 
diff --git a/config/hypr/UserScripts/WallpaperAutoChange.sh b/config/hypr/UserScripts/WallpaperAutoChange.sh
index 8358c0be..e204e233 100755
--- a/config/hypr/UserScripts/WallpaperAutoChange.sh
+++ b/config/hypr/UserScripts/WallpaperAutoChange.sh
@@ -6,7 +6,7 @@
 # up as the wallpaper at regular intervals
 #
 # NOTE: this script uses bash (not POSIX shell) for the RANDOM variable
-
+linker=$HOME/.config/hypr/scripts/Linker.sh
 
 if [[ $# -lt 1 ]] || [[ ! -d $1   ]]; then
 	echo "Usage:
@@ -29,8 +29,8 @@ while true; do
 		| sort -n | cut -d':' -f2- \
 		| while read -r img; do
 			# Create symbolic link to the current image
-			ln -sf "$img" $HOME/.config/hypr/.current_wallpaper
 			swww img "$img"
+                        $linker
 			sleep $INTERVAL
 		done
 done
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index 605457cd..1df432bc 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -32,5 +32,4 @@ SWWW_PARAMS="--transition-fps ${FPS} --transition-type ${TYPE} --transition-dura
 # Set the randomly selected wallpaper
 swww img "${RANDOMPICS}" ${SWWW_PARAMS}
 
-# Create symbolic link to the selected wallpaper
-ln -sf "${RANDOMPICS}" "${hyprConfigDir}/.current_wallpaper"
+${scriptsDir}/Linker.sh
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index b026f954..4962b166 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -83,5 +83,14 @@ main() {
     exit 1
   fi
 }
+
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+  exit 0
+fi
+
 main
 
+sleep 0.5
+${SCRIPTSDIR}/Linker.sh
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 965f5260..17147ee3 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -17,3 +17,4 @@ source= $UserConfigs/LaptopDisplay.conf
 source= $UserConfigs/WindowRules.conf
 source= $UserConfigs/UserKeybinds.conf
 source= $UserConfigs/UserSettings.conf
+
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index fee3cebb..2d23c502 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -16,12 +16,11 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type
 # Check if a marker file exists.
 if [ ! -f $HOME/cache/.initial_startup_done ]; then
 
-
-    # Initial scripts to load in order to have a proper wallpaper waybar
+    # Initial scripts to load in order to have a proper wallpaper
     swww init || swww query && $swww "$wallpaper" $effect
 
-    # Refreshing waybar, dunst, rofi etc.
-    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+    # For Symbolic Link
+    "$scriptsDir/Linker.sh" > /dev/null 2>&1
 
     # initiate GTK dark mode and apply icon and cursor theme
     gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-BL-LB > /dev/null 2>&1 &
@@ -33,8 +32,11 @@ if [ ! -f $HOME/cache/.initial_startup_done ]; then
     # initiate kvantum theme
     kvantummanager --set "$kvantum_theme" > /dev/null 2>&1 &
 
-    # delete sm-link
-    rm ~/.config/hypr/.current_wallpaper
+    #initiate the kb_layout
+    grep 'kb_layout=' "$HOME/.config/hypr/UserConfigs/UserSettings.conf" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null > $HOME/.cache/kb_layout
+
+    # Refreshing waybar, dunst, rofi etc.
+    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
 
     # Create a marker file to indicate that the script has been executed.
     touch $HOME/.cache/.initial_startup_done
diff --git a/config/hypr/scripts/ClipManager.sh.zip b/config/hypr/scripts/ClipManager.sh.zip
new file mode 100644
index 00000000..c5efbc4a
Binary files /dev/null and b/config/hypr/scripts/ClipManager.sh.zip differ
diff --git a/config/hypr/scripts/Linker.sh b/config/hypr/scripts/Linker.sh
new file mode 100755
index 00000000..01a47ba6
--- /dev/null
+++ b/config/hypr/scripts/Linker.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Define the path to the swww cache directory
+cache_dir="$HOME/.cache/swww/"
+
+# Get a list of monitor outputs
+monitor_outputs=("$cache_dir"/*)
+
+# Initialize a flag to determine if the ln command was executed
+ln_success=false
+
+# Loop through monitor outputs
+for cache_file in "${monitor_outputs[@]}"; do
+    # Check if the cache file exists for the current monitor output
+    if [ -f "$cache_file" ]; then
+        # Get the wallpaper path from the cache file
+        wallpaper_path=$(<"$cache_file")
+
+        # Copy the wallpaper to the location Rofi can access
+        if ln -sf "$wallpaper_path" "$HOME/.config/hypr/.current_wallpaper"; then
+            ln_success=true  # Set the flag to true upon successful execution
+            break  # Exit the loop after processing the first found monitor output
+        fi
+    fi
+done
+
+# Add a message indicating whether the ln command was successful
+if $ln_success; then
+    echo "Wallpaper linked successfully."
+else
+    echo "Failed to link wallpaper."
+fi
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 4799adef..e9920447 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -42,4 +42,4 @@ hyprctl keyword input:kb_layout "$new_layout"
 echo "$new_layout" > "$layout_f"
 
 # Notification for the new keyboard layout
-notify-send -u low -i "$notif" "Keyboard layout changed to $new_layout"
+notify-send -u low -i "$notif" "Keyboad Layout Changed to $new_layout"
diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md
index 703f5914..54e8529a 100644
--- a/config/nvim/.github/README.md
+++ b/config/nvim/.github/README.md
@@ -574,6 +574,7 @@
 - hadolint
 - markdownlint
 - pylint
+- ruff
 - shellcheck
 - stylelint
 - terraform_validate
@@ -586,11 +587,10 @@
 - black
 - csharpier
 - fish_indent
-- flake8
 - gofumpt
 - goimports
-- isort
 - prettier
+- ruff
 - rustfmt
 - shfmt
 - stylua
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 879ce6b0..63259456 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" },
   "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "958d16c554a4a7dba8332707cded68f791b75d89" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "fcb1522fefd0f9029b7dc71aa2664d2d0ead0fb3" },
   "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
@@ -16,14 +16,14 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "4063291e335e74e9ee2be04beb47d40b376312fa" },
   "comment-box.nvim": { "branch": "main", "commit": "80857fa3ec01f9d43431cbc4042f9a5ebd9a8811" },
-  "compiler.nvim": { "branch": "main", "commit": "e7a8b34e8a48d57d50882ada13ab409a00d20471" },
-  "conform.nvim": { "branch": "master", "commit": "0e61fc88f725b4411e63b43470a397c6102534c7" },
+  "compiler.nvim": { "branch": "main", "commit": "e82a48e9528edc769b1329b753eb9e3926f25595" },
+  "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" },
   "crates.nvim": { "branch": "main", "commit": "6d779c7b85139d89d92a4a0bcf0afbdcf0cd961a" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "13378f67edc112bf0d043bc0c018f8923dc2198d" },
   "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "dooku.nvim": { "branch": "main", "commit": "10d7ccca5cdd30d4d03bc7433023590ca620edc7" },
+  "dooku.nvim": { "branch": "main", "commit": "6b94ccc0e73f26e6d01bd906893eeb719f01d0d6" },
   "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" },
   "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" },
   "edgy.nvim": { "branch": "main", "commit": "8355be45610afdf79a0bab32b91ee297997455b4" },
@@ -40,7 +40,7 @@
   "icon-picker.nvim": { "branch": "master", "commit": "b94b9d30f2bf31ec3b35e15d778c1707c24ff9bf" },
   "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" },
-  "kitty-scrollback.nvim": { "branch": "main", "commit": "4696f080f082377e9c2ce5f280abc1b02d33137b" },
+  "kitty-scrollback.nvim": { "branch": "main", "commit": "1b6c841bc14604b687da924bb5b6e6e8c699e111" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
@@ -73,7 +73,7 @@
   "nvim-ansible": { "branch": "main", "commit": "d115cb9bb3680c990e2684f58cf333663fff03b8" },
   "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" },
+  "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" },
   "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" },
   "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
@@ -86,7 +86,7 @@
   "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" },
   "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" },
   "nvim-recorder": { "branch": "main", "commit": "daaae505862e816a7efe578e22d6f3d10cd7a2e6" },
-  "nvim-scissors": { "branch": "main", "commit": "b7f2d6a34b599d97deb5fd9753b4c0c506cfbc2c" },
+  "nvim-scissors": { "branch": "main", "commit": "111e703db38df23689eaee0ed8bc3a7691519de8" },
   "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
   "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
   "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" },
@@ -108,7 +108,7 @@
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "739a034046465d2b100151037401c24c42cb09cf" },
   "refactoring.nvim": { "branch": "master", "commit": "28c5a33a0c489eb559396d9424b042ccfdb03b14" },
-  "rustaceanvim": { "branch": "master", "commit": "73854d5e720d4ea135e7508d9d24fb82b4ec8223" },
+  "rustaceanvim": { "branch": "master", "commit": "207f2845f3cfb15840c8a94b2fb3077068ab25ac" },
   "satellite.nvim": { "branch": "main", "commit": "1a20861227eba8bf2d8282ab4ec5fc071e8b20e2" },
   "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" },
   "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" },
@@ -124,12 +124,12 @@
   "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
   "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
-  "telescope.nvim": { "branch": "master", "commit": "87e92ea31b2b61d45ad044cf7b2d9b66dad2a618" },
+  "telescope.nvim": { "branch": "master", "commit": "4367e05c06d19f28c514e1498bcd9410f4bc65b2" },
   "text-case.nvim": { "branch": "main", "commit": "d65b8ade26ef442d11cbf4719bb9830916a492c1" },
   "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" },
   "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
   "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
-  "tree-sitter-hyprlang": { "branch": "master", "commit": "43100f854cd5cf4e664a0dab7bf027263ca7cff2" },
+  "tree-sitter-hyprlang": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "ts-node-action": { "branch": "master", "commit": "e37eb458378de5d994df459a53711b2546abef0f" },
   "tsc.nvim": { "branch": "main", "commit": "a8f26d3d6a0faf533afb840816a6d9ac6a1fcbea" },
diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json
index f60c03c5..d3abf0bf 100644
--- a/config/nvim/lazyvim.json
+++ b/config/nvim/lazyvim.json
@@ -1,6 +1,5 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.lang.python-semshi",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.ui.edgy",
@@ -43,8 +42,8 @@
     "plugins.extras.editor.telescope.undotree",
     "plugins.extras.editor.telescope.zoxide",
     "plugins.extras.editor.terminal.floaterm",
-    "plugins.extras.formatting.isort",
     "plugins.extras.formatting.prettier-extended",
+    "plugins.extras.formatting.ruff",
     "plugins.extras.formatting.rustfmt",
     "plugins.extras.formatting.trim_newlines",
     "plugins.extras.formatting.trim_whitespace",
diff --git a/config/nvim/lua/plugins/extras/formatting/isort.lua b/config/nvim/lua/plugins/extras/formatting/ruff.lua
similarity index 71%
rename from config/nvim/lua/plugins/extras/formatting/isort.lua
rename to config/nvim/lua/plugins/extras/formatting/ruff.lua
index c0218f1a..e6171725 100644
--- a/config/nvim/lua/plugins/extras/formatting/isort.lua
+++ b/config/nvim/lua/plugins/extras/formatting/ruff.lua
@@ -1,17 +1,17 @@
 return {
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "isort" })
-    end,
-  },
   {
     "stevearc/conform.nvim",
     opts = function(_, opts)
       opts.formatters_by_ft.python = opts.formatters_by_ft.python or {}
-      table.insert(opts.formatters_by_ft.python, "isort")
+      table.insert(opts.formatters_by_ft.python, "ruff_format")
       return opts
     end,
   },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "ruff-lsp" })
+    end,
+  },
 }