diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..e14861c
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1,9 @@
+Xft.dpi: 115
+
+! These might also be useful depending on your monitor and personal preference:
+Xft.autohint: 0
+Xft.lcdfilter: lcddefault
+Xft.hintstyle: hintfull
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb
diff --git a/.basescripts/dwmblocks/caffeine.sh b/.basescripts/dwmblocks/caffeine.sh
index 684429e..a11b47e 100755
--- a/.basescripts/dwmblocks/caffeine.sh
+++ b/.basescripts/dwmblocks/caffeine.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-state="$(xset q | grep "DPMS is" | awk '{print $3}')"
-
-if [ "$state" = "Enabled" ]; then
+if [ -f "/tmp/caffeine" ]; then
     echo "[*]/"
 else
     echo "[ ]/"
diff --git a/.basescripts/dwmblocks/keyboard_layout.sh b/.basescripts/dwmblocks/keyboard_layout.sh
new file mode 100755
index 0000000..152d8c7
--- /dev/null
+++ b/.basescripts/dwmblocks/keyboard_layout.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "$(xkb-switch)"
diff --git a/.basescripts/utilities/nohup.out b/.basescripts/utilities/nohup.out
deleted file mode 100644
index ac5da52..0000000
--- a/.basescripts/utilities/nohup.out
+++ /dev/null
@@ -1,118 +0,0 @@
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
-read error: Bad file descriptor
diff --git a/.xinitrc b/.xinitrc
index 8f531b9..aceeb01 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,17 +1,15 @@
 #!/bin/sh
 
 xset s blank
-xset s 300 # blank display
-xset dpms 0 360 420
+xset s 900 # blank display
+xset dpms 0 960 1020
 
-# xrandr --output "$(xrandr | grep " connected" | cut -d " " -f1)" --set "TearFree" on # NOTE: We now use /etc/X11/xorg.conf.d
-#xrandr --dpi 200 # we use .Xresources instead
 xset r rate 220 40 # set faster key repeat rate
 xset m 0 0 # disable mouse acceleration
 
-setxkbmap -layout us,ru -option grp:alt_shift_toggle
+setxkbmap -layout us,ru # we also set /etc/default/keyboard to reapply layouts
 
-xrdb -merge ~/.Xresources # apply
+xrdb -merge ~/.Xresources # apply dpi
 
 pipewire &
 wireplumber &
@@ -19,6 +17,7 @@ sleep 1
 pipewire-pulse &
 
 dwmblocks &
+
 caffeine &
 
 ~/.basescripts/utilities/sync_clipboards.sh &
diff --git a/link.sh b/link.sh
index bc9cd09..9235dce 100755
--- a/link.sh
+++ b/link.sh
@@ -3,6 +3,7 @@
 dotfiles="$HOME/dotfiles"
 
 # Start linking
+ln -s "$dotfiles/.Xresources" "$HOME/"
 ln -s "$dotfiles/.xinitrc" "$HOME/"
 ln -s "$dotfiles/.basescripts" "$HOME/"
 ln -s "$dotfiles/.bashrc" "$HOME/"