diff --git a/flake.nix b/flake.nix
index 9f04ccc..68129d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,9 +49,8 @@
     , unstable
   , ... }@inputs:
     let
-      overlay-unstable = final: prev: {
-        unstable = unstable.legacyPackages.${prev.system};
-      };
+      overlay-unstable = final: prev: { unstable = inputs.unstable.legacyPackages.${prev.system}; };
+      overlays = [ overlay-unstable ];
     in
     {
       nixosConfigurations = {
diff --git a/home/gunalx/base.nix b/home/gunalx/base.nix
index 227ccd3..f385785 100644
--- a/home/gunalx/base.nix
+++ b/home/gunalx/base.nix
@@ -7,6 +7,7 @@
   ];
 
   programs.nix-index = {
+    enableBashIntegration = true;
     enable = true;
   };
   
@@ -14,7 +15,7 @@
   programs.bash = {
     enable = true;
     shellAliases  = {
-        "rebuild" = "sudo nixos-rebuild switch -no-write-lock-file --flake git+https://github.com/adrlau/nix-dotfiles.git -L --impure";
+        "rebuild" = "sudo nixos-rebuild switch --no-write-lock-file --flake git+https://github.com/adrlau/nix-dotfiles.git -L --impure";
         "nixedit" = "sudo vim /etc/nixos/nix-dotfiles/.";
         "nixdir" = "cd /etc/nixos/nix-dotfiles";
 
diff --git a/home/gunalx/niri.nix b/home/gunalx/niri.nix
index 51791fb..0f8cd6f 100644
--- a/home/gunalx/niri.nix
+++ b/home/gunalx/niri.nix
@@ -63,8 +63,8 @@ let
 switch-events {
     lid-close { spawn "swaylock"; }
     //lid-open { spawn "notify-send" "The laptop lid is open!"; }
-    tablet-mode-on { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true"; }
-    tablet-mode-off { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled false"; }
+    tablet-mode-on { spawn "bash" "-c" "wvkbd-mobintl"; }
+    tablet-mode-off { spawn "bash" "-c" "pkill   wvkbd-mobintl"; }
 }
 
 
@@ -308,7 +308,11 @@ window-rule {
 
 window-rule {
     match app-id="onboard"
+    match app-id="Onboard"
     open-floating true
+    default-window-height { proportion 0.2; }
+    default-column-width { proportion 0.8; }
+    block-out-from "screen-capture"
 }
 
 binds {
@@ -626,6 +630,8 @@ in
 
       emote
 
+        
+       wvkbd
 
 
       xdg-desktop-portal-gtk
diff --git a/home/gunalx/waybar.nix b/home/gunalx/waybar.nix
index 22c0dbb..f0c9f42 100644
--- a/home/gunalx/waybar.nix
+++ b/home/gunalx/waybar.nix
@@ -11,6 +11,13 @@ let
     in "rgba(${rgb},${alpha})";
 in
 {
+
+ home.packages = with pkgs; [
+   fuzzel
+   wvkbd
+    ];
+
+
   programs.waybar = {
     enable = true;
     package = pkgs.waybar;
@@ -19,6 +26,7 @@ in
     settings = [
       (builtins.fromJSON ''
         {
+          "layer": "top",
           "height": 36,
           "spacing": 2,
           "tray-position": "right",
@@ -66,7 +74,7 @@ in
           "custom/keyboard": {
             "format": "",
             "tooltip": "On-Screen Keyboard",
-            "on-click": "pkill onboard || onboard"
+            "on-click": "pkill wvkbd-mobintl || wvkbd-mobintl"
           },
 
 
diff --git a/profiles/base.nix b/profiles/base.nix
index 0227b55..728937a 100644
--- a/profiles/base.nix
+++ b/profiles/base.nix
@@ -39,6 +39,8 @@ imports =
     memoryPercent = 25;
   };
 
+  boot.plymouth.enable = true;
+
 
   # Set your time zone.
   time.timeZone = "Europe/Oslo";