diff --git a/README.md b/README.md
index 71d7e47..27b8ce4 100644
--- a/README.md
+++ b/README.md
@@ -162,12 +162,9 @@ Note: `Win` refers to the `Super/Mod` key.
 
 |        Color           |                 Hex code                 |
 | ---------------------- | ---------------------------------------- |
-|  Blue background       | #21222C                                  |
-|  Blue background 2     | #282A36                                  |
-|  Blue background 3     | #343746                                  |
-|  Dark background       | #181a20                                  |
-|  Dark background 2     | #202328                                  |
-|  Dark background 3     | #2d3138                                  |
+|  background            | #21222C                                  |
+|  background 2          | #282A36                                  |
+|  background 3          | #343746                                  |
 |  foreground            | #F8F8F2                                  |
 |  white                 | #FFFFFF                                  |
 |  black                 | #15121C                                  |
diff --git a/config/cava/config b/config/cava/config
new file mode 100644
index 0000000..06aab5a
--- /dev/null
+++ b/config/cava/config
@@ -0,0 +1,165 @@
+## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting.
+
+
+[general]
+
+# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
+; mode = normal
+
+# Accepts only non-negative values.
+framerate = 144
+
+# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
+# new as of 0.6.0 autosens of low values (dynamic range)
+# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
+; autosens = 1
+; overshoot = 20
+
+# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
+# 200 means double height. Accepts only non-negative values.
+; sensitivity = 100
+
+# The number of bars (0-200). 0 sets it to auto (fill up console).
+# Bars' width and space between bars in number of characters.
+; bars = 0
+bar_width = 1
+; bar_spacing = 1
+
+
+# Lower and higher cutoff frequencies for lowest and highest bars
+# the bandwidth of the visualizer.
+# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
+# Cava will automatically increase the higher cutoff if a too low band is specified.
+; lower_cutoff_freq = 50
+; higher_cutoff_freq = 10000
+
+
+# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
+# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
+; sleep_timer = 0
+
+
+[input]
+
+# Audio capturing method. Possible methods are: 'pulse', 'alsa', 'fifo', 'sndio' or 'shmem'
+# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with.
+#
+# All input methods uses the same config variable 'source'
+# to define where it should get the audio.
+#
+# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
+# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
+#
+# For alsa 'source' will be the capture device.
+# For fifo 'source' will be the path to fifo-file.
+# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
+; method = pulse
+; source = auto
+
+; method = alsa
+; source = hw:Loopback,1
+
+; method = fifo
+; source = /tmp/mpd.fifo
+; sample_rate = 44100
+; sample_bits = 16
+
+; method = shmem
+; source = /squeezelite-AA:BB:CC:DD:EE:FF
+
+; method = portaudio
+; source = auto
+
+
+[output]
+
+# Output method. Can be 'ncurses', 'noncurses' or 'raw'.
+# 'noncurses' uses a custom framebuffer technique and draws only changes
+# from frame to frame. 'ncurses' is default if supported
+#
+# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
+# stream of the bar heights that can be used to send to other applications.
+# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
+; method = ncurses
+
+# Visual channels. Can be 'stereo' or 'mono'.
+# 'stereo' mirrors both channels with low frequencies in center.
+# 'mono' outputs left to right lowest to highest frequencies.
+# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
+; channels = stereo
+; mono_option = average
+
+# Raw output target. A fifo will be created if target does not exist.
+; raw_target = /dev/stdout
+
+# Raw data format. Can be 'binary' or 'ascii'.
+; data_format = binary
+
+# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
+; bit_format = 16bit
+
+# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
+; ascii_max_range = 1000
+
+# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
+# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
+; bar_delimiter = 59
+; frame_delimiter = 10
+
+
+
+[color]
+
+# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
+# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires
+# ncurses output method and a terminal that can change color definitions such as Gnome-terminal or rxvt.
+# if supported, ncurses mode will be forced on if user defined colors are used.
+# default is to keep current terminal color
+; background = default
+; foreground = default
+
+# Gradient mode, only hex defined colors (and thereby ncurses mode) are supported,
+# background must also be defined in hex  or remain commented out. 1 = on, 0 = off.
+# You can define as many as 8 different colors. They range from bottom to top of screen
+; gradient = 1
+; gradient_count = 8
+; gradient_color_1 = '#59cc33'
+; gradient_color_2 = '#80cc33'
+; gradient_color_3 = '#a6cc33'
+; gradient_color_4 = '#cccc33'
+; gradient_color_5 = '#cca633'
+; gradient_color_6 = '#cc8033'
+; gradient_color_7 = '#cc5933'
+; gradient_color_8 = '#cc3333'
+
+
+
+[smoothing]
+
+# Percentage value for integral smoothing. Takes values from 0 - 100.
+# Higher values means smoother, but less precise. 0 to disable.
+; integral = 77
+
+# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
+; monstercat = 0
+; waves = 0
+
+# Set gravity percentage for "drop off". Higher values means bars will drop faster.
+# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
+; gravity = 100
+
+
+# In bar height, bars that would have been lower that this will not be drawn.
+; ignore = 0
+
+
+[eq]
+
+# This one is tricky. You can have as much keys as you want.
+# Remember to uncomment more then one key! More keys = more precision.
+# Look at readme.md on github for further explanations and examples.
+; 1 = 1 # bass
+; 2 = 1
+; 3 = 1 # midtone
+; 4 = 1
+; 5 = 1 # treble
diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
index 2536919..992b644 100644
--- a/config/dunst/dunstrc
+++ b/config/dunst/dunstrc
@@ -1,5 +1,5 @@
 # Documentation: https://dunst-project.org/documentation/
-# Config created by Key https://www.github.com/keyitdev/dotfiles
+# Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
 
 [global]
     ### Display ###
diff --git a/config/i3/config b/config/i3/config
index 5ae8366..09a5408 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -96,6 +96,7 @@ bindsym $mod+o exec betterlockscreen -l
 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 &
 
+# move workspaces between monitors
 bindsym $mod+b move workspace to output right
 
 # focus the parent container
@@ -110,9 +111,10 @@ bindsym $mod+d exec "rofi -show drun -no-default-config -config ~/.config/rofi/c
 bindsym $mod+s exec "rofi -show drun -no-default-config -config ~/.config/rofi/compact.rasi"
 bindsym $mod+z exec "rofi -show  -modi ':rofi-bookmarks' -no-default-config -config ~/.config/rofi/compact.rasi"
 bindsym $mod+x exec "theme"
-bindsym Pause exec "rofi-screenshot"
+bindsym $mod+c exec "rofi-screenshot"
 
 # take a screenshot
+bindsym Pause exec screenshot -crtf
 bindsym Print exec screenshot -cstf
 
 # brightness control
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 52b5bb7..f54001b 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,5 +1,5 @@
 # Documentation: https://sw.kovidgoyal.net/kitty/
-# Config created by Key https://www.github.com/keyitdev/dotfiles
+# Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
 
 font_size 11.0
 font_family Roboto mono
diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf
index 88d52d0..319ec3d 100644
--- a/config/mpd/mpd.conf
+++ b/config/mpd/mpd.conf
@@ -1,5 +1,5 @@
 # Documentation: https://mpd.readthedocs.io/en/stable/user.html
-# Config created by Key https://www.github.com/keyitdev/dotfiles
+# Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
 
 music_directory    "~/Music"
 
diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config
index e056624..677d88a 100644
--- a/config/ncmpcpp/config
+++ b/config/ncmpcpp/config
@@ -1,6 +1,6 @@
 ; Documentation: https://wiki.archlinux.org/title/ncmpcpp
 ; Config created by Alexander-Miller https://github.com/Alexander-Miller
-; Config modified by Key https://www.github.com/keyitdev/dotfiles
+; Config modified by Keyitdevitdev https://www.github.com/keyitdev/dotfiles
 mpd_host                              = 127.0.0.1
 mpd_port                              = 6600
 mpd_music_dir                         = ~/Music
diff --git a/config/polybar/polybar-rounded/config.ini b/config/polybar/polybar-rounded/config.ini
index 2fe888b..914e0b2 100644
--- a/config/polybar/polybar-rounded/config.ini
+++ b/config/polybar/polybar-rounded/config.ini
@@ -1,5 +1,5 @@
 ; Documentation: https://github.com/polybar/polybar/wiki
-; Config created by Key https://www.github.com/keyitdev/dotfiles
+; Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
 
 ;; Global WM Settings
 
diff --git a/config/polybar/polybar-square/config.ini b/config/polybar/polybar-square/config.ini
index c749640..79312e1 100644
--- a/config/polybar/polybar-square/config.ini
+++ b/config/polybar/polybar-square/config.ini
@@ -1,5 +1,5 @@
 ; Documentation: https://github.com/polybar/polybar/wiki
-; Config created by Key https://www.github.com/keyitdev/dotfiles
+; Config created by Keyitdev https://www.github.com/keyitdev/dotfiles
 
 ;; Global WM Settings
 
diff --git a/config/rofi/center.rasi b/config/rofi/center.rasi
index bb28588..642a0e4 100644
--- a/config/rofi/center.rasi
+++ b/config/rofi/center.rasi
@@ -1,11 +1,11 @@
 /*
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
- * Config modified by Key https://www.github.com/keyitdev/dotfiles
+ * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
  */
 
 configuration {
-	font:							"Open sans 11";
+	font:							"Roboto mono 11";
     show-icons:                     true;
 	icon-theme: 					"Papirus";
     display-drun: 					"";
@@ -16,7 +16,7 @@ configuration {
 	sidebar-mode: 					false;
 }
 
-@import "~/.config/rofi/colors_center.rasi"
+@import "~/.config/rofi/colors.rasi"
 
 window {
     transparency:                   "real";
@@ -36,7 +36,7 @@ prompt {
 	padding: 						0.30% 1% 0% -0.5%;
 	background-color: 				@al;
 	text-color: 					@fg;
-	font:							"FantasqueSansMono Nerd Font 12";
+	font:							"Roboto mono 11";
 }
 
 entry {
@@ -114,11 +114,13 @@ element selected {
     border-radius:                  0;
     border-color:                  	@bg;
 }
+
 element-icon selected {
     size:                           49px;
     border:                         0px;
     background-color:               @se;
 }
+
 element-text selected {
     background-color:               @se;
     text-color:                     @fg;
diff --git a/config/rofi/colors_center.rasi b/config/rofi/colors.rasi
similarity index 100%
rename from config/rofi/colors_center.rasi
rename to config/rofi/colors.rasi
diff --git a/config/rofi/colors_compact.rasi b/config/rofi/colors_compact.rasi
deleted file mode 100644
index 058bc43..0000000
--- a/config/rofi/colors_compact.rasi
+++ /dev/null
@@ -1,9 +0,0 @@
-/* colors */
-
-* {
-  al:  #00000000;
-  bg:  #21222c;
-  se:  #282A36;
-  fg:  #F8F8F2;
-  ac:  #282A36;
-}
\ No newline at end of file
diff --git a/config/rofi/colors_sidebar.rasi b/config/rofi/colors_sidebar.rasi
deleted file mode 100644
index 058bc43..0000000
--- a/config/rofi/colors_sidebar.rasi
+++ /dev/null
@@ -1,9 +0,0 @@
-/* colors */
-
-* {
-  al:  #00000000;
-  bg:  #21222c;
-  se:  #282A36;
-  fg:  #F8F8F2;
-  ac:  #282A36;
-}
\ No newline at end of file
diff --git a/config/rofi/compact.rasi b/config/rofi/compact.rasi
index b6d75a0..7897cd0 100644
--- a/config/rofi/compact.rasi
+++ b/config/rofi/compact.rasi
@@ -1,11 +1,11 @@
 /*
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
- * Config modified by Key https://www.github.com/keyitdev/dotfiles
+ * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
  */
  
 configuration {
-	font:							"Open sans 11";
+	font:							"Roboto mono 11";
     show-icons:                     true;
 	icon-theme: 					"Papirus";
     display-drun: 					"";
@@ -16,7 +16,7 @@ configuration {
 	sidebar-mode: 					false;
 }
 
-@import "~/.config/rofi/colors_center.rasi"
+@import "~/.config/rofi/colors.rasi"
 
 window {
     transparency:                   "real";
@@ -36,7 +36,7 @@ prompt {
 	padding: 						0.30% 1% 0% -0.5%;
 	background-color: 				@al;
 	text-color: 					@fg;
-	font:							"FantasqueSansMono Nerd Font 12";
+	font:							"Roboto mono 11";
 }
 
 entry {
@@ -111,11 +111,13 @@ element selected {
     border-radius:                  0;
     border-color:                  	@bg;
 }
+
 element-icon selected {
     size:                           49px;
     border:                         0px;
     background-color:               @se;
 }
+
 element-text selected {
     background-color:               @se;
     text-color:                     @fg;
diff --git a/config/rofi/compact_without_icons.rasi b/config/rofi/compact_without_icons.rasi
index bb19f5e..8aafe8e 100644
--- a/config/rofi/compact_without_icons.rasi
+++ b/config/rofi/compact_without_icons.rasi
@@ -1,11 +1,11 @@
 /*
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
- * Config modified by Key https://www.github.com/keyitdev/dotfiles
+ * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
  */
  
 configuration {
-	font:							"Open sans 11";
+	font:							"Roboto mono 11";
     show-icons:                     false;
 	icon-theme: 					"Papirus";
     display-drun: 					"";
@@ -16,7 +16,7 @@ configuration {
 	sidebar-mode: 					false;
 }
 
-@import "~/.config/rofi/colors_center.rasi"
+@import "~/.config/rofi/colors.rasi"
 
 window {
     transparency:                   "real";
@@ -36,7 +36,7 @@ prompt {
 	padding: 						0.30% 1% 0% -0.5%;
 	background-color: 				@al;
 	text-color: 					@fg;
-	font:							"FantasqueSansMono Nerd Font 12";
+	font:							"Roboto mono 11";
 }
 
 entry {
@@ -111,11 +111,13 @@ element selected {
     border-radius:                  0;
     border-color:                  	@bg;
 }
+
 element-icon selected {
     size:                           49px;
     border:                         0px;
     background-color:               @se;
 }
+
 element-text selected {
     background-color:               @se;
     text-color:                     @fg;
diff --git a/config/rofi/sidebar.rasi b/config/rofi/sidebar.rasi
index 4577095..afb4292 100644
--- a/config/rofi/sidebar.rasi
+++ b/config/rofi/sidebar.rasi
@@ -1,11 +1,11 @@
 /*
  * Documentation: https://github.com/davatorium/rofi/wiki
  * Config created by Aditya Shakya https://github.com/adi1090x
- * Config modified by Key https://www.github.com/keyitdev/dotfiles
+ * Config modified by Keyitdev https://www.github.com/keyitdev/dotfiles
  */
 
 configuration {
-	font:							"Open sans 11";
+	font:							"Roboto mono 11";
     show-icons:                     true;
 	icon-theme: 					"Papirus";
     display-drun: 					"";
@@ -16,7 +16,7 @@ configuration {
 	sidebar-mode: 					false;
 }
 
-@import "~/.config/rofi/colors_sidebar.rasi"
+@import "~/.config/rofi/colors.rasi"
 
 window {
     transparency:                   "real";
@@ -37,7 +37,7 @@ prompt {
 	padding: 						0.30% 1% 0% -0.5%;
 	background-color: 				@al;
 	text-color: 					@fg;
-    font:							"Open sans 11";
+    font:							"Roboto mono 11";
 }
 
 entry {
@@ -115,11 +115,13 @@ element selected {
     border-radius:                  0;
     border-color:                  	@bg;
 }
+
 element-icon selected {
     size:                           49px;
     border:                         0px;
     background-color:               @se;
 }
+
 element-text selected {
     background-color:               @se;
     text-color:                     @fg;
diff --git a/config/vsc/settings.json b/config/vsc/settings.json
index bb798b2..c9a7e01 100644
--- a/config/vsc/settings.json
+++ b/config/vsc/settings.json
@@ -1,5 +1,5 @@
 {
-    "editor.fontFamily": "Source Code Pro",
+    "editor.fontFamily": "Roboto mono",
     "workbench.colorTheme": "One Dark Pro Darker",
     "window.menuBarVisibility": "toggle",
     "terminal.integrated.tabs.enabled": true,
diff --git a/config/vsc/zhuangtongfa.Material-theme-3.13.4.vsix b/config/vsc/zhuangtongfa.Material-theme-3.13.4.vsix
deleted file mode 100644
index 9ef0524..0000000
Binary files a/config/vsc/zhuangtongfa.Material-theme-3.13.4.vsix and /dev/null differ
diff --git a/fonts/RobotoMono-Bold.ttf b/fonts/RobotoMono-Bold.ttf
new file mode 100644
index 0000000..900fce6
Binary files /dev/null and b/fonts/RobotoMono-Bold.ttf differ
diff --git a/fonts/RobotoMono-BoldItalic.ttf b/fonts/RobotoMono-BoldItalic.ttf
new file mode 100644
index 0000000..4bfe29a
Binary files /dev/null and b/fonts/RobotoMono-BoldItalic.ttf differ
diff --git a/fonts/RobotoMono-ExtraLight.ttf b/fonts/RobotoMono-ExtraLight.ttf
new file mode 100644
index 0000000..d535884
Binary files /dev/null and b/fonts/RobotoMono-ExtraLight.ttf differ
diff --git a/fonts/RobotoMono-ExtraLightItalic.ttf b/fonts/RobotoMono-ExtraLightItalic.ttf
new file mode 100644
index 0000000..b28960a
Binary files /dev/null and b/fonts/RobotoMono-ExtraLightItalic.ttf differ
diff --git a/fonts/RobotoMono-Italic.ttf b/fonts/RobotoMono-Italic.ttf
new file mode 100644
index 0000000..4ee4dc4
Binary files /dev/null and b/fonts/RobotoMono-Italic.ttf differ
diff --git a/fonts/RobotoMono-Light.ttf b/fonts/RobotoMono-Light.ttf
new file mode 100644
index 0000000..276af4c
Binary files /dev/null and b/fonts/RobotoMono-Light.ttf differ
diff --git a/fonts/RobotoMono-LightItalic.ttf b/fonts/RobotoMono-LightItalic.ttf
new file mode 100644
index 0000000..a2801c2
Binary files /dev/null and b/fonts/RobotoMono-LightItalic.ttf differ
diff --git a/fonts/RobotoMono-Medium.ttf b/fonts/RobotoMono-Medium.ttf
new file mode 100644
index 0000000..8461be7
Binary files /dev/null and b/fonts/RobotoMono-Medium.ttf differ
diff --git a/fonts/RobotoMono-MediumItalic.ttf b/fonts/RobotoMono-MediumItalic.ttf
new file mode 100644
index 0000000..a3bfaa1
Binary files /dev/null and b/fonts/RobotoMono-MediumItalic.ttf differ
diff --git a/fonts/RobotoMono-Regular.ttf b/fonts/RobotoMono-Regular.ttf
new file mode 100644
index 0000000..7c4ce36
Binary files /dev/null and b/fonts/RobotoMono-Regular.ttf differ
diff --git a/fonts/RobotoMono-SemiBold.ttf b/fonts/RobotoMono-SemiBold.ttf
new file mode 100644
index 0000000..15ee6c6
Binary files /dev/null and b/fonts/RobotoMono-SemiBold.ttf differ
diff --git a/fonts/RobotoMono-SemiBoldItalic.ttf b/fonts/RobotoMono-SemiBoldItalic.ttf
new file mode 100644
index 0000000..8e21497
Binary files /dev/null and b/fonts/RobotoMono-SemiBoldItalic.ttf differ
diff --git a/fonts/RobotoMono-Thin.ttf b/fonts/RobotoMono-Thin.ttf
new file mode 100644
index 0000000..ee8a3fd
Binary files /dev/null and b/fonts/RobotoMono-Thin.ttf differ
diff --git a/fonts/RobotoMono-ThinItalic.ttf b/fonts/RobotoMono-ThinItalic.ttf
new file mode 100644
index 0000000..40b01e4
Binary files /dev/null and b/fonts/RobotoMono-ThinItalic.ttf differ
diff --git a/scripts/battery b/scripts/battery
index 9e26268..22481c3 100755
--- a/scripts/battery
+++ b/scripts/battery
@@ -6,13 +6,13 @@ for pid in $(pidof -x battery); do
     fi
 done
 
-DIR="/usr/local/bin/icons"
+DIR_ICONS="/usr/local/bin/icons"
 
 # Notify when below this percentage
-warning_level=15
+WARNING_LEVEL=15
 
 # How often to check battery status, in minutes
-check_interval=1
+CHECK_INTERVAL=1
 
 while true; do
   battery_level=$(acpi -b \
@@ -21,15 +21,15 @@ while true; do
   charging=$(acpi -b | grep -c "Charging")
 
   # When battery is low, and not already charging
-  if [ $battery_level -lt $warning_level ] &&
+  if [ $battery_level -lt $WARNING_LEVEL ] &&
      [ $charging -eq 0 ]
   then
     dunstify -a "Battery" \
         "Low battery: ${battery_level}%" \
         "Battery is running low" \
         -r 100 \
-        -i $DIR/battery.svg
+        -i $DIR_ICONS/battery.svg
   fi
 
-  sleep ${check_interval}m
+  sleep ${CHECK_INTERVAL}m
 done
diff --git a/scripts/mute b/scripts/mute
index 1db1b97..a5e7698 100755
--- a/scripts/mute
+++ b/scripts/mute
@@ -4,7 +4,7 @@ DIR="/usr/local/bin/icons"
 
 CUR_VOL=$(pactl list sinks | grep '^[[:space:]]Volume:' | \
     head -n $(( $SINK + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,')
-MUTE=$(pactl list sinks | grep Mute | sed 's/.*Mute: //g')
+MUTE=$(pactl list sinks | grep Mute | sed 's/.*Mute: //g' | sed 1q)
 affirmative="yes"
 negative="no"
 
diff --git a/scripts/rofi-screenshot b/scripts/rofi-screenshot
index 1a3a75b..843aab6 100755
--- a/scripts/rofi-screenshot
+++ b/scripts/rofi-screenshot
@@ -22,15 +22,15 @@ get_options() {
 main() {
 
   # Get choice from rofi
-  choice=$( (get_options) | rofi -dmenu -i -fuzzy -p "" -theme "$THEME")
+  CHOICE=$( (get_options) | rofi -dmenu -i -fuzzy -p "" -theme "$THEME")
 
   # If user has not picked anything, exit
-  if [[ -z "${choice// /}" ]]; then
+  if [[ -z "${CHOICE// /}" ]]; then
     exit 1
   fi
 
   # run the selected command
-  case $choice in
+  case $CHOICE in
   '    Capture Region (without saving)')
     screenshot -crtc
     ;;
diff --git a/scripts/screenshot b/scripts/screenshot
index 08458e6..2a1426d 100755
--- a/scripts/screenshot
+++ b/scripts/screenshot
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 # Screenshot directory
-screenshot_directory="$HOME/Pictures/screenshots/rofi"
-videos_directory="$HOME/Videos/rofi"
-audio_directory="$HOME/Music/rofi"
+SCREENSHOT_DIRECTORY="$HOME/Pictures/screenshots"
+VIDEOS_DIRECTORY="$HOME/Videos"
+AUDIO_DIRECTORY="$HOME/Music"
 
 # set ffmpeg defaults
 ffmpeg() {
@@ -36,10 +36,10 @@ crtc() {
 # capture region to file and clipboard
 crtf() {
     notify-send "Screenshot" "Select a region to capture"
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
-    ffcast -q $(slop -n -f '-g %g ') png "$screenshot_directory/$dt.png"
-    xclip -selection clipboard -t image/png "$screenshot_directory/$dt.png"
-    notify-send "Screenshot" "Region saved to $screenshot_directory"
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
+    ffcast -q $(slop -n -f '-g %g ') png "$SCREENSHOT_DIRECTORY/$DT.png"
+    xclip -selection clipboard -t image/png "$SCREENSHOT_DIRECTORY/$DT.png"
+    notify-send "Screenshot" "Region saved to $SCREENSHOT_DIRECTORY"
 }
 
 # capture screenshot to clipboard
@@ -52,92 +52,92 @@ cstc() {
 
 # capture screenshot to file and clipboard
 cstf() {
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
-    ffcast -q png "$screenshot_directory/$dt.png"
-    xclip -selection clipboard -t image/png "$screenshot_directory/$dt.png"
-    notify-send "Screenshot" "Screenshot saved to $screenshot_directory"
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
+    ffcast -q png "$SCREENSHOT_DIRECTORY/$DT.png"
+    xclip -selection clipboard -t image/png "$SCREENSHOT_DIRECTORY/$DT.png"
+    notify-send "Screenshot" "Screenshot saved to $SCREENSHOT_DIRECTORY"
 }
 
 # record region (GIF)
 rrg() {
     notify-send "Screenshot" "Select a region to record"
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     ffcast -q $(slop -n -f '-g %g ' && countdown) rec /tmp/screenshot_gif.mp4
     notify-send "Screenshot" "Converting to gif... (this can take a while)"
-    video_to_gif /tmp/screenshot_gif.mp4 "$screenshot_directory/$dt.gif"
+    video_to_gif /tmp/screenshot_gif.mp4 "$SCREENSHOT_DIRECTORY/$DT.gif"
     rm /tmp/screenshot_gif.mp4
-    notify-send "Screenshot" "Recording saved to $screenshot_directory"
+    notify-send "Screenshot" "Recording saved to $SCREENSHOT_DIRECTORY"
 }
 
 # record screen (GIF)
 rsg() {
     countdown
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     ffcast -q rec /tmp/screenshot_gif.mp4
     notify-send "Screenshot" "Converting to gif... (this can take a while)"
-    video_to_gif /tmp/screenshot_gif.mp4 "$screenshot_directory/$dt.gif"
+    video_to_gif /tmp/screenshot_gif.mp4 "$SCREENSHOT_DIRECTORY/$DT.gif"
     rm /tmp/screenshot_gif.mp4
-    notify-send "Screenshot" "Recording saved to $screenshot_directory"
+    notify-send "Screenshot" "Recording saved to $SCREENSHOT_DIRECTORY"
 }
 
 # record region (mp4)
 rrv() {
     notify-send "Screenshot" "Select a region to record"
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
-    ffcast -q $(slop -n -f '-g %g ' && countdown) rec "$videos_directory/$dt.mp4"
-    notify-send "Screenshot" "Recording saved to $videos_directory"
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
+    ffcast -q $(slop -n -f '-g %g ' && countdown) rec "$VIDEOS_DIRECTORY/$DT.mp4"
+    notify-send "Screenshot" "Recording saved to $VIDEOS_DIRECTORY"
 }
 
 # record screen (mp4)
 rsv() {
     countdown
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
-    ffcast -q rec "$videos_directory/$dt.mp4"
-    notify-send "Screenshot" "Recording saved to $videos_directory"
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
+    ffcast -q rec "$VIDEOS_DIRECTORY/$DT.mp4"
+    notify-send "Screenshot" "Recording saved to $VIDEOS_DIRECTORY"
 }
 
 # record screen (mp4) with audio virt
 rrav() {
     notify-send "Screenshot" "Select a region to record"
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     ffcast -q $(slop -n -f '-g %g ' && countdown) ffmpeg \
         -hide_banner \
         -loglevel error \
         -f x11grab -show_region 1 -framerate 30 -video_size %wx%h -i :0.0+%x,%y \
-        -f pulse -i alsa_output.pci-0000_00_1f.3.analog-stereo.monitor -ac 1 "$videos_directory/$dt.mp4"
-    notify-send "Screenshot" "Recording saved to $videos_directory"
+        -f pulse -i alsa_output.pci-0000_00_1f.3.analog-stereo.monitor -ac 1 "$VIDEOS_DIRECTORY/$DT.mp4"
+    notify-send "Screenshot" "Recording saved to $VIDEOS_DIRECTORY"
 }
 
 # record screen (mp4) with mic audio
 rrmv() {
     notify-send "Screenshot" "Select a region to record"
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     ffcast -q $(slop -n -f '-g %g ' && countdown) ffmpeg \
         -hide_banner \
         -loglevel error \
         -f x11grab -show_region 1 -framerate 30 -video_size %wx%h -i :0.0+%x,%y \
-        -f pulse -i alsa_input.pci-0000_00_1f.3.analog-stereo -ac 1 "$videos_directory/$dt.mp4"
-    notify-send "Screenshot" "Recording saved to $videos_directory"
+        -f pulse -i alsa_input.pci-0000_00_1f.3.analog-stereo -ac 1 "$VIDEOS_DIRECTORY/$DT.mp4"
+    notify-send "Screenshot" "Recording saved to $VIDEOS_DIRECTORY"
 }
 
 # record audio virt
 rav() {
     notify-send "Screenshot" "Starting audio recording." -i sound-recorder
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     'ffmpeg' \
         -loglevel error \
-        -f pulse -i alsa_output.pci-0000_00_1f.3.analog-stereo.monitor -ac 1 "$audio_directory/$dt.mp3"
-    notify-send "Screenshot" "Audio saved to $audio_directory" -i sound-recorder
+        -f pulse -i alsa_output.pci-0000_00_1f.3.analog-stereo.monitor -ac 1 "$AUDIO_DIRECTORY/$DT.mp3"
+    notify-send "Screenshot" "Audio saved to $AUDIO_DIRECTORY" -i sound-recorder
 }
 
 # record audio mic
 ram() {
     notify-send "Screenshot" "Starting audio recording." -i sound-recorder
-    dt=$(date '+%d-%m-%Y %H:%M:%S')
+    DT=$(date '+%d-%m-%Y %H:%M:%S')
     'ffmpeg' \
         -loglevel error \
-        -f pulse -i alsa_input.pci-0000_00_1f.3.analog-stereo -ac 1 "$audio_directory/$dt.mp3"
-    notify-send "Screenshot" "Audio saved to $audio_directory" -i sound-recorder
+        -f pulse -i alsa_input.pci-0000_00_1f.3.analog-stereo -ac 1 "$AUDIO_DIRECTORY/$DT.mp3"
+    notify-send "Screenshot" "Audio saved to $AUDIO_DIRECTORY" -i sound-recorder
 }
 
 check_deps() {
@@ -156,7 +156,7 @@ usage() {
     echo -crtc
     echo "    Capture region to clipboard."
     echo -crtf
-    echo "    Capture screen to file and clipboard"
+    echo "    Capture region to file and clipboard"
     echo -cstc
     echo "    Capture screen to clipboard."
     echo -cstf
diff --git a/scripts/theme b/scripts/theme
index e71b50f..b7ce983 100755
--- a/scripts/theme
+++ b/scripts/theme
@@ -5,11 +5,6 @@ DIR_THEME="$HOME/.config/rofi/compact_without_icons.rasi"
 
 DIR="/usr/local/bin/themes"
 
-get_options_theme() {
-  echo "blue"
-  echo "dark"
-}
-
 get_options_theme_polybar() {
   echo "polybar-square"
   echo "polybar-rounded"
@@ -17,21 +12,7 @@ get_options_theme_polybar() {
 
 main() {
 
-  # Get THEME from rofi
-  THEME=$( (get_options_theme) | rofi -dmenu -i -fuzzy -p "" -theme "$DIR_THEME")
-
-  # If user has not picked anything, exit
-  if [[ -z "${THEME// /}" ]]; then
-    exit 1
-  fi
-
-  cp -f $DIR/$THEME/kitty/kitty.conf ~/.config/kitty/
-  cp -f $DIR/$THEME/rofi/* ~/.config/rofi/
-  cp -f $DIR/$THEME/vsc/* ~/.config/Code\ -\ OSS/User
-  cp -f $DIR/$THEME/vsc/* ~/.config/Code/User
-  cp -f $DIR/$THEME/polybar/* ~/.config/polybar
-  cp -f $DIR/$THEME/i3/* ~/.config/i3
-  cp -f $DIR/$THEME/dunst/* ~/.config/dunst
+  # Get THEME_POLYBAR from rofi
   THEME_POLYBAR=$( (get_options_theme_polybar) | rofi -dmenu -i -fuzzy -p "" -theme "$DIR_THEME")
 
     # If user has not picked anything, exit
diff --git a/scripts/volume b/scripts/volume
index fd70f0b..25b8079 100755
--- a/scripts/volume
+++ b/scripts/volume
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DIR="/usr/local/bin/icons"
+DIR_ICONS="/usr/local/bin/icons"
 
 CUR_VOL=$(pactl list sinks | grep '^[[:space:]]Volume:' | \
     head -n $(( $SINK + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,')
@@ -13,19 +13,19 @@ if [ $CUR_VOL -le $VOL_QUIET ]; then
     "Volume" \
     "Current volume is $CUR_VOL%" \
     -r 100 \
-    -i $DIR/volume.svg
+    -i $DIR_ICONS/volume.svg
     fi
 if [ $CUR_VOL -gt $VOL_QUIET ] && [ $CUR_VOL -le $VOL_LOUD ]; then
     dunstify -a "Volume" \
     "Volume" \
     "Current volume is $CUR_VOL%" \
     -r 100 \
-    -i $DIR/volume-1.svg
+    -i $DIR_ICONS/volume-1.svg
     fi
 if [ $CUR_VOL -gt $VOL_LOUD ]; then
     dunstify -a "Volume" \
     "Volume" \
     "Current volume is $CUR_VOL%" \
     -r 100 \
-    -i $DIR/volume-2.svg
+    -i $DIR_ICONS/volume-2.svg
 fi
\ No newline at end of file
diff --git a/wallpapers/current_blue_other_better.png b/wallpapers/current_blue_other_better.png
new file mode 100644
index 0000000..13e4758
Binary files /dev/null and b/wallpapers/current_blue_other_better.png differ
diff --git a/wallpapers/1.png b/wallpapers/lockscreen.png
similarity index 100%
rename from wallpapers/1.png
rename to wallpapers/lockscreen.png