diff --git a/nixos/polybar.nix b/nixos/polybar.nix
index beb78690..0a4bda2c 100644
--- a/nixos/polybar.nix
+++ b/nixos/polybar.nix
@@ -2,9 +2,12 @@
 {
   services.polybar = {
     enable = true;
-    script = "polybar main_bar &";
+    script = "polybar -r main_bar &";
     config = {
       "bar/main_bar" = {
+        font-0 = "DejaVu Sans Mono for Powerline:size=10.0;weight=bold";
+        background = "#002b36";
+        foreground = "#839496";
         bottom = "false";
         height = 50;
         fixed-center = "true";
@@ -12,53 +15,17 @@
         padding-right = "1%";
         module-margin-left = 1;
         module-margin-right = 1;
-        wm-restack = "bspwm";
-        modules-left = "bspwm xwindow";
+        modules-left = "xwindow";
         modules-center = "date";
-        modules-right = "org-clock volume backlight filesystem memory cpu battery network";
-      };
-      "module/bspwm" = {
-        type = "internal/bspwm";
-        format = "<label-state> <label-mode>";
-        label-monocle = "M";
-        label-floating = "S";
-        fuzzy-match = "true";
-        ws-icon-0 = "1;";
-        ws-icon-1 = "2;";
-        ws-icon-2 = "3;";
-        ws-icon-3 = "4;";
-        ws-icon-4 = "5;♞";
-        ws-icon-default = "";
-        label-mode-padding = "2";
-        label-focused = "%icon%";
-        label-focused-padding = 2;
-        label-empty = '''';
-        label-occupied = "%icon%";
-        label-occupied-padding = 2;
-        label-urgent = "%icon%";
-        label-urgent-padding = 2;
+        modules-right = "org-clock volume backlight filesystem memory cpu network";
       };
       "module/date" = {
         type = "internal/date";
         interval = 5;
-        date = "%m-%d %a";
+        date = "%a %d.%m";
         time = "%H:%M";
         label = "%date% %time%";
       };
-      "module/battery" = {
-        type = "internal/battery";
-        battery = "BAT1";
-        adapter = "ADP1";
-        full-at = 96;
-        format-charging = " <label-charging>";
-        format-discharging = "<ramp-capacity> <label-discharging>";
-        format-full = " ";
-        ramp-capacity-0 = "";
-        ramp-capacity-1 = "";
-        ramp-capacity-2 = "";
-        ramp-capacity-3 = "";
-        ramp-capacity-4 = "";
-      };
       "settings" = {screenchange-reload = "true";};
       "module/xwindow" = {
         type = "internal/xwindow";
diff --git a/nixos/user-xsession.nix b/nixos/user-xsession.nix
index ed306a52..f538bba3 100644
--- a/nixos/user-xsession.nix
+++ b/nixos/user-xsession.nix
@@ -16,7 +16,7 @@ in
           startup = [
             { command = "exec i3-sensible-terminal"; always = true; notification = false; }
           ];
-
+          workspaceLayout = "stacked";
           bars = [];
           gaps = {
             inner = 8;
@@ -27,13 +27,18 @@ in
 
           modifier = mod;
           keybindings = {
-            "${mod}+Return" = "exec i3-sensible-terminal";
-            "${mod}+Shift+q" = "kill";
-            "${mod}+r" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
-            "${mod}+f" = "fullscreen toggle";
-            "${mod}+l" = "exec loginctl lock-session";
             "${mod}+Shift+e" = "exec i3-msg exit";
+            "${mod}+Shift+c" = "reload";
             "${mod}+Shift+r" = "restart";
+
+            "${mod}+r" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
+            "${mod}+q" = "kill";
+            "${mod}+f" = "fullscreen toggle";
+
+            "${mod}+h"   = "focus left";
+            "${mod}+j"   = "focus down";
+            "${mod}+k"   = "focus up";
+            "${mod}+l"   = "focus right";
           };
         };
       };