diff --git a/modules/applications/media.nix b/modules/applications/media.nix
index 34b5de1..1c8eb7a 100644
--- a/modules/applications/media.nix
+++ b/modules/applications/media.nix
@@ -4,7 +4,7 @@
     home-manager.users.${config.user}.home.packages = with pkgs; [
       mpv # Video viewer
       sxiv # Image viewer
-      zathura # PDF viewer
+      mupdf # PDF viewer
     ];
   };
 
diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
index 5f07701..c8f9fa8 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/i3.nix
@@ -20,22 +20,22 @@
       package = pkgs.i3-gaps;
       config = let
         modifier = "Mod4"; # Super key
-        ws1 = "I";
-        ws2 = "II";
-        ws3 = "III";
-        ws4 = "IV";
-        ws5 = "V";
-        ws6 = "VI";
-        ws7 = "VII";
-        ws8 = "VIII";
-        ws9 = "IX";
-        ws10 = "X";
+        ws1 = "1:I";
+        ws2 = "2:II";
+        ws3 = "3:III";
+        ws4 = "4:IV";
+        ws5 = "5:V";
+        ws6 = "6:VI";
+        ws7 = "7:VII";
+        ws8 = "8:VIII";
+        ws9 = "9:IX";
+        ws10 = "10:X";
       in {
         modifier = modifier;
         assigns = {
           "${ws1}" = [{ class = "Firefox"; }];
           "${ws2}" = [{ class = "Alacritty"; }];
-          "${ws3}" = [{ class = "Discord"; }];
+          "${ws3}" = [{ class = "discord"; }];
           "${ws4}" = [{ class = "Steam"; }];
         };
         bars = [{ command = "echo"; }]; # Disable i3bar
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index dcdfbe4..da2c5b5 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -32,9 +32,7 @@
             padding-left = 2;
             padding-right = 2;
             module-margin = 1;
-            # separator = "|";
-            # separator-foreground = colors.disabled;
-            modules-left = "xworkspaces";
+            modules-left = "i3";
             modules-center = "xwindow";
             modules-right = "pulseaudio date";
             cursor-click = "pointer";
@@ -46,6 +44,32 @@
             # wm-restack = "i3";
             # override-redirect = true;
           };
+          "module/i3" = let padding = 2;
+          in {
+            type = "internal/i3";
+            pin-workspaces = false;
+            show-urgent = true;
+            strip-wsnumbers = true;
+            index-sort = true;
+            enable-click = true;
+            wrapping-scroll = true;
+            fuzzy-match = true;
+            format = "<label-state> <label-mode>";
+            label-focused = "%name%";
+            label-focused-foreground = config.gui.colorscheme.base01;
+            label-focused-background = config.gui.colorscheme.base05;
+            label-focused-underline = config.gui.colorscheme.base03;
+            label-focused-padding = padding;
+            label-unfocused = "%name%";
+            label-unfocused-padding = padding;
+            label-visible = "%name%";
+            label-visible-underline = config.gui.colorscheme.base01;
+            label-visible-padding = padding;
+            label-urgent = "%name%";
+            label-urgent-foreground = config.gui.colorscheme.base00;
+            label-urgent-background = config.gui.colorscheme.base08;
+            label-urgent-padding = padding;
+          };
           "module/xworkspaces" = {
             type = "internal/xworkspaces";
             label-active = "%name%";
@@ -156,4 +180,3 @@
   };
 
 }
-