diff --git a/config/sway/config b/config/sway/config
index 928c69a..8e7d066 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -256,8 +256,9 @@ exec mako
 # 2 option uses tablet events
 
 # exec monitor-sensor | bash $DOTS/config/sway/autorotate &> /tmp/autorotate.log
-bindswitch tablet:toggle output "eDP-1" transform 180 clockwise 
-# bindswitch lid:toggle exec echo "Lid moved" &>/tmp/lid.log
+bindswitch tablet:toggle output "eDP-1" transform 180 clockwise ; input "type:touch" map_to_output "eDP-1" ; input "type:tablet_tool" map_to_output "eDP-1"
+# bindswitch tablet:on busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+# bindswitch tablet:off busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
 
 bindgesture swipe:left workspace prev
 bindgesture swipe:right workspace next
diff --git a/config/waybar/config b/config/waybar/config
index 6e7a39b..898d187 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -28,13 +28,11 @@
         "warp-on-scroll": true,
         "format": "{icon}",
         "format-icons": {
-            "1": "",
-            "2": "",
-            "3": "",
-            "4": "",
-            "5": "",
-            "urgent": "",
-            "focused": "",
+            "1": "",
+            "2": "",
+            "3": "",
+            "9": "",
+            "10": "󰌳",
             "default": ""
         }
     },
@@ -86,8 +84,8 @@
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
-            "activated": "",
-            "deactivated": ""
+            "activated": "󰅶",
+            "deactivated": "󰾪"
         }
     },
     "tray": {
@@ -96,13 +94,14 @@
     },
     "clock": {
         // "timezone": "America/New_York",
+        "format": "{:%I:%M}",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
         "format": "{usage}% ",
         "tooltip": false
-    },
+    },   
     "memory": {
         "format": "{}% "
     },
@@ -126,16 +125,13 @@
             "critical": 15
         },
         "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
+        "format-charging": "{capacity}% ",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 9994a39..0781fd4 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -50,6 +50,7 @@ box.modules-right {
 #custom-pacman,
 #custom-scratchpad-indicator {
   padding: 0 0.6rem;
+  background-color: @red;
 }
 
 /* Bar */
@@ -118,6 +119,7 @@ tooltip label {
 /* battery */
 #battery {
   color: @mauve;
+  padding-right: 1.15rem;
 }
 #battery.full {
   color: @green;
@@ -135,27 +137,6 @@ tooltip label {
   color: @red;
 }
 
-/* mpd */
-#mpd.paused {
-  color: @pink;
-  font-style: italic;
-}
-#mpd.stopped {
-  color: @rosewater;
-  /* background: transparent; */
-}
-#mpd {
-  color: @lavender;
-}
-
-/* Extra */
-#custom-cava-internal {
-  color: @peach;
-  padding-right: 1rem;
-}
-#custom-launcher {
-  color: @yellow;
-}
 #memory {
   color: @peach;
 }
@@ -167,6 +148,7 @@ tooltip label {
 }
 #idle_inhibitor {
   color: @green;
+  padding-right: 0.9rem;
 }
 #temperature {
   color: @sapphire;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 1a4023e..825910d 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -166,6 +166,9 @@
     celluloid
     swappy
     signal-desktop
+    squeekboard
+    python3
+    nodePackages.pnpm
     (callPackage ./theme.nix { }).sddm-catppucin-theme
   ];