diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 0ba2144..72d9c8e 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -6,6 +6,7 @@
         <prefer>
             <family>Twemoji</family>
             <family>Font Awesome 6 Pro Regular</family>
+            <family>Liberation Serif</family>
             <family>Times New Roman</family>
             <family>DejaVu Serif</family>
         </prefer>
diff --git a/.config/sway/config b/.config/sway/config
index f039ef4..fbc613c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,4 +1,4 @@
-#
+
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
 # Read `man 5 sway` for a complete reference.
@@ -27,7 +27,7 @@ exec --no-startup-id thunderbird
 assign [app_id="thunderbird"] workspace number 9
 assign [app_id="Element"] workspace number 9
 
-workspace 1 output DP-1
+workspace 1 output DP-3
 workspace 9 output eDP-1
 
 for_window [app_id="scratch_term"] move scratchpad, resize set 960 640
@@ -48,15 +48,19 @@ exec_always {
 
 # swaymsg -t get_outputs
 output eDP-1 resolution 3840x2400 position 2133,0
-output DP-1 resolution 2560x1440 position 0,0 scale 1.2
+output DP-3 resolution 2560x1440 position 0,0 scale 1.2
 #output eDP-1 resolution 3840x2400 position 1920,0
-#output DP-1 resolution 1920x1080 position 0,0
+#output DP-3 resolution 1920x1080 position 0,0
 
 input "type:keyboard" {
     xkb_layout uscustom
     xkb_options compose:menu,caps:escape
 }
 
+input "type:touchpad" {
+    tap enable
+}
+
 # Idle configuration
 exec swayidle -w \
     timeout 300 'swaylock -f -c 14171d' \
@@ -177,7 +181,7 @@ client.urgent            #cc5c5c #a63a3a #ffffff #cc5c5c   #a63a3a
 bar swaybar_command waybar
 
 # SwayFX
-shadows on
+shadows enable
 shadow_blur_radius 15
 shadow_color #14171dff
 blur enable
diff --git a/.config/waybar/config b/.config/waybar/config
index dd0fbff..6e175f0 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -9,12 +9,14 @@
     "modules-right": [
         "custom/cmus",
         "custom/newsboat",
+        "wireplumber",
+        "backlight",
         "cpu",
         "memory",
         "temperature",
         "battery",
         "clock",
-        "tray"
+        "tray",
     ],
     "sway/workspaces": {
         "disable-scroll": true,
@@ -52,6 +54,15 @@
         "format-warning": " {capacity}%",
         "format-critical": " {capacity}%"
     },
+    "wireplumber": {
+        "format": " {volume}",
+        "format-muted": " mute",
+        "on-click": "pavucontrol",
+        "ignored-sinks": ["Easy Effects Sink"]
+    },
+    "backlight": {
+        "format": " {percent}%"
+    },
     "custom/cmus": {
         "return-type": "json",
         "exec": "$HOME/.config/waybar/custom_cmus.lua 2> /dev/null"
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 7dd7291..2509714 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -62,6 +62,7 @@ button {
 #backlight,
 #network,
 #pulseaudio,
+#wireplumber,
 #custom-media,
 #tray,
 #mode,
@@ -69,6 +70,7 @@ button {
 #scratchpad,
 #custom-cmus,
 #custom-newsboat,
+#custom-unixtime,
 #mpd {
     padding: 0 10px;
     border-right: 1px solid #4d4754;
@@ -90,6 +92,17 @@ button {
     margin: 0 4px;
 }
 
+#wireplumber {
+    color: #97bd5e;
+}
+
+#wireplumber.muted {
+    color: #cc5c5c;
+}
+
+#backlight {
+    color: #f0c767;
+}
 
 #battery {
     color: #97bd5e;
@@ -123,6 +136,10 @@ button {
     color: #de7e54;
 }
 
+#custom-unixtime {
+	color: #f0c767;
+}
+
 #tray > .passive {
     -gtk-icon-effect: dim;
 }
diff --git a/.zshenv b/.zshenv
index 28fde58..edd148c 100755
--- a/.zshenv
+++ b/.zshenv
@@ -13,6 +13,10 @@ export FILE=/bin/thunar
 export PAGER=/bin/less
 export TERMINAL=/bin/alacritty
 
+export XMODIFIERS=@im=fcitx
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+
 export GNUPGHOME="$HOME/.config/gnupg"
 export CARGO_HOME="$HOME/.local/share/cargo"
 export RUSTUP_HOME="$HOME/.local/share/rustup"
diff --git a/.zshrc b/.zshrc
index beee46b..f3f0c8e 100755
--- a/.zshrc
+++ b/.zshrc
@@ -44,8 +44,6 @@ man() {
 	man "$@"
 }
 
-[ $NOEXIT ] && alias exit="echo Exiting is disabled"
-
 #
 # Plugins
 #