diff --git a/dot_config/sway/executable_config b/dot_config/sway/executable_config
index c12148d..bd42326 100644
--- a/dot_config/sway/executable_config
+++ b/dot_config/sway/executable_config
@@ -348,6 +348,9 @@ exec /usr/bin/lxqt-policykit-agent
 # Clipboard Manager
 exec wl-paste -t text --watch clipman store
 
+# wvkbd - On-screen keyboard for wlroots that sucks less
+exec wvkbd-mobintl --hidden --fn 'DejaVuSansMono Nerd Font 14' -l 'simple,special,emoji,arabic' -L 240
+
 exec swayidle -w \
          timeout 300 'swaylock -f' \
          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 858d629..21daef2 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -22,15 +22,16 @@
         "temperature",
         "backlight",
         "custom/wl-gammarelay-temperature",
-        "custom/wl-gammarelay-brightness",
-        "custom/wl-gammarelay-gamma",
-        "keyboard-state",
-        "sway/language",
+        //"custom/wl-gammarelay-brightness",
+        //"custom/wl-gammarelay-gamma",
+        //"keyboard-state",
+        //"sway/language",
+        "custom/events",
+        "clock",
         "battery",
         "battery#bat2",
-        "clock",
-        "custom/events",
-        "tray"
+        "tray",
+        "custom/wvkbd"
     ],
     // Modules configuration
     "sway/workspaces": {
@@ -247,5 +248,12 @@
         },
         "exec": "~/.config/waybar/waybar-khal.py",
         "return-type": "json"
+    },
+    "custom/wvkbd": {
+        "format": "{icon}",
+        "format-icons": {
+            "default": ""
+        },
+        "on-click": "pkill --signal SIGRTMIN wvkbd-mobintl"
     }
 }
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index ed90cca..c67a0bd 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -91,6 +91,7 @@ button:hover {
 #custom-wl-gammarelay-brightness,
 #custom-wl-gammarelay-gamma,
 #custom-events,
+#custom-wvkbd,
 #mpd {
     padding: 0 10px;
     color: #ffffff;
@@ -166,6 +167,10 @@ label:focus {
     background-color: #90b1b1;
 }
 
+#custom-wvkbd {
+    background-color: #2980b9;
+}
+
 #network {
     background-color: #2980b9;
 }