diff --git a/home/.config/alacritty/alacritty.toml b/home/.config/alacritty/alacritty.toml
index 7535197..6322f1d 100644
--- a/home/.config/alacritty/alacritty.toml
+++ b/home/.config/alacritty/alacritty.toml
@@ -11,7 +11,7 @@ y = 8
 opacity = 0.9
 
 [font]
-size = 7.5
+size = 11.5
 
 [font.normal]
-family = "Roboto mono"
+family = "Roboto Mono"
\ No newline at end of file
diff --git a/home/.config/btop/btop.conf b/home/.config/btop/btop.conf
index 1c5f165..f4792e4 100644
--- a/home/.config/btop/btop.conf
+++ b/home/.config/btop/btop.conf
@@ -1,18 +1,23 @@
-#? Config file for btop v. 1.4.4
+#? Config file for btop v.1.4.7
 
 #* 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"
 color_theme = "~/.config/btop/themes/onedark.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = False
+theme_background = false
 
 #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
+truecolor = true
 
 #* Set to true to force tty mode regardless if a real tty has been detected or not.
 #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
+force_tty = false
+
+#* Option to disable presets. Either the default preset, custom presets, or all presets.
+#* "Off" All presets are enabled.
+#* "Default" preset is disabled.#* "Custom" presets are disabled.#* "All" presets are disabled.
+disable_presets = "Off"
 
 #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
@@ -22,10 +27,16 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul
 
 #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
 #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = False
+vim_keys = false
+
+#* Disable all mouse events.
+disable_mouse = false
 
 #* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
+rounded_corners = true
+
+#* Use terminal synchronized output sequences to reduce flickering on supported terminals.
+terminal_sync = true
 
 #* Default symbols to use for graph creation, "braille", "block" or "tty".
 #* "braille" offers the highest resolution but might not be included in all fonts.
@@ -50,7 +61,7 @@ graph_symbol_net = "default"
 graph_symbol_proc = "default"
 
 #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
-shown_boxes = "proc cpu"
+shown_boxes = "mem cpu proc"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
 update_ms = 2000
@@ -60,37 +71,43 @@ update_ms = 2000
 proc_sorting = "cpu direct"
 
 #* Reverse sorting order, True or False.
-proc_reversed = False
+proc_reversed = true
 
 #* Show processes as a tree.
-proc_tree = False
+proc_tree = false
 
 #* Use the cpu graph colors in the process list.
-proc_colors = True
+proc_colors = true
 
 #* Use a darkening gradient in the process list.
-proc_gradient = False
+proc_gradient = false
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = True
+proc_per_core = true
 
 #* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
+proc_mem_bytes = true
 
 #* Show cpu graph for each process.
-proc_cpu_graphs = True
+proc_cpu_graphs = true
 
 #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
+proc_info_smaps = false
 
 #* Show proc box on left side of screen instead of right.
-proc_left = False
+proc_left = false
 
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
+proc_filter_kernel = false
+
+#* Should the process list follow the selected process when detailed view is open.
+proc_follow_detailed = true
 
 #* In tree-view, always accumulate child process resources in the parent process.
-proc_aggregate = False
+proc_aggregate = false
+
+#* Should cpu and memory usage display be preserved for dead processes when paused.
+keep_dead_proc_usage = 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.
@@ -104,25 +121,28 @@ cpu_graph_lower = "Auto"
 show_gpu_info = "Auto"
 
 #* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
+cpu_invert_lower = true
 
 #* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
+cpu_single_graph = false
 
 #* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
+cpu_bottom = false
 
 #* Shows the system uptime in the CPU box.
-show_uptime = True
+show_uptime = true
+
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = true
 
 #* Show cpu temperature.
-check_temp = True
+check_temp = true
 
 #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
 cpu_sensor = "Auto"
 
 #* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
+show_coretemp = true
 
 #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
 #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
@@ -134,17 +154,20 @@ cpu_core_map = ""
 temp_scale = "celsius"
 
 #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = False
+base_10_sizes = false
 
 #* Show CPU frequency.
-show_cpu_freq = True
+show_cpu_freq = true
+
+#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average".
+freq_mode = "first"
 
 #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
 #* Special formatting: /host = hostname | /user = username | /uptime = system uptime
 clock_format = "%X"
 
 #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
+background_update = true
 
 #* Custom cpu model name, empty string to disable.
 custom_cpu_name = ""
@@ -154,58 +177,61 @@ custom_cpu_name = ""
 disks_filter = ""
 
 #* Show graphs instead of meters for memory values.
-mem_graphs = True
+mem_graphs = true
 
 #* Show mem box below net box instead of above.
-mem_below_net = False
+mem_below_net = false
 
 #* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
+zfs_arc_cached = true
 
 #* If swap memory should be shown in memory box.
-show_swap = True
+show_swap = true
 
 #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
+swap_disk = true
 
 #* If mem box should be split to also show disks info.
-show_disks = True
+show_disks = true
 
 #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
+only_physical = true
 
 #* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
+use_fstab = true
 
 #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
+zfs_hide_datasets = false
 
 #* Set to true to show available disk space for privileged users.
-disk_free_priv = False
+disk_free_priv = false
 
 #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
+show_io_stat = true
 
 #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
+io_mode = false
 
 #* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
+io_graph_combined = false
 
 #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
 #* Example: "/mnt/media:100 /:20 /boot:1".
 io_graph_speeds = ""
 
+#* Swap the positions of the upload and download speed graphs. When true, upload will be on top.
+swap_upload_download = false
+
 #* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
 net_download = 100
 
 net_upload = 100
 
 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
+net_auto = true
 
 #* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
+net_sync = true
 
 #* Starts with the Network Interface specified here.
 net_iface = ""
@@ -214,26 +240,32 @@ net_iface = ""
 base_10_bitrate = "Auto"
 
 #* Show battery stats in top right if battery is present.
-show_battery = True
+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
+show_battery_watts = true
 
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
+#* Set loglevel for "~/.local/state/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"
 
+#* Automatically save current settings to config file on exit.
+save_config_on_exit = true
+
 #* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
-nvml_measure_pcie_speeds = True
+nvml_measure_pcie_speeds = true
 
 #* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
-rsmi_measure_pcie_speeds = True
+rsmi_measure_pcie_speeds = true
 
 #* Horizontally mirror the GPU graph.
-gpu_mirror_graph = True
+gpu_mirror_graph = true
+
+#* Set which GPU vendors to show. Available values are "nvidia amd intel apple"
+shown_gpus = "nvidia amd intel"
 
 #* Custom gpu0 model name, empty string to disable.
 custom_gpu_name0 = ""
diff --git a/home/.config/dunst/dunstrc b/home/.config/dunst/dunstrc
index d283f07..7d847a5 100644
--- a/home/.config/dunst/dunstrc
+++ b/home/.config/dunst/dunstrc
@@ -18,7 +18,7 @@
     width = (300,500)
     height = (0, 300)
     origin = top-right
-    offset = (8, 47)
+    offset = (36, 36)
     scale = 0
     notification_limit = 20
     progress_bar = true
diff --git a/home/.config/picom/picom.conf b/home/.config/picom/picom.conf
deleted file mode 100755
index 106b3b0..0000000
--- a/home/.config/picom/picom.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Documentation: https://github.com/yshui/picom/wiki
-# Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
-# Copyright (C) 2022 Keyitdev
-
-fading = true;
-fade-in-step = 0.015;
-fade-out-step = 0.1;
-fade-delta = 5
-
-experimental-backends = false;
-backend = "glx";
-
-vsync = false
-refresh-rate = 0
-
-detect-transient = true
-
-log-level = "debug";
-
-opacity-rule: [
-    "95:class_g     = 'Org.gnome.Nautilus'"
-];
\ No newline at end of file
diff --git a/home/.config/polybar/colors.ini b/home/.config/polybar/colors.ini
deleted file mode 100755
index 7b126d8..0000000
--- a/home/.config/polybar/colors.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-[color]
-
-background = #1b1b25
-foreground = #dedede
-transparent = #0000003f
-sep = #F8F8F2
-
-white = #eeffff
-black = #15121c
-red = #cb5760
-green = #999f63
-yellow = #d4a067
-blue = #6c90a8
-purple = #776690
-cyan = #528a9b
-pink = #ffa8c5
-orange = #c87c3e
-
-; [color]
-
-; background = ${xrdb:background}
-; foreground = ${xrdb:foreground}
-; transparent = ${xrdb:transparent}
-; sep = ${xrdb:sep}
-
-; white = ${xrdb:white}
-; black = ${xrdb:black}
-; red = ${xrdb:red}
-; green = ${xrdb:green}
-; yellow = ${xrdb:yellow}
-; blue = ${xrdb:blue}
-; purple = ${xrdb:purple}
-; cyan = ${xrdb:cyan}
-; pink = ${xrdb:pink}
-; orange = ${xrdb:orange}
\ No newline at end of file
diff --git a/home/.config/polybar/config.ini b/home/.config/polybar/config.ini
deleted file mode 100644
index 0d5cb85..0000000
--- a/home/.config/polybar/config.ini
+++ /dev/null
@@ -1,647 +0,0 @@
-include-file = $HOME/.config/polybar/colors.ini
-
-[settings]
-screenchange-reload = true
-
-compositing-background = source
-compositing-foreground = over
-compositing-overline = over
-compositing-underline = over
-compositing-border = over
-
-; format-foreground = 
-; format-background = 
-; format-underline =
-; format-overline =
-; format-spacing =
-; format-padding =
-; format-margin =
-; format-offset =
-
-pseudo-transparency = true
-
-[bar/main]
-; $ polybar -M | cut -d ':' -f 1
-; $ xrandr -q | grep " connected" | cut -d ' ' -f1
-monitor =
-monitor-fallback =
-monitor-strict = false
-monitor-exact = true
-override-redirect = false
-; override-redirect = true
-
-bottom = false
-fixed-center = true
-
-width = 100%
-height = 31
-
-offset-x = 0
-offset-y = 0
-
-background = ${color.transparent}
-foreground = ${color.foreground}
-; background-0 = 
-
-radius = 0.0
-
-
-line-size = 2
-line-color = ${color.transparent}
-
-border-top-size = 8
-border-top-color = ${color.transparent}
-border-left-size = 8
-border-left-color = ${color.transparent}
-border-right-size = 8
-border-right-color = ${color.transparent}
-
-padding = 0
-
-font-0 = "Iosevka Nerd Font:size=12;4"
-font-1 = "Iosevka Nerd Font:style=Medium:size=18;4"
-font-2 = "feather:size=13;5"
-
-; modules-left = l menu r s l i3 r s l wireless-network r
-; modules-center = l date r
-; modules-right =  l temperature s2 s2 cpu s2 s2 ram r s l backlight r s l pulseaudio r s l battery r s l tray r
-
-modules-left = l menu r s l i3 r
-modules-center = l date r
-modules-right = l wireless-network r s l temperature s2 s2 ram r s l backlight s2 s2 pulseaudio r s l battery r s tray_transparent 
-
-;l r s s2
-; module-margin =
-; separator = 
-
-dim-value = 1.0
-wm-name = i3
-locale = 
-; enable-struts = i3
-
-dpi-x = 96
-dpi-y = 96
-
-enable-ipc = true
-
-; click-left = 
-; click-middle = 
-; click-right =
-; scroll-up =
-; scroll-down =
-; double-click-left =
-; double-click-middle =
-; double-click-right =
-
-double-click-interval = 400
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-
-[module/l]
-type = custom/text
-format-background = ${color.transparent}
-format-foreground = ${color.background}
-format = 
-format-font = 2
-
-[module/r]
-type = custom/text
-format-background = ${color.transparent}
-format-foreground = ${color.background}
-format = 
-format-font = 2
-
-[module/s]
-type = custom/text
-format = " "
-
-[module/s2]
-type = custom/text
-format = " "
-
-format-foreground = ${color.background}
-format-background = ${color.background}
-
-[module/tray]
-type = internal/tray
-
-format-background = ${color.background}
-
-tray-foreground = ${color.foreground}
-tray-background = ${color.background}
-
-tray-padding = 5px
-tray-spacing = 0
-tray-size = 66%
-
-[module/tray_transparent]
-type = internal/tray
-
-format-background = ${color.transparent}
-
-tray-foreground = ${color.transparent}
-tray-background = ${color.transparent}
-
-tray-padding = 5px
-tray-spacing = 0
-tray-size = 66%
-
-[module/alsa]
-type = internal/alsa
-interval = 5
-
-master-soundcard = default
-speaker-soundcard = default
-headphone-soundcard = default
-master-mixer = Master
-
-format-volume = <ramp-volume> <label-volume>
-format-volume-background = ${color.background}
-format-muted = <label-muted>
-format-muted-background = ${color.background}
-
-label-volume = %percentage%%
-label-muted = 
-label-muted-foreground =${color.red}
-
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
-ramp-headphones-0 = 
-ramp-volume-foreground = ${color.blue}
-
-[module/pulseaudio]
-type = internal/pulseaudio
-interval = 5
-
-; use-ui-max ? 153 : 100
-use-ui-max = false
-
-format-volume = <ramp-volume> <label-volume>
-format-volume-background = ${color.background}
-format-muted = <label-muted>
-format-muted-background = ${color.background}
-
-label-volume = %percentage%%
-label-muted = 
-label-muted-foreground =${color.red}
-
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
-ramp-headphones-0 = 
-ramp-volume-foreground = ${color.blue}
-
-[module/backlight]
-type = internal/backlight
-
-; Change it for yourself
-; ls -1 /sys/class/backlight/
-card = 
-use-actual-brightness = ture
-poll-interval = 1
-enable-scroll = true
-
-scroll-interval = 5
-
-format = <ramp><label>
-format-background = ${color.background}
-
-label =%percentage%%
-
-ramp-0 = " "
-ramp-1 = " "
-ramp-foreground = ${color.yellow}
-
-[module/battery]
-type = internal/battery
-
-full-at = 98
-low-at = 10
-
-; Change it for yourself
-; ls /sys/class/power_supply/
-battery = BAT1
-adapter = ADP0
-
-poll-interval = 5
-
-time-format = %H:%M
-
-format-charging = <label-charging>
-format-charging-prefix = ""
-format-charging-prefix-foreground = ${color.green}
-format-charging-prefix-background = ${color.background}
-label-charging = " %percentage%%"
-label-charging-background = ${color.background}
-
-format-discharging = <label-discharging>
-format-discharging-prefix = " "
-format-discharging-prefix-foreground = ${color.orange}
-format-discharging-prefix-background = ${color.background}
-; label-discharging = "%percentage%%"
-; label-discharging = "%percentage%% %consumption%W (%time%)"
-label-discharging = "%percentage%% (%time%)"
-label-discharging-background = ${color.background}
-
-format-full = <label-full>
-format-full-prefix = " "
-format-full-prefix-foreground = ${color.red}
-format-full-prefix-background = ${color.background}
-label-full = "Full"
-label-full-background = ${color.background}
-
-format-low = <label-low><animation-low>
-format-low-prefix = " "
-format-low-prefix-foreground = ${color.orange}
-format-low-prefix-background = ${color.background}
-label-low = "%percentage%"
-label-low-background = ${color.background}
-
-animation-low-0 = "%"
-animation-low-1 = "!"
-animation-low-0-background = ${color.background}
-animation-low-1-background = ${color.red}
-animation-low-1-foreground = ${color.black}
-animation-low-framerate = 1000
-
-[module/wattage]
-type = internal/battery
-
-; Change it for yourself
-; ls /sys/class/power_supply/
-battery = BAT1
-adapter = ADP0
-
-full-at = 98
-low-at = 10
-
-poll-interval = 5
-
-time-format = %H:%M
-
-format-charging = <label-charging>
-format-charging-prefix = ""
-format-charging-prefix-foreground = ${color.orange}
-format-charging-prefix-background = ${color.background}
-label-charging = "%consumption%W (%time%)"
-label-charging-background = ${color.background}
-
-format-discharging = <label-discharging>
-format-discharging-prefix = " "
-format-discharging-prefix-foreground = ${color.orange}
-format-discharging-prefix-background = ${color.background}
-label-discharging = "%consumption%W (%time%)"
-label-discharging-background = ${color.background}
-
-format-full = <label-full>
-format-full-prefix = " "
-format-full-prefix-foreground = ${color.orange}
-format-full-prefix-background = ${color.background}
-label-full = "Full"
-label-full-background = ${color.background}
-
-[module/cpu]
-type = internal/cpu
-interval = 1
-
-warn-percentage = 90
-
-format = <label>
-format-prefix = " "
-format-prefix-foreground = ${color.green}
-format-background = ${color.background}
-label = "%percentage%%"
-
-; format-warn = <label-warn>
-; format-warn-prefix = " "
-; format-warn-prefix-foreground = ${color.red}
-; format-warn-background = ${color.background}
-; format-warn-foreground = ${color.red}
-; label-warn = "%percentage%%"
-
-[module/date]
-type = internal/date
-interval = 1
-
-; Change it for yourself
-; https://en.cppreference.com/w/cpp/io/manip/put_time
-
-date = %a %d %b
-time = %H:%M
-date-alt = %A %d %B %Y
-time-alt = %H:%M:%S
-
-format = <label>
-format-prefix = " "
-format-prefix-foreground = ${color.red}
-format-background = ${color.background}
-
-label = %date% %time%
-
-[module/filesystem]
-type = internal/fs
-interval = 10
-
-mount-0 = /
-fixed-values = false
-spacing = 0
-warn-percentage = 95
-
-format-mounted = <label-mounted>
-format-mounted-prefix = " "
-format-mounted-prefix-foreground = ${color.orange}
-format-mounted-background = ${color.background}
-label-mounted = "%percentage_used%%"
-
-format-unmounted = <label-unmounted>
-format-unmounted-prefix = " "
-format-unmounted-prefix-foreground = ${color.red}
-format-unmounted-background = ${color.background}
-label-unmounted = "Not mounted"
-
-; format-warn = <label-warn>
-; format-warn-prefix = " "
-; format-warn-prefix-foreground = ${color.red}
-; format-warn-background = ${color.background}
-; format-warn-foreground = ${color.red}
-; label-warn = "%percentage_used%%"
-
-[module/i3]
-type = internal/i3
-
-pin-workspaces = true
-show-urgent = true
-strip-wsnumbers = true
-index-sort = true
-enable-click = true
-enable-scroll = true
-wrapping-scroll = true
-reverse-scroll = false
-fuzzy-match = false
-
-ws-icon-0 = 1;
-ws-icon-1 = 2;
-ws-icon-2 = 3;
-ws-icon-3 = 4;
-ws-icon-4 = 5;
-ws-icon-5 = 6;
-ws-icon-6 = 7;
-ws-icon-7 = 8;
-ws-icon-8 = 9;
-ws-icon-9 = 10;
-ws-icon-default = 
-
-
-format = <label-state><label-mode>
-
-label-mode = %mode%
-label-mode-padding = 1
-label-mode-background = ${color.background}
-label-mode-foreground = ${color.foreground}
-
-label-focused = %icon%
-label-focused-foreground = ${color.green}
-label-focused-background = ${color.background}
-label-focused-underline =  ${color.green}
-label-focused-padding = 1
-
-label-unfocused = %icon%
-label-unfocused-padding = 1
-label-unfocused-background = ${color.background}
-
-label-visible = %icon%
-label-visible-underline = ${color.purple}
-label-visible-padding = 1
-label-visible-foreground = ${color.purple}
-label-visible-background = ${color.background}
-
-label-urgent = %icon%
-label-urgent-foreground = ${color.red}
-label-urgent-background = ${color.background}
-label-urgent-padding = 1
-
-[module/mpd]
-type = internal/mpd
-interval = 1
-host = 127.0.0.1
-port = 6600
-
-format-online = <label-song> <icon-prev> <toggle> <icon-next>
-format-online-prefix = " "
-format-online-prefix-foreground = ${color.green}
-format-online-background = ${color.background}
-
-format-playing = ${self.format-online}
-format-paused = ${self.format-online}
-format-stopped = ${self.format-online}
-
-format-offline = <label-offline>
-format-offline-prefix = " "
-format-offline-prefix-foreground = ${color.red}
-format-offline-background = ${color.background}
-
-label-song =  "%title%"
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-label-time = %elapsed% / %total%
-label-time-background = ${color.background}
-label-time-padding = 1
-
-label-offline = "Off"
-
-icon-play = 
-icon-play-foreground = ${color.cyan}
-icon-pause = 
-icon-pause-foreground = ${color.cyan}
-icon-stop = 
-icon-stop-foreground = ${color.red}
-icon-next = 
-icon-next-foreground = ${color.cyan}
-icon-prev = 
-icon-prev-foreground = ${color.cyan}
-icon-seekf = 
-icon-seekb = 
-icon-random = 
-icon-repeat = 
-icon-repeatone = 
-icon-single = 
-icon-consume =
-
-toggle-on-foreground = ${color.primary}
-toggle-off-foreground = ${color.red}
-
-[module/wireless-network]
-type = internal/network
-interface = wlan0
-
-interval = 1.0
-
-accumulate-stats = true
-unknown-as-up = true
-
-format-connected = <label-connected>
-format-connected-prefix = 
-format-connected-prefix-foreground = ${color.orange}
-format-connected-background = ${color.background}
-format-connected-padding = 0
-
-format-disconnected = <label-disconnected>
-format-disconnected-prefix = 
-format-disconnected-prefix-foreground = ${color.red}
-format-disconnected-background = ${color.background}
-format-disconnected-padding = 0
-
-label-connected = "%{A1:networkmanager_dmenu &:} %essid% %downspeed%%{A}"
-
-label-disconnected = "%{A1:networkmanager_dmenu &:} Offline%{A}"
-
-[module/ram]
-type = internal/memory
-interval = 1
-
-format = <label>
-format-prefix = " "
-format-prefix-foreground = ${color.purple}
-format-background = ${color.background}
-
-label = "%gb_used%"
-
-; warn 
-
-[module/swap]
-type = internal/memory
-interval = 1
-
-format = <label>
-format-prefix = " "
-format-prefix-foreground = ${color.cyan}
-format-background = ${color.background}
-
-label = "%gb_swap_used%"
-
-; warn 
-
-[module/temperature]
-type = internal/temperature
-interval = 0.5
-
-thermal-zone = 0
-; zone-type = x86_pkg_temp
-; hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
-base-temperature = 30
-warn-temperature = 90
-units = true
-
-format = <ramp> <label>
-format-background = ${color.background}
-
-format-warn = <ramp> <label-warn>
-format-warn-background = ${color.background}
-
-label = %temperature-c%
-
-label-warn = "%temperature-c%"
-label-warn-foreground = ${color.red}
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-3 = 
-ramp-4 = 
-ramp-foreground = ${color.cyan}
-ramp-0-foreground = ${color.cyan}
-ramp-1-foreground = ${color.green}
-ramp-2-foreground = ${color.yellow}
-ramp-3-foreground = ${color.orange}
-ramp-4-foreground = ${color.red}
-
-[module/title]
-type = internal/xwindow
-; Available tags:
-;   <label> (default)
-format = <label>
-format-prefix = "! "
-format-prefix-foreground = ${color.yellow}
-format-prefix-background = ${color.background}
-format-background = ${color.background}
-format-foreground = ${color.foreground}
-
-; Available tokens:
-;   %title%
-;   %instance% (first part of the WM_CLASS atom, new in version 3.7.0)
-;   %class%    (second part of the WM_CLASS atom, new in version 3.7.0)
-; Default: %title%
-label = %title%
-label-maxlen = 50
-
-; Used instead of label when there is no window title
-; Available tokens:
-;   None
-label-empty = Empty
-label-empty-foreground = #707880
-
-
-[module/ewmh]
-type = internal/xworkspaces
-
-pin-workspaces = true
-show-urgent = true
-strip-wsnumbers = true
-index-sort = true
-enable-click = true
-enable-scroll = true
-wrapping-scroll = true
-reverse-scroll = false
-fuzzy-match = false
-
-icon-0 = 1;
-icon-1 = 2;
-icon-2 = 3;
-icon-3 = 4;
-icon-4 = 5;
-icon-5 = 6;
-icon-6 = 7;
-icon-7 = 8;
-icon-8 = 9;
-icon-9 = 10;
-icon-default = 
-
-format = <label-state>
-
-label-active = %icon%
-label-active-foreground = ${color.green}
-label-active-background = ${color.background}
-label-active-underline =  ${color.green}
-label-active-padding = 1
-
-label-occupied = %icon%
-label-occupied-padding = 1
-label-occupied-background = ${color.background}
-
-label-urgent = %icon%
-label-urgent-foreground = ${color.red}
-label-urgent-background = ${color.background}
-label-urgent-padding = 1
-
-
-[module/menu]
-type = custom/text
-
-format = <label>
-label = ""
-
-format-background = ${color.background}
-format-foreground = ${color.yellow}
-
-
-click-left = rofi -show drun -no-default-config -config ~/.config/rofi/dmenu.rasi
-; create a new workspace (with the smallest possible number)
-click-middle = i3-msg workspace $(comm -23 <(seq 1 100) <(i3-msg -t get_workspaces | jq '.[].num' | sort -n) | head -n 1)
-click-right = rofi-powermenu
-
-; scroll-up = notify-send scroll up
-; scroll-down = notify-send scroll down
\ No newline at end of file
diff --git a/home/.config/polybar/launch.sh b/home/.config/polybar/launch.sh
deleted file mode 100755
index 16e89e4..0000000
--- a/home/.config/polybar/launch.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-# Launch Polybar, using default config location ~/.config/polybar/config
-polybar main --config=~/.config/polybar/config.ini &
-# polybar main --config=~/.config/polybar/config_new.ini  &
-
-echo "Polybar launched..."
\ No newline at end of file
diff --git a/home/.config/rofi/main.rasi b/home/.config/rofi/main.rasi
index ebfd1d9..07c3fd0 100644
--- a/home/.config/rofi/main.rasi
+++ b/home/.config/rofi/main.rasi
@@ -2,13 +2,13 @@
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
  * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
- * Copyright (C) 2022 Keyitdev, Aditya Shakya
+ * Copyright (C) 2022-2026 Keyitdev, Aditya Shakya
 */
 
 @import "colors.rasi" 
 
 configuration {
-  font: "Roboto mono 11";
+  font: "Roboto mono 14";
   show-icons: true;
   icon-theme: "Papirus";
   display-drun: "";
@@ -18,7 +18,6 @@ configuration {
   sidebar-mode: false;
 }
 
-
 window {
   transparency: "real";
   background-color: @bg;
@@ -26,7 +25,7 @@ window {
   border: 2px;
   border-color: @br;
   border-radius: 20px;
-  height: 45.3%;
+ // height: 45.3%;
   width: 40%;
   location: center;
   x-offset: 0;
@@ -38,7 +37,7 @@ prompt {
   padding: 1.6% 0% 1.5% 1.2%;
   background-color: @al;
   text-color: @fg;
-  font: "Iosevka Nerd Font 12";
+  font: "Iosevka Nerd Font 15";
 }
 
 entry {
@@ -66,8 +65,8 @@ inputbar {
 listview {
   background-color: @al;
   padding: 0px;
-  columns: 2;
-  lines: 5;
+  columns: 1;
+  lines: 8;
   spacing: 0%;
   cycle: false;
   dynamic: true;
@@ -89,7 +88,7 @@ element {
   text-color: @fg;
   orientation: horizontal;
   border-radius: 0%;
-  padding: 1% 0.5% 1% 0.5%;
+  padding: 1.5% 0.5% 1.5% 0.5%;
 }
 
 element-icon {
diff --git a/home/.config/rofi/main_without_icons.rasi b/home/.config/rofi/main_without_icons.rasi
index 79c003e..49553e7 100644
--- a/home/.config/rofi/main_without_icons.rasi
+++ b/home/.config/rofi/main_without_icons.rasi
@@ -2,13 +2,13 @@
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
  * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
- * Copyright (C) 2022 Keyitdev, Aditya Shakya
+ * Copyright (C) 2022-2026 Keyitdev, Aditya Shakya
 */
 
 @import "colors.rasi" 
 
 configuration {
-  font: "Roboto mono 11";
+  font: "Roboto mono 14";
   show-icons: false;
   icon-theme: "Papirus";
   display-drun: "";
@@ -26,7 +26,7 @@ window {
   border: 2px;
   border-color: @br;
   border-radius: 20px;
-  height: 36.54%;
+  //height: 36.54%;
   width: 25%;
   location: center;
   x-offset: 0;
@@ -39,7 +39,7 @@ prompt {
   padding: 1.7% 0% 1.5% 1%;
   background-color: @al;
   text-color: @fg;
-  font: "Iosevka Nerd Font 12";
+  font: "Iosevka Nerd Font 15";
 }
 
 entry {
@@ -68,7 +68,7 @@ listview {
   background-color: @al;
   padding: 0px;
   columns: 1;
-  lines: 5;
+  lines: 7;
   spacing: 0%;
   cycle: false;
   dynamic: true;
diff --git a/home/.config/i3/config b/home/.config/sway/config
similarity index 59%
rename from home/.config/i3/config
rename to home/.config/sway/config
index 7bb4216..8bbbf4a 100644
--- a/home/.config/i3/config
+++ b/home/.config/sway/config
@@ -1,41 +1,74 @@
-# i3 config file (v4)
+# sway config file (v5)
+# https://www.github.com/keyitdev/dotfiles
+# Copyright (C) 2022-2026 Keyitdev
+# https://github.com/swaywm/sway/wiki
 # https://i3wm.org/docs/userguide.html
 
+output DP-4 mode 2560x1440@200Hz 
+output * bg ~/Pictures/wallpapers/background.png fill
+
+input type:keyboard {
+      xkb_layout "pl"
+}
+
 set $mod Mod4
 floating_modifier $mod
-tiling_drag modifier titlebar
 
 font pango:Open sans 11
-exec --no-startup-id dex --autostart --environment i3
-exec --no-startup-id xss-lock --transfer-sleep-lock -- lock --nofork
-exec --no-startup-id xrandr --dpi 96
 
-exec_always --no-startup-id feh --no-fehbg --bg-fill $HOME/Pictures/wallpapers/background.png
-exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+# kinda overkill, just to make sure every app respect dark theme
+exec_always {
+    #systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_RUNTIME_DIR
+    #dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+    
+    systemctl --user import-environment WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_RUNTIME_DIR XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP DBUS_SESSION_BUS_ADDRESS
+    export GTK_THEME="gtk-dark-keyitdev:dark"
+    #exec --no-startup-id dbus-update-activation-environment --all
+    dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_RUNTIME_DIR XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP DBUS_SESSION_BUS_ADDRESS
+    gsettings set org.gnome.desktop.interface gtk-theme 'gtk-dark-keyitdev:dark'
+    gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+}
 
-exec_always --no-startup-id mpd &
-exec_always --no-startup-id picom &
-exec_always --no-startup-id dunst &
+exec_always --no-startup-id sh -c 'pkill -x waybar; waybar'
+exec_always --no-startup-id ~/system_monitor.sh &
 exec_always --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
-exec_always --no-startup-id asus_fan_listener  &
-exec_always --no-startup-id battery_listener &
-
-bindsym XF86AudioRaiseVolume exec --no-startup-id volume_control -s +5 -m 125 && volume_level
-bindsym XF86AudioLowerVolume exec --no-startup-id volume_control -s -5 -m 125 && volume_level
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && volume_mute
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && microphone_mute
-bindsym Ctrl+F5 exec --no-startup-id asus_fan_toggle
-bindsym XF86ScreenSaver exec --no-startup-id xset dpms force off
-bindsym XF86MonBrightnessDown exec --no-startup-id brightness_control -s -2 && brightness_level
-bindsym XF86MonBrightnessUp exec --no-startup-id brightness_control -s +2 && brightness_level
-bindsym XF86TouchpadToggle exec --no-startup-id touchpad_toggle
-# bindsym XF86RFKill
-# bindsym XF86Calculator exec --no-startup-id nemo
+exec_always --no-startup-id dunst &
 
+# 1st - lock
+# 2nd - turn off screen
+# 3rd - sleep
+exec_always --no-startup-id killall swayidle; swayidle -w \
+    timeout 300 'swaymsg "output * power off"' \
+        resume 'swaymsg "output * power on"' \
+    timeout 1200 'lock' \
+    timeout 3600 'systemctl suspend'
+#     before-sleep 'lock'
+
+# exec_always --no-startup-id asus_fan_listener  &
+# exec_always --no-startup-id battery_listener &
+# bindsym Ctrl+F5 exec --no-startup-id asus_fan_toggle
+
+bindsym --locked XF86AudioRaiseVolume exec --no-startup-id volume_control -s +5 -m 125 && volume_level
+bindsym --locked XF86AudioLowerVolume exec --no-startup-id volume_control -s -5 -m 125 && volume_level
+bindsym --locked XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && volume_mute
+bindsym --locked XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && microphone_mute
+bindsym --locked XF86MonBrightnessUp exec --no-startup-id brightness_control -s +2 && brightness_level
+bindsym --locked XF86MonBrightnessDown exec --no-startup-id brightness_control -s -2 && brightness_level
+bindsym --locked XF86ScreenSaver exec --no-startup-id swaymsg "output * dpms off"
+bindsym --locked XF86TouchpadToggle exec --no-startup-id touchpad_toggle
+bindsym --locked XF86AudioPlay exec playerctl play-pause
+bindsym --locked XF86AudioPause exec playerctl play-pause
+bindsym --locked XF86AudioPrev exec playerctl previous
+bindsym --locked XF86AudioNext exec playerctl next
+bindsym --locked XF86AudioStop exec playerctl stop
+bindsym XF86Calculator exec --no-startup-id qalculate-gtk
+# bindsym XF86RFKill
+    
 bindsym Pause exec screenshot -sa
 bindsym Print exec screenshot -sf
 
-bindsym $mod+Return exec i3-sensible-terminal
+# Run terminal (i3-sensible-terminal wannabe) 
+bindsym $mod+Return exec sh -c 'for terminal in "$TERMINAL" x-terminal-emulator kitty alacritty mate-terminal gnome-terminal terminator xfce4-terminal urxvt rxvt termit Eterm aterm uxterm xterm roxterm termite lxterminal terminology st qterminal lilyterm tilix terminix konsole guake tilda hyper wezterm rio; do if command -v "$terminal" > /dev/null 2>&1; then exec "$terminal" "$@"; fi; done'
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -56,13 +89,13 @@ bindsym $mod+c exec --no-startup-id rofi-screenshot
 bindsym $mod+i exec lock
 
 bindsym $mod+b move workspace to output right
-bindsym $mod+n exec xrandr --auto --output eDP-1 --mode 1920x1080 --right-of HDMI-1 && i3-msg restart &
-bindsym $mod+m exec xrandr --auto --output HDMI-1 --off && i3-msg restart &
+bindsym $mod+n exec "swaymsg output HDMI-A-1 enable; swaymsg output HDMI-A-1 pos 1920 0"
+bindsym $mod+m exec "swaymsg output HDMI-A-1 disable"
 
-bindsym ctrl + F1 exec --no-startup-id i3-sensible-terminal
-bindsym ctrl + F2 exec --no-startup-id kitty
-bindsym ctrl + F3 exec --no-startup-id dmenu_run
-bindsym ctrl + F4 exec --no-startup-id killall picom
+bindsym ctrl+F1 exec --no-startup-id swaymsg "output * dpms off"
+bindsym ctrl+F2 exec --no-startup-id swaymsg "output * dpms on"
+bindsym ctrl+F4 exec --no-startup-id kitty
+bindsym ctrl+F3 exec --no-startup-id dmenu_run
 
 # bindsym $mod+d exec --no-startup-id dmenu_run
 
@@ -155,10 +188,12 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# reload the configuration file
+bindsym $mod+Shift+r reload
+
+# exit sway
+bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway?' -B 'Yes, exit sway' 'swaymsg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -187,16 +222,18 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        mode invisible
-        tray_output none
-}
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus 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
+
+
 
 ### BODERS ###
 
-hide_edge_borders smart
+hide_edge_borders none
 
 #border width
 default_border pixel 2
@@ -254,9 +291,9 @@ mode "$mode_gaps_outer" {
 
 ### Windows ###
 
-#for_window [class="Qalculate-gtk"] floating enable, move position center, resize set 400 600
-for_window [class="Qalculate-gtk"] floating enable, sticky enable
+#for_window [app_id="qalculate-gtk"] floating enable, move position center, resize set 400 600
+for_window [app_id="qalculate-gtk"] floating enable, sticky enable
 
-for_window [class="Firefox Beta" title="Picture-in-Picture"] floating enable, sticky enable
-for_window [class="firefox-developer-edition" title="Picture-in-Picture"] floating enable, sticky enable
-for_window [class="Firefox" title="Picture-in-Picture"] floating enable, sticky enable
\ No newline at end of file
+for_window [app_id="Firefox Beta" title="Picture-in-Picture"] floating enable, sticky enable
+for_window [app_id="firefox-developer-edition" title="Picture-in-Picture"] floating enable, sticky enable
+for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable
diff --git a/home/.config/waybar/config b/home/.config/waybar/config
new file mode 100644
index 0000000..1ef770c
--- /dev/null
+++ b/home/.config/waybar/config
@@ -0,0 +1,248 @@
+// https://www.github.com/keyitdev/dotfiles
+// Copyright (C) 2022-2026 Keyitdev
+{
+    "layer": "top",
+    "position": "top",
+    "exclusive": true,
+    "height": 36,
+    "spacing": 1,
+    "margin-top": 5,
+    "margin-left":10,
+    "margin-right": 10,
+
+    // big screens/pc
+    "modules-left": ["custom/menu", "sway/workspaces", "sway/mode", "network", "custom/screen_time", "custom/weather", "custom/playerctl" ],
+    "modules-center": ["clock"],
+    "modules-right": ["custom/advanced_cpu", "custom/nvidia", "memory", "disk", "custom/brightness", "pulseaudio", "battery", "custom/microphone", "idle_inhibitor", "tray"],
+
+    // small screens/laptops
+    //"modules-left": ["custom/menu", "sway/workspaces", "sway/mode", "network", "custom/screen_time", "custom/weather", "custom/playerctl" ],
+    //"modules-center": ["clock"],
+    //"modules-right": ["memory", "disk", "backlight", "pulseaudio", "battery", "idle_inhibitor", "tray"],
+
+    "custom/advanced_cpu": {
+        "format": " CPU <span color='#dedede'>{}</span>",
+        "interval": 1,
+        "return-type": "json",
+        "exec": "s-tui -j | jq -c '{text: \"\\((.Util.Avg|tonumber|floor))% \\((.Temp[\"Tctl,0\"]|tonumber|floor))°C \\((.Frequency.Avg|tonumber/1000)|tostring|tonumber|(. * 10 | floor / 10)) GHz\"}'"
+    },
+
+    "custom/brightness": {
+        "format": " <span color='#dedede'>{}%</span>",
+        "exec": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 getvcp 10 | awk -F'= *|,' '/current value/ {print $2}'",
+        "interval": 1,
+        "on-scroll-up": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 + 10",
+        "on-scroll-down": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 - 10",
+        "on-click": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 0",
+        "on-click-middle": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 40",
+        "on-click-right": "ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 100"
+    },
+
+    "custom/menu": {
+        "format": "",
+        "tooltip": false,
+        "on-click": "rofi -show drun -no-default-config -config ~/.config/rofi/main.rasi",
+        "on-click-middle": "swaymsg workspace $(comm -23 <(seq 1 100) <(swaymsg -t get_workspaces | jq '.[].num' | sort -n) | head -n 1)",
+        "on-click-right": "rofi-powermenu"
+    },
+
+    "custom/microphone": {
+        "format": "{text}",
+        "tooltip": false,
+        "interval": 1,
+        "on-click": "~/.config/waybar/microphone.sh toggle",
+        "return-type": "json",
+        "exec": "~/.config/waybar/microphone.sh"
+    },
+
+    "custom/nvidia": {
+        "format": " GPU <span color='#dedede'>{}</span>",
+        "interval": 2,
+        "exec": "nvidia-smi --query-gpu=utilization.gpu,temperature.gpu,memory.used --format=csv,noheader,nounits | awk -F', ' '{print $1\"% \"$2\"°C \"$3\" MiB\"}'"
+    },
+
+    "custom/playerctl": {
+        "format": "{icon}<span color='#dedede'>{text}</span>",
+        "format-icons": {
+            "Playing": " ",
+            "Paused": " "
+        },
+        "max-length": 40,
+        "on-click": "playerctl play-pause",
+        "on-scroll-up": "playerctl next",
+        "on-scroll-down": "playerctl previous",
+        "return-type": "json",
+        "exec": "playerctl -a metadata --format '{\"text\": \"{{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{artist}} - {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F"
+    },
+
+    "custom/screen_time": {
+        "format": "󰍹  <span color='#dedede'>{}</span>",
+        "interval": 1,
+        "exec": "~/.config/waybar/screen_time.sh"
+    },
+
+    "custom/weather": {
+        "format": "{}",
+        "max-length": 25,
+        "tooltip": true,
+        "interval": 300,
+        "exec": "~/.config/waybar/weather.sh"
+    },
+
+    "backlight": {
+        "format": "{icon} <span color='#dedede'>{percent}%</span>",
+        "format-icons": ["", ""],
+        "tooltip-format": "{icon} {percent}%",
+        "on-scroll-up": "brightness_control -s +2",
+        "on-scroll-down": "brightness_control -s -2",
+        "smooth-scrolling-threshold": 1.0
+    },
+
+    "battery": {
+        "format": "{icon} <span color='#dedede'>{capacity}% {power:.1f}W</span>",
+        "format-charging": " <span color='#dedede'>{capacity}%</span>",
+        "format-plugged": " <span color='#dedede'>{capacity}%</span>",
+        "format-alt": "{icon} <span color='#dedede'>{time}</span>",
+        "format-icons": [""],
+        "states": {
+            "good": 95,
+            "warning": 40,
+            "critical": 20
+        },
+        "interval": 2
+    },
+
+    "bluetooth": {
+        "format": " <span color='#dedede'>{status}</span>",
+        "format-disabled": "",
+        "format-connected": " <span color='#dedede'>{num_connections} connected</span>",
+        "tooltip-format": "{controller_alias}\t{controller_address}",
+        "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}",
+        "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}"
+    },
+
+    "clock": {
+        "format": " <span color='#dedede'>{:%a %d %b %H:%M}</span>",
+        "format-alt": " <span color='#dedede'>{:%A %d %B %Y %H:%M:%S}</span>",
+        "tooltip-format": "<span size='20000'><tt>{calendar}</tt></span>",
+        "interval": 1,
+        "calendar": {
+            "mode": "month",
+            "mode-mon-col": 3,
+            "weeks-pos": "",
+            "on-scroll": 1,
+            "on-click-right": "mode",
+            "iso8601": true,
+            "format": {
+                "months": "<span color='#6c90a8'><b>{}</b></span>",
+                "days": "<span color='#dedede'>{}</span>",
+                "weeks": "<span color='#d4a067'><b>W{}</b></span>",
+                "weekdays": "<span color='#999f63'><b>{}</b></span>",
+                "today": "<span color='#cb5760'><b>{}</b></span>"
+            }
+        },
+        "actions": {
+            "on-click-right": "mode",
+            "on-click-forward": "tz_up",
+            "on-click-backward": "tz_down",
+            "on-scroll-up": "shift_up",
+            "on-scroll-down": "shift_down"
+        }
+    },
+
+    "cpu": {
+        "format": " CPU <span color='#dedede'>{usage}% {avg_frequency} Ghz</span>",
+        "format-alt": " <span color='#dedede'>{avg_frequency} Ghz</span>",
+        "tooltip": true,
+        "interval": 1
+    },
+
+    "disk": {
+        "format": " ROM <span color='#dedede'>{percentage_used}%</span>",
+        "format-alt": " ROM <span color='#dedede'>{used}/{total}</span>",
+        "path": "/",
+        "interval": 30
+    },
+
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        },
+        "tooltip": true
+    },
+
+    "memory": {
+        "format": " RAM <span color='#dedede'>{used:.1f} GiB</span>",
+        "format-alt": " RAM <span color='#dedede'>{percentage}%</span>",
+        "interval": 1
+    },
+
+    "network": {
+        "format-wifi": " <span color='#dedede'>{essid}</span>",
+        "format-ethernet": " <span color='#dedede'>{ifname}</span>",
+        "format-linked": " {ifname} <span color='#dedede'>(No IP)</span>",
+        "format-disconnected": " <span color='#dedede'>Offline</span>",
+        "format-alt": " <span color='#dedede'>{ifname}</span>  <span color='#dedede'>{bandwidthDownBits}</span>  <span color='#dedede'>{bandwidthUpBits}</span>",
+        "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
+        "interval": 1
+    },
+
+    "pulseaudio": {
+        "format": "{icon} <span color='#dedede'>{volume}%</span>",
+        "format-bluetooth": " <span color='#dedede'>{volume}%</span>",
+        "format-bluetooth-muted": " <span color='#dedede'>{icon}</span>",
+        "format-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "󰥰",
+            "headset": "",
+            "phone": "",
+            "portable": "󰄝",
+            "car": "󰄋",
+            "default": ["", "", ""]
+        },
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+        "on-click-right": "pactl set-sink-mute @DEFAULT_SINK@ toggle ",
+        "on-scroll-up": "volume_control -s +5 -m 125",
+        "on-scroll-down": "volume_control -s -5 -m 125",
+        "smooth-scrolling-threshold": 1.0
+    },
+
+    "sway/mode": {
+        "format": " <span color='#dedede'>{}</span>"
+    },
+
+    "sway/workspaces": {
+        "disable-scroll": false,
+        "all-outputs": true,
+        "format": "{icon}",
+        "format-icons": {
+            "1": "",
+            "2": "",
+            "3": "",
+            "4": "",
+            "5": "",
+            "6": "",
+            "7": "",
+            "8": "",
+            "9": "",
+            "10": ""
+        },
+        "smooth-scrolling-threshold": 1.0,
+    },
+
+    "temperature": {
+        "format": "{icon} <span color='#dedede'>{temperatureC}°C</span>",
+        "format-icons": [""],
+        "interval": 1,
+        "warning-threshold": 70,
+        "critical-threshold": 90
+    },
+
+    "tray": {
+        "icon-size": 18,
+        "spacing": 5
+    }
+}
\ No newline at end of file
diff --git a/home/.config/waybar/microphone.sh b/home/.config/waybar/microphone.sh
new file mode 100755
index 0000000..c56206b
--- /dev/null
+++ b/home/.config/waybar/microphone.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+mic=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk '{print $2}')
+
+if [ "$1" == "toggle" ]; then
+    pactl set-source-mute @DEFAULT_SOURCE@ toggle
+fi
+
+mic=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk '{print $2}')
+
+if [ "$mic" == "yes" ]; then
+    echo '{"text":"","class":"mic-muted"}'
+else
+    echo '{"text":"","class":"mic-unmuted"}'
+fi
\ No newline at end of file
diff --git a/home/.config/waybar/platform_profile.sh b/home/.config/waybar/platform_profile.sh
new file mode 100644
index 0000000..4072bc3
--- /dev/null
+++ b/home/.config/waybar/platform_profile.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "{\"alt\": \"$(cat /sys/firmware/acpi/platform_profile)\"}"
diff --git a/home/.config/waybar/screen_time.sh b/home/.config/waybar/screen_time.sh
new file mode 100755
index 0000000..f1d1902
--- /dev/null
+++ b/home/.config/waybar/screen_time.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+LOG_FILE="$HOME/.system_stats.json"
+today=$(date +%Y-%m-%d)
+
+if [ ! -f "$LOG_FILE" ]; then
+    echo "0s"
+    exit 0
+fi
+
+total_seconds=$(jq -r ".\"$today\".screen.turned_on_s // 0" "$LOG_FILE")
+
+if [ "$total_seconds" -eq 0 ]; then
+    echo "0s"
+    exit 0
+fi
+
+h=$(( total_seconds / 3600 ))
+m=$(( (total_seconds % 3600) / 60 ))
+s=$(( total_seconds % 60 ))
+
+output=""
+[ "$h" -gt 0 ] && output="${h}h "
+[ "$m" -ge 0 ] && output="${output}${m}m "
+# [ "$s" -gt 0 ] || [ -z "$output" ] && output="${output}${s}s"
+
+echo "$output" | sed 's/ $//'
\ No newline at end of file
diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css
new file mode 100644
index 0000000..ea100c6
--- /dev/null
+++ b/home/.config/waybar/style.css
@@ -0,0 +1,367 @@
+/* Everforest Dark Colors */
+@define-color background #2b3339;
+@define-color background-light #323c41;
+@define-color foreground #d3c6aa;
+@define-color black #3c474d;
+@define-color red #e67e80;
+@define-color green #a7c080;
+@define-color yellow #dbbc7f;
+@define-color blue #7fbbb3;
+@define-color magenta #d699b6;
+@define-color cyan #83c092;
+@define-color white #d3c6aa;
+@define-color orange #e69875;
+
+/* Pastel TTY Colors */
+@define-color background #212121;
+@define-color background-light #3a3a3a;
+@define-color foreground #e0e0e0;
+@define-color black #5a5a5a;
+@define-color red #ff9a9e;
+@define-color green #b5e8a9;
+@define-color yellow #ffe6a7;
+@define-color blue #63a4ff;
+@define-color magenta #dda0dd;
+@define-color cyan #a3e8e8;
+@define-color white #ffffff;
+@define-color orange #ff8952;
+
+/* Gruvbox Dark Colors */
+@define-color background #282828;
+@define-color background-light #3c3836;
+@define-color foreground #ebdbb2;
+@define-color black #32302f;
+@define-color red #cc241d;
+@define-color green #98971a;
+@define-color yellow #d79921;
+@define-color blue #458588;
+@define-color magenta #b16286;
+@define-color cyan #689d6a;
+@define-color white #ebdbb2;
+@define-color orange #d65d0e;
+
+/* Tokyo Night */
+@define-color background #1a1b26;
+@define-color background-light #24283b;
+@define-color foreground #c0caf5;
+@define-color black #15161e;
+@define-color red #f7768e;
+@define-color green #9ece6a;
+@define-color yellow #e0af68;
+@define-color blue #7aa2f7;
+@define-color magenta #bb9af7;
+@define-color cyan #7dcfff;
+@define-color white #a9b1d6;
+@define-color orange #ff9e64;
+
+/* Keyitdev's onedark */
+@define-color background #1b1b25;
+@define-color background-light #282A36;
+@define-color foreground #dedede;
+@define-color black #15161e;
+@define-color red #cb5760;
+@define-color green #999f63;
+@define-color yellow #d4a067;
+@define-color blue #6c90a8;
+@define-color magenta #776690;
+@define-color cyan #528a9b;
+@define-color white #dedede;
+@define-color orange #c87c3e;
+
+/* Module-specific colors */
+@define-color workspaces-color @foreground;
+@define-color workspaces-focused-bg @green;
+@define-color workspaces-focused-fg @green;
+@define-color workspaces-urgent-bg @background;
+@define-color workspaces-urgent-fg @red;
+
+/* Text and border colors for modules */
+@define-color backlight-color @yellow;
+@define-color battery-charging-color @orange;
+@define-color battery-color @orange;
+@define-color battery-critical-color @red;
+@define-color battery-warning-color @yellow;
+@define-color bluetooth-color @yellow;
+@define-color clock-color @red;
+@define-color cpu-color @cyan;
+@define-color disk-color @orange;
+@define-color idle-inhibitor-active-color @red;
+@define-color idle-inhibitor-color @green;
+@define-color memory-color @red;
+@define-color menu-color @yellow;
+@define-color mode-color @orange;
+@define-color network-color @blue;
+@define-color network-ethernet-color @magenta;
+@define-color network-disconnected-color @red;
+@define-color nvidia-color @green;
+@define-color playerctl-color @green;
+@define-color playerctl-paused-color @orange;
+@define-color pulseaudio-color @blue;
+@define-color pulseaudio-muted-color @red;
+@define-color screen_time-color @orange;
+@define-color temperature-color @cyan;
+@define-color temperature-critical-color @red;
+@define-color temperature-warning-color @yellow;
+@define-color tray-color @magenta;
+@define-color weather-color @cyan;
+
+/* Base styling for all modules */
+*{
+    border: none;
+    border-radius: 0;
+    font-family: "Iosevka Nerd Font";
+    font-size: 18px;
+    min-height: 0;
+}
+
+window#waybar {
+    background-color: transparent;
+    color: transparent;
+}
+
+/* Common module styling with border-bottom */
+#backlight,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#custom-advanced_cpu,
+#custom-brightness,
+#custom-nvidia,
+#custom-menu,
+#custom-microphone,
+#custom-playerctl,
+#custom-screen_time,
+#custom-weather,
+#disk,
+#idle_inhibitor,
+#memory,
+#mode,
+#network,
+#pulseaudio,
+#temperature,
+#tray
+{
+    padding: 6px 12px 4px 12px;
+    margin: 0 2px;
+    color: @foreground;
+    border-bottom: 2px solid;
+    background-color: @background;
+    border-radius: 20px;
+}
+
+/* Workspaces styling */
+#workspaces{
+    /* padding: 2px 12px 0px 12px; */
+    padding: 2px 8px 0px 8px;
+    margin: 0 2px;
+    background-color: @background;
+    border-radius: 20px;
+    border-bottom: 2px solid @green;
+}
+
+#workspaces button {
+    /* padding: 0 8px; */
+    padding: 0px;
+    background-color: transparent;
+    color: @workspaces-color;
+    /* margin: 0; */
+    margin: 0 -4px;
+    border-radius: 20px;
+}
+
+#workspaces button:hover {
+    background: @background-light;
+    box-shadow: inherit;
+    
+}
+
+#workspaces button.focused {
+    /* box-shadow: inset 0 -2px @workspaces-focused-fg; */
+    /* border-bottom: 2px solid @workspaces-focused-fg; */
+    color: @workspaces-focused-fg;
+    /* font-weight: 900; */
+}
+
+#workspaces button.urgent {
+    background-color: @workspaces-urgent-bg;
+    color: @workspaces-urgent-fg;
+}
+
+/* Module-specific styling */
+#backlight, #custom-brightness{
+    color: @backlight-color;
+    border-bottom-color: @backlight-color;
+}
+
+#battery {
+    color: @battery-color;
+    border-bottom-color: @battery-color;
+}
+
+#battery.charging, #battery.plugged {
+    color: @battery-charging-color;
+    border-bottom-color: @battery-charging-color;
+}
+
+#battery.critical:not(.charging) {
+    color: @battery-critical-color;
+    border-bottom-color: @battery-critical-color;
+}
+
+#battery.warning:not(.charging) {
+    color: @battery-warning-color;
+    border-bottom-color: @battery-warning-color;
+}
+
+#bluetooth{
+    color: @bluetooth-color;
+    border-bottom-color: @bluetooth-color;
+}
+
+#clock {
+    color: @clock-color;
+    border-bottom-color: @clock-color;
+}
+
+#cpu, #custom-advanced_cpu {
+    color: @cpu-color;
+    border-bottom-color: @cpu-color;
+}
+
+#custom-menu{
+    color: @menu-color;
+    border-bottom-color: @menu-color;
+}
+
+#custom-microphone.mic-muted{
+    color: @red;
+    border-bottom-color: @red;
+}
+
+#custom-microphone.mic-unmuted{
+    color: @green;
+    border-bottom-color: @green;
+}
+
+#custom-nvidia {
+    color: @nvidia-color;
+    border-bottom-color: @nvidia-color;
+}
+
+#custom-playerctl {
+    color: @playerctl-color;
+    border-bottom-color: @playerctl-color;
+}
+
+#custom-playerctl.Paused {
+    color: @playerctl-paused-color;
+    border-bottom-color: @playerctl-paused-color;
+}
+
+#custom-playerctl.Playing {
+    color: @playerctl-color;
+    border-bottom-color: @playerctl-color;
+}
+
+#custom-screen_time{
+    color: @screen_time-color;
+    border-bottom-color: @screen_time-color;
+}
+
+#custom-weather {
+    color: @weather-color;
+    border-bottom-color: @weather-color;
+}
+
+#disk {
+    color: @disk-color;
+    border-bottom-color: @disk-color;
+}
+
+#idle_inhibitor {
+    color: @idle-inhibitor-color;
+    border-bottom-color: @idle-inhibitor-color;
+}
+
+#idle_inhibitor.activated {
+    color: @idle-inhibitor-active-color;
+    border-bottom-color: @idle-inhibitor-active-color;
+}
+
+#memory {
+    color: @memory-color;
+    border-bottom-color: @memory-color;
+}
+
+#mode {
+    color: @mode-color;
+    border-bottom-color: @mode-color;
+}
+
+#mpd {
+    color: @mpd-color;
+    border-bottom-color: @mpd-color;
+}
+
+#network {
+    color: @network-color;
+    border-bottom-color: @network-color;
+}
+
+#network.wifi {
+    color: @network-color;
+    border-bottom-color: @network-color;
+}
+
+#network.ethernet{
+    color: @network-ethernet-color;
+    border-bottom-color: @network-ethernet-color;
+}
+
+#network.disconnected {
+    color: @network-disconnected-color;
+    border-bottom-color: @network-disconnected-color;
+}
+
+#pulseaudio {
+    color: @pulseaudio-color;
+    border-bottom-color: @pulseaudio-color;
+}
+
+#pulseaudio.muted {
+    color: @pulseaudio-muted-color;
+    border-bottom-color: @pulseaudio-muted-color;
+}
+
+#temperature {
+    color: @temperature-color;
+    border-bottom-color: @temperature-color;
+}
+
+#temperature.warning {
+    color: @temperature-warning-color;
+    border-bottom-color: @temperature-warning-color;
+}
+
+#temperature.critical {
+    color: @temperature-critical-color;
+    border-bottom-color: @temperature-critical-color;
+}
+
+#tray {
+    background-color: @background;
+    border-bottom-color: @tray-color;
+    padding: 0 10px;
+    margin: 0 2px;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    color: @red;
+    border-bottom-color: @red;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
\ No newline at end of file
diff --git a/home/.config/waybar/weather.sh b/home/.config/waybar/weather.sh
new file mode 100755
index 0000000..a52251e
--- /dev/null
+++ b/home/.config/waybar/weather.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+weather=$(curl -s "https://wttr.in/?format=%C")
+temp=$(curl -s "https://wttr.in/?format=%t")
+feels_like_time=$(curl -s "https://wttr.in/?format=%f")
+
+if [[ $weather == *"Sunny"* ]]; then icon=""
+elif [[ $weather == *"Clear"* ]]; then icon=""
+
+elif [[ $weather == *"Partly cloudy"* ]]; then icon=""
+elif [[ $weather == *"Cloudy"* ]]; then icon=""
+
+elif [[ $weather == *"Very cloudy"* ]]; then icon=""
+elif [[ $weather == *"Overcast"* ]]; then icon=""
+elif [[ $weather == *"Fog"* ]]; then icon=""
+elif [[ $weather == *"Mist"* ]]; then icon=""
+
+elif [[ $weather == *"Light rain"* ]]; then icon=""
+elif [[ $weather == *"Patchy rain"* ]]; then icon=""
+elif [[ $weather == *"Light drizzle"* ]]; then icon=""
+elif [[ $weather == *"Showers"* ]]; then icon=""
+elif [[ $weather == *"Rain"* ]]; then icon=""
+
+elif [[ $weather == *"Light snow"* ]]; then icon=""
+elif [[ $weather == *"Patchy snow"* ]]; then icon=""
+elif [[ $weather == *"Snow"* ]]; then icon=""
+
+elif [[ $weather == *"Thunder"* ]]; then icon=""
+
+else icon=""
+fi
+
+echo "$icon <span color='#dedede'>$temp ($feels_like_time)</span>"
\ No newline at end of file
diff --git a/home/.xinitrc b/home/.xinitrc
deleted file mode 100644
index 705250c..0000000
--- a/home/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-exec i3
\ No newline at end of file
diff --git a/home/.zshenv b/home/.zshenv
new file mode 100644
index 0000000..5aa7276
--- /dev/null
+++ b/home/.zshenv
@@ -0,0 +1,4 @@
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+   sway-run
+fi
+
diff --git a/home/.zshrc b/home/.zshrc
index 326ecca..daa7765 100755
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -13,10 +13,38 @@ git_info() {
 # enable command output inside prompt
 setopt PROMPT_SUBST
 
+zmodload zsh/datetime
+preexec() {
+  TIMER_START=$EPOCHREALTIME
+}
+
+precmd() {
+  if [[ -n $TIMER_START ]]; then
+    local elapsed=$(printf "%.4f" "$(echo "$EPOCHREALTIME - $TIMER_START" | bc)")
+
+    if (( $(echo "$elapsed > 0.0001" | bc -l) )); then
+      if (( $(echo "$elapsed < 1" | bc -l) )); then
+        CMD_TIME="$(printf '%.2f' "$(echo "$elapsed * 1000" | bc)")ms"
+      else
+        CMD_TIME="$(printf '%.2f' "$elapsed")s"
+      fi
+    else
+      CMD_TIME=""
+    fi
+
+    unset TIMER_START
+  fi
+}
+
 # prompt
-PROMPT='%F{blue}%B%~%b%f$(git_info) [%*]
+# PROMPT='%F{blue}%B%~%b%f$(git_info) [%*]
+# %B%(!.#.$)%b '
+
+PROMPT='%F{green}%B%n@%m%f%b %F{blue}%B%~%b%f$(git_info) [%*]
 %B%(!.#.$)%b '
 
+RPROMPT='%F{yellow}${CMD_TIME}%f'
+
 # completion
 autoload -Uz compinit
 compinit
@@ -47,6 +75,8 @@ bindkey '^[[B' down-line-or-beginning-search
 
 # aliases
 export GPG_TTY=$(tty)
+export TERM=xterm-256color # helps with ssh connections
+export TERMINAL=kitty
 
 # yay
 alias yeet="yay -Rn"
@@ -85,6 +115,7 @@ alias py="python3"
 alias nv="nvim"
 alias ff="fastfetch"
 alias h="history|grep"
+alias sudoo="sudo DISPLAY=$DISPLAY WAYLAND_DISPLAY=$WAYLAND_DISPLAY XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR GTK_THEME=gtk-dark-keyitdev:dark"
 
 alias help="cat ~/.zshrc | less"
 alias battery="upower -i $(upower -e | grep BAT)"
@@ -92,7 +123,8 @@ alias disk_usage="du -sh ./* | sort -hr"
 alias logout="killall -KILL -u $USER"
 
 # common mistakes
+bindkey "^[[3~" delete-char
 alias nemo.="nemo ."
 alias files.="files ."
 alias code.="code ."
-alias kilall="killall"
+alias kilall="killall"
\ No newline at end of file
diff --git a/usr/local/bin/brightness_control b/usr/local/bin/brightness_control
index f70e9c7..6dda1aa 100755
--- a/usr/local/bin/brightness_control
+++ b/usr/local/bin/brightness_control
@@ -4,8 +4,6 @@
 step=+5
 
 video_card=$(ls -1 /sys/class/backlight/)
-cur_brightness=$(cat /sys/class/backlight/"$video_card"/brightness)
-max_brightness=$(cat /sys/class/backlight/"$video_card"/max_brightness)
 
 while getopts s: flag
 do
@@ -13,18 +11,28 @@ do
         s) step=${OPTARG};;
         *) echo "Usage: -s <-value/+value>";;
     esac
-
 done
 
-step=$(echo "$step" | sed 's/+//g')
-step_c=$(( (step*max_brightness)/100 ))
-# step_c=$(echo "scale=2; $step*($max_brightness/100)" | bc -l | sed 's/\..*$//')
-new_brightness=$((cur_brightness + step_c))
+if [ -n "$video_card" ] && [ -d "/sys/class/backlight/$video_card" ]; then
+    step=$(echo "$step" | sed 's/+//g')
+    cur_brightness=$(cat /sys/class/backlight/"$video_card"/brightness)
+    max_brightness=$(cat /sys/class/backlight/"$video_card"/max_brightness)
+
+    step_c=$(( (step*max_brightness)/100 ))
+    # step_c=$(echo "scale=2; $step*($max_brightness/100)" | bc -l | sed 's/\..*$//')
+    new_brightness=$((cur_brightness + step_c))
+
+    if [ "$new_brightness" -le "0" ]; then
+        echo "0" > /sys/class/backlight/"$video_card"/brightness
+    elif [ "$new_brightness" -ge "$max_brightness" ] ; then
+        echo "$max_brightness" > /sys/class/backlight/"$video_card"/brightness
+    else
+        echo "$new_brightness" > /sys/class/backlight/"$video_card"/brightness
+    fi
 
-if [ "$new_brightness" -le "0" ]; then
-    echo "0" > /sys/class/backlight/"$video_card"/brightness
-elif [ "$new_brightness" -ge "$max_brightness" ] ; then
-    echo "$max_brightness" > /sys/class/backlight/"$video_card"/brightness
 else
-    echo "$new_brightness" > /sys/class/backlight/"$video_card"/brightness
-fi
+    sign=$(printf "%s" "$step" | cut -c1)
+    value=$(printf "%s" "$step" | sed 's/^[-+]//')
+
+    ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 setvcp 10 "$sign" "$value"
+fi
\ No newline at end of file
diff --git a/usr/local/bin/brightness_level b/usr/local/bin/brightness_level
index d42dccd..fd87c2a 100755
--- a/usr/local/bin/brightness_level
+++ b/usr/local/bin/brightness_level
@@ -1,14 +1,20 @@
 #!/bin/sh
 
 dir_icons="/usr/local/bin/icons"
+video_card=$(ls -1 /sys/class/backlight/ 2>/dev/null | head -n 1)
 
-max_bri=$(cat /sys/class/backlight/*/max_brightness)
-cur_bri=$(cat /sys/class/backlight/*/brightness)
-
-cur_per=$((cur_bri * 100 / max_bri))
-
-if [ "$cur_per" -ge 50 ]; then
-    dunstify "Screen" "Brightness: $cur_per%" -r 100 -i "$dir_icons"/sun.svg
+if [ -n "$video_card" ]; then
+    max_bri=$(cat /sys/class/backlight/"$video_card"/max_brightness)
+    cur_bri=$(cat /sys/class/backlight/"$video_card"/brightness)
+    cur_per=$((cur_bri * 100 / max_bri))
 else
-    dunstify "Screen" "Brightness: $cur_per%" -r 100 -i "$dir_icons"/moon.svg
+    cur_per=$(ddcutil --disable-dynamic-sleep --noverify --skip-ddc-checks --sleep-multiplier 0.1 --bus 12 getvcp 10 2>/dev/null | sed -n 's/.*current value = *\([0-9]*\).*/\1/p')
+fi
+
+if [ -n "$cur_per" ]; then
+    if [ "$cur_per" -ge 50 ]; then
+        dunstify "Screen" "Brightness: $cur_per%" -r 100 -i "$dir_icons"/sun.svg
+    else
+        dunstify "Screen" "Brightness: $cur_per%" -r 100 -i "$dir_icons"/moon.svg
+    fi
 fi
\ No newline at end of file
diff --git a/usr/local/bin/lock b/usr/local/bin/lock
index 9d080e4..0451ca7 100755
--- a/usr/local/bin/lock
+++ b/usr/local/bin/lock
@@ -5,15 +5,40 @@ green="9ece6a"
 red="db4b4b"
 wallpaper="$HOME/Pictures/wallpapers/background.png"
 
-i3lock -n --force-clock -F -i $wallpaper -e \
---refresh-rate=1 --line-uses-inside --pointer=default --pass-media-keys --pass-volume-keys --pass-screen-keys \
---inside-color="$green" --ring-color="$green" --insidever-color="$green" --ringver-color="$green" --insidewrong-color="$red" --ringwrong-color="$red" \
---keyhl-color="$green" --separator-color="$green" --bshl-color="$green" --color=000000 \
---time-str="%H:%M" --time-size=160 --time-pos="960:300" --time-font="Open sans:style=Bold" --time-color="$font" \
---date-str="%a %d %b" --date-size=45 --date-pos="960:380" --date-font="Open sans" --date-color="$font" \
---verif-text="Verifying" --greeter-text="" --wrong-text="Wrong Password!" --noinput-text="No input" \
---verif-font="Open sans"  --greeter-font="Open sans" --wrong-font="Open sans" \
---verif-size=35 --greeter-size=35 --wrong-size=35 \
---verif-pos="960:540" --greeter-pos="960:600" --wrong-pos="960:540" \
---verif-color="$green" --greeter-color="$font" --wrong-color="$red" \
---bar-indicator --bar-direction=0 --bar-step=10 --bar-max-height=10 --bar-base-width=10 --bar-total-width=1920 --bar-color=00000000 --bar-pos="0:1070"  
+  # --screenshots \
+swaylock \
+  -f \
+  -i $wallpaper \
+  --clock \
+  --timestr="%H:%M" \
+  --datestr="" \
+  --indicator \
+  --indicator-radius=350 \
+  --indicator-thickness=15 \
+  --indicator-y-position=400 \
+  --font="Open sans:style=Bold" \
+  --font-size=200 \
+  --text-color="${font}ff" \
+  --text-clear-color="${font}ff" \
+  --text-wrong-color="${red}ff" \
+  --text-ver-color="${font}ff" \
+  --text-caps-lock-color="${red}ff" \
+  --inside-color="00000000" \
+  --ring-color="00000000" \
+  --line-color="00000000" \
+  --separator-color="00000000" \
+  --inside-clear-color="00000000" \
+  --ring-clear-color="00000000" \
+  --line-clear-color="00000000" \
+  --inside-wrong-color="00000000" \
+  --ring-wrong-color="00000000" \
+  --line-wrong-color="00000000" \
+  --inside-ver-color="00000000" \
+  --ring-ver-color="00000000" \
+  --line-ver-color="00000000" \
+  --inside-caps-lock-color="00000000" \
+  --ring-caps-lock-color="00000000" \
+  --line-caps-lock-color="00000000" \
+  --key-hl-color="${green}ff" \
+  --bs-hl-color="${red}ff"
+  # --effect-blur 2x10
\ No newline at end of file
diff --git a/usr/local/bin/rofi-screenshot b/usr/local/bin/rofi-screenshot
index 02c43e7..973b450 100755
--- a/usr/local/bin/rofi-screenshot
+++ b/usr/local/bin/rofi-screenshot
@@ -8,10 +8,8 @@ get_options() {
   echo "  Full screen screenshot"
   echo "  Selected area video"
   echo "  Full screen video"
-  echo "  Record audio (microphone)"
-  echo "  Record audio (desktop)"
-  echo "  Selected area video with audio (microphone)"
-  echo "  Full screen video with audio (microphone)"
+  echo "  Selected area video with audio"
+  echo "  Full screen video with audio"
   echo "  Stop Recording"
 }
 
@@ -34,17 +32,11 @@ main() {
   '  Full screen video')
     screenshot -vf
     ;;
-  '  Record audio (microphone)')
-    screenshot -am
+  '  Selected area video with audio')
+    screenshot -vaad
     ;;
-  '  Record audio (desktop)')
-    screenshot -ad
-    ;;
-  '  Selected area video with audio (microphone)')
-    screenshot -vaam
-    ;;
-  '  Full screen video with audio (microphone)')
-    screenshot -vfam
+  '  Full screen video with audio')
+    screenshot -vfad
     ;;
   '  Stop Recording')
     screenshot -s
@@ -57,4 +49,4 @@ main() {
 
 main &
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/usr/local/bin/screenshot b/usr/local/bin/screenshot
index 7c2e147..c3a5bca 100755
--- a/usr/local/bin/screenshot
+++ b/usr/local/bin/screenshot
@@ -9,145 +9,187 @@ mkdir -p "$screenshot_directory"
 mkdir -p "$videos_directory"
 mkdir -p "$audio_directory"
 
-# date=$(date '+%d-%m-%Y-%H-%M-%S') #10-08-2025-18-53-58
-date=$(date '+%Y-%m-%d_%H-%M-%S') #2025-08-10_18-53-58
-screen_resolution="$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/')"
-microphone="$(pacmd list-sources | grep -E '^\s+name: .*alsa_input' | cut -c 8- | sed 's/[<,>]//g')"
-desktop="$(pacmd list-sources | grep -E '^\s+name: .*alsa_output' | cut -c 8- | sed 's/[<,>]//g')"
+# date=$(date '+%d-%m-%Y-%H-%M-%S_pc') #10-08-2025-18-53-58
+filename=$(date '+%Y-%m-%d_%H-%M-%S_pc') #2025-08-10_18-53-58
+
+# Detect display server
+if [ -n "$WAYLAND_DISPLAY" ]; then
+    DISPLAY_SERVER="wayland"\
+    # h264_nvenc libx264rgb
+    VIDEO_CODEC="libx264rgb"
+    FRAMERATE=60
+    # microphone="$(pactl list sources | grep -A2 'Name:.*input' | grep 'Name:' | head -1 | awk '{print $2}')"
+    desktop="$(pactl list sources | grep -A2 'Name:.*output' | grep 'Name:' | head -1 | awk '{print $2}')"
+else
+    DISPLAY_SERVER="x11"
+    # yuv420p yuv444p rgba
+    VIDEO_CODEC="yuv444p"
+    FRAMERATE=60
+    screen_resolution="$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/')"
+fi
 
 get_area(){
-    slop="$(slop -n -f '%w,%h,%x,%y')"
-    w=$(echo "$slop" | cut -d ',' -f1)
-    h=$(echo "$slop" | cut -d ',' -f2)
-    x=$(echo "$slop" | cut -d ',' -f3)
-    y=$(echo "$slop" | cut -d ',' -f4)
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        slurp_output="$(slurp)"
+        x=$(echo "$slurp_output" | cut -d' ' -f1 | cut -d',' -f1)
+        y=$(echo "$slurp_output" | cut -d' ' -f1 | cut -d',' -f2)
+        w=$(echo "$slurp_output" | cut -d' ' -f2 | cut -d'x' -f1)
+        h=$(echo "$slurp_output" | cut -d' ' -f2 | cut -d'x' -f2)
+    else
+        slop="$(slop -n -f '%w,%h,%x,%y')"
+        w=$(echo "$slop" | cut -d ',' -f1)
+        h=$(echo "$slop" | cut -d ',' -f2)
+        x=$(echo "$slop" | cut -d ',' -f3)
+        y=$(echo "$slop" | cut -d ',' -f4)
+    fi
+    
     [ $((w%2)) -eq 1 ] && w=$(( w + 1 ))
     [ $((h%2)) -eq 1 ] && h=$(( h + 1 ))
     [ $((x%2)) -eq 1 ] && x=$(( x + 1 ))
     [ $((y%2)) -eq 1 ] && y=$(( y + 1 ))
     wh="${w}x${h}"
+    geometry="${x},${y} ${w}x${h}"
 }
+
+# audio devices (Wayland / PulseAudio)
+microphone="$(pactl list short sources | grep input | head -1 | awk '{print $1}')"
+desktop="$(pactl list short sources | grep output | head -1 | awk '{print $1}')"
+
 screenshot_selected_area(){
-    ffcast -q -g "$(slop)" png "$screenshot_directory/$date.png"
-    xclip -selection clipboard -t image/png "$screenshot_directory/$date.png"
-    notify-send -i "$screenshot_directory/$date.png" "Screenshot" "Area screenshot taken"
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        geometry="$(slurp)"
+        grim -g "$geometry" "$screenshot_directory/$filename.png"
+        wl-copy < "$screenshot_directory/$filename.png"
+    else
+        ffcast -q -g "$(slop)" png "$screenshot_directory/$filename.png"
+        xclip -selection clipboard -t image/png "$screenshot_directory/$filename.png"
+    fi
+        notify-send -i "$screenshot_directory/$filename.png" "Screenshot" "Area screenshot taken"
 }
+
 screenshot_full_screen(){
-    ffcast -q png "$screenshot_directory/$date.png"
-    xclip -selection clipboard -t image/png "$screenshot_directory/$date.png"
-    notify-send -i "$screenshot_directory/$date.png" "Screenshot" "Full screen screenshot taken"
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        grim "$screenshot_directory/$filename.png"
+        wl-copy < "$screenshot_directory/$filename.png"
+    else
+        ffcast -q png "$screenshot_directory/$filename.png"
+        xclip -selection clipboard -t image/png "$screenshot_directory/$filename.png"
+    fi
+    notify-send -i "$screenshot_directory/$filename.png" "Screenshot" "Full screen screenshot taken"
 }
+
 video_selected_area(){
-    get_area
-    ffmpeg -hide_banner -loglevel error -show_region 1 \
-    -f x11grab -video_size "$wh" -framerate 30 -i :0.0+"$x","$y" -pix_fmt yuv420p "$videos_directory/$date.mp4"
-    ffmpeg -i "$videos_directory/$date.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$date.png"
-    notify-send -i "/tmp/$date.png" "Video" "Area video taken"
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        geometry="$(slurp)"
+        wf-recorder -g "$geometry" -c "$VIDEO_CODEC" -r "$FRAMERATE" -f "$videos_directory/$filename.mp4"
+        grim -g "$geometry" -t png "/tmp/$filename.png"
+    else
+        get_area
+        ffmpeg -hide_banner -loglevel error -show_region 1 \
+        -f x11grab -video_size "$wh" -framerate "$FRAMERATE" -i :0.0+"$x","$y" -pix_fmt "$VIDEO_CODEC" "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png"
+    fi
+        notify-send -i "/tmp/$filename.png" "Video" "Area video taken"
 }
+
 video_full_screen(){
-    ffmpeg -hide_banner -loglevel error -show_region 1 \
-    -f x11grab -video_size "$screen_resolution" -framerate 30 -i :0.0 -pix_fmt yuv420p "$videos_directory/$date.mp4"
-    ffmpeg -i "$videos_directory/$date.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$date.png"
-    notify-send -i "/tmp/$date.png" "Video" "Full screen video taken"
-}
-video_full_screen_rgba(){
-    ffmpeg -hide_banner -loglevel error -show_region 1 \
-    -f x11grab -video_size "$screen_resolution" -framerate 30 -i :0.0 -pix_fmt rgba "$videos_directory/$date.mp4"
-    ffmpeg -i "$videos_directory/$date.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$date.png"
-    notify-send -i "/tmp/$date.png" "Video" "Full screen video taken (rgba)"
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        wf-recorder -c "$VIDEO_CODEC" -r "$FRAMERATE" -f "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png" 2>/dev/null
+    else
+        ffmpeg -hide_banner -loglevel error -show_region 1 \
+        -f x11grab -video_size "$screen_resolution" -framerate "$FRAMERATE" -i :0.0 -pix_fmt "$VIDEO_CODEC" "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png"
+    fi
+        notify-send -i "/tmp/$filename.png" "Video" "Full screen video taken"
 }
-audio_microphone(){
-    ffmpeg -f pulse -i "$microphone" -metadata title="$date" "$audio_directory/$date.mp3"
-    notify-send "Audio" "Microphone audio recorded"
-}
-audio_desktop(){
-    ffmpeg -f pulse -i "$desktop" -metadata title="$date" "$audio_directory/$date.mp3"
-    notify-send "Audio" "Desktop audio recorded"
-}
-video_selected_area_audio_microphone(){
-    get_area
-    ffmpeg -hide_banner -loglevel error -show_region 1 \
-    -f x11grab -video_size "$wh" -framerate 30 -i :0.0+"$x","$y" \
-    -f alsa -i default -pix_fmt yuv420p "$videos_directory/$date.mp4"
-    ffmpeg -i "$videos_directory/$date.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$date.png"
-    notify-send -i "/tmp/$date.png" "Video" "Area video with audio taken"
+
+video_selected_area_audio(){
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        geometry="$(slurp)"
+        wf-recorder -g "$geometry" -c "$VIDEO_CODEC" -r "$FRAMERATE" --audio --audio-device "$desktop" -f "$videos_directory/$filename.mp4"
+        grim -g "$geometry" -t png "/tmp/$filename.png"
+    else
+        get_area
+        ffmpeg -hide_banner -loglevel error -show_region 1 \
+        -f x11grab -video_size "$wh" -framerate "$FRAMERATE" -i :0.0+"$x","$y" \
+        -f alsa -i default -pix_fmt "$VIDEO_CODEC" "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png"
+    fi
+        notify-send -i "/tmp/$filename.png" "Video" "Area video with desktop audio taken"
 }
-video_full_screen_audio_microphone(){
-    ffmpeg -hide_banner -loglevel error -show_region 1 \
-    -f x11grab -video_size "$screen_resolution" -framerate 30 -i :0.0 \
-    -f alsa -i default -pix_fmt yuv420p "$videos_directory/$date.mp4"
-    ffmpeg -i "$videos_directory/$date.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$date.png"
-    notify-send -i "/tmp/$date.png" "Video" "Full screen video with audio taken"
+
+video_full_screen_audio(){
+    if [ "$DISPLAY_SERVER" = "wayland" ]; then
+        wf-recorder -c "$VIDEO_CODEC" -r "$FRAMERATE" --audio --audio-device "$desktop" -f "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png" 2>/dev/null
+    else
+        ffmpeg -hide_banner -loglevel error -show_region 1 \
+        -f x11grab -video_size "$screen_resolution" -framerate "$FRAMERATE" -i :0.0 \
+        -f alsa -i default -pix_fmt "$VIDEO_CODEC" "$videos_directory/$filename.mp4"
+        ffmpeg -i "$videos_directory/$filename.mp4" -ss 00:00:01.000 -vframes 1 "/tmp/$filename.png"
+    fi
+        notify-send -i "/tmp/$filename.png" "Video" "Full screen video with desktop audio taken"
 }
+
 stop(){
     pkill -fxn '(/\S+)*ffmpeg\s.*\sx11grab\s.*'
     pkill -fxn '(/\S+)*ffmpeg\s.*\spulse\s.*'
+    pkill -fxn '(/\S+)*wf-recorder\s.*'
+    pkill -fxn '(/\S+)*pw-record\s.*'
     exit 1
 }
+
 help(){
-cat << EOF 
+cat << EOF
+Display server: $DISPLAY_SERVER
 -h | -help | --help
 -s | -stop
 -sa | -screenshot_selected_area
 -sf | -screenshot_full_screen
 -va | -video_selected_area
 -vf | -video_full_screen
--am | -audio_microphone
--ad | -audio_desktop
--vaam | -video_selected_area_audio_microphone
--vfam | -video_full_screen_audio_microphone
+-vaad | -video_selected_area_audio
+-vfad | -video_full_screen_audio
 EOF
 }
+
 main(){
 while [ "$1" != "" ]; do
-    PARAM="$1"
-    case $PARAM in
-    -h | -help | --help)
-        help
-        exit 1
-        ;;
-    -s | -stop)
-        stop
-        exit 1
-        ;;
-    -sa | -screenshot_selected_area)
-        screenshot_selected_area
-        ;;
-    -sf | -screenshot_full_screen)
-        screenshot_full_screen
-        ;;
-    -va | -video_selected_area)
-        video_selected_area
-        ;;
-    -vf | -video_full_screen)
-        video_full_screen
-        ;;
-    -vf_rgba | -video_full_screen_rgba)
-        video_full_screen_rgba
-        ;;
-    -am | -audio_microphone)
-        audio_microphone
-        ;;
-    -ad | -audio_desktop)
-    audio_desktop
-        ;;
-    -vaam | -video_selected_area_audio_microphone)
-        video_selected_area_audio_microphone
-        ;;
-    -vfam | -video_full_screen_audio_microphone)
-        video_full_screen_audio_microphone
-        ;;
-    *)
-        echo "ERROR: unknown parameter \"$PARAM\""
-        help
-        exit 1
-        ;;
+    case "$1" in
+        -h|-help|--help)
+            help
+            exit 0
+            ;;
+        -s|-stop)
+            stop
+            ;;
+        -sa|-screenshot_selected_area)
+            screenshot_selected_area
+            ;;
+        -sf|-screenshot_full_screen)
+            screenshot_full_screen
+            ;;
+        -va|-video_selected_area)
+            video_selected_area
+            ;;
+        -vf|-video_full_screen)
+            video_full_screen
+            ;;
+        -vaad|-video_selected_area_audio)
+            video_selected_area_audio
+            ;;
+        -vfad|-video_full_screen_audio)
+            video_full_screen_audio
+            ;;
+        *)
+            echo "ERROR: unknown parameter $1"
+            help
+            exit 1
+            ;;
     esac
     shift
 done
-# done
-set -e
 }
 
-main "$1" &
-exit 0
\ No newline at end of file
+main "$@"
\ No newline at end of file