diff --git a/.config/waybar/config b/.config/waybar/config
index eefc7466..eb26f6d0 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,39 +1,33 @@
 {
-    // -------------------------------------------------------------------------
-    // Global configuration
-    // -------------------------------------------------------------------------
-
     "layer": "top",
 
         "position": "top",
 
         // If height property would be not present, it'd be calculated dynamically
-        "height": 30,
+        "height": 20,
 
         "modules-left": [
             "sway/workspaces",
         "sway/mode"
         ],
+
         "modules-center": [
             "sway/window"
         ],
+
         "modules-right": [
             "network",
         "memory",
         "cpu",
         "temperature",
-        "custom/keyboard-layout",
         "battery",
         "tray",
+        "pulseaudio",
         "clock#date",
         "clock#time"
         ],
 
 
-        // -------------------------------------------------------------------------
-        // Modules
-        // -------------------------------------------------------------------------
-
         "battery": {
             "interval": 10,
             "states": {
@@ -56,7 +50,7 @@
 
         "clock#time": {
             "interval": 1,
-            "format": "{:%H:%M:%S}",
+            "format": "{:%H:%M}",
             "tooltip": false
         },
 
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 00485221..1659c50e 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -51,7 +51,7 @@
     background: #323232;
     color: white;
     font-family: Cantarell, Noto Sans, sans-serif;
-    font-size: 13px;
+    font-size: 12px;
 }
 
 /* Each module */
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index d726ede5..7ceb6785 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -19,12 +19,12 @@
     ];
 
     home.packages = with pkgs; [
-      zoom-us
+      mindforger
+      zoom-us ssb-patchwork
       passff-host
       gnome3.gnome-screenshot gsettings-desktop-schemas
       apvlv xidlehook
       fontconfig xclip gimp glxinfo
-      mindforger
       evince signal-desktop
       vlc
       jetbrains.goland jetbrains.clion jetbrains.idea-ultimate android-studio
diff --git a/nixos/sway/default.nix b/nixos/sway/default.nix
index 52aa5edb..cf6b6c13 100644
--- a/nixos/sway/default.nix
+++ b/nixos/sway/default.nix
@@ -31,18 +31,21 @@ in
         wrapperFeatures.base = true;
         wrapperFeatures.gtk = true;
 
+        extraConfig = ''
+        '';
         config = {
           modifier = "${mod}";
           menu = "${pkgs.wofi}/bin/wofi --show drun,run";
           terminal = "${pkgs.alacritty}/bin/alacritty";
           workspaceLayout = "tabbed";
+          window = {
+            hideEdgeBorders = "both";
+            titlebar = false;
+          };
           bars = [
             {
               position = "top";
-              colors.background= "#002b36";
-              fonts = [ "Fira Code Nerd Font 10" ];
               command = "${pkgs.waybar}/bin/waybar";
-              trayOutput = "primary";
             }
           ];
           startup = [