diff --git a/home/adrielus/features/cli/fish.nix b/home/adrielus/features/cli/fish.nix
index 0b36fdc..bc6a88d 100644
--- a/home/adrielus/features/cli/fish.nix
+++ b/home/adrielus/features/cli/fish.nix
@@ -1,4 +1,4 @@
-{ config,  pkgs, ... }:
+{ config, pkgs, ... }:
 let
   base16-fish = pkgs.fetchFromGitHub {
     owner = "tomyun";
@@ -26,15 +26,15 @@ in
 
     plugins = with pkgs.fishPlugins; [
       # Jump to directories by typing "z <directory-name>"
- {
-      name = "z";
-      src = pkgs.fetchFromGitHub {
-        owner = "jethrokuan";
-        repo = "z";
-        rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
-        sha256 = "1kaa0k9d535jnvy8vnyxd869jgs0ky6yg55ac1mxcxm8n0rh2mgq";
-      };
-    }
+      {
+        name = "z";
+        src = pkgs.fetchFromGitHub {
+          owner = "jethrokuan";
+          repo = "z";
+          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
+          sha256 = "1kaa0k9d535jnvy8vnyxd869jgs0ky6yg55ac1mxcxm8n0rh2mgq";
+        };
+      }
     ];
 
     interactiveShellInit =
@@ -51,7 +51,7 @@ in
         set fish_cursor_insert line # Set the insert mode cursor to a line
         set fish_cursor_replace_one underscore # Set the replace mode cursor to an underscore
 
-        # Force fish to skip some checks (I think)
+        # Force fish to skip some checks (I think?)
         set fish_vi_force_cursor 
       '' +
       # Use vim-style keybinds
@@ -64,12 +64,10 @@ in
           bind -M insert -m default -k f10 'commandline -f repaint' # Exit insert mode with <f10>
         end
       '' +
-      # Starship hook
-      ''
-        starship init fish | source
-      '' +
       # Theming 
-      (builtins.readFile (config.scheme base16-fish))
+      ''
+        source ${config.scheme base16-fish}
+      ''
     ;
   };
 }
diff --git a/home/adrielus/features/cli/tmux/default.nix b/home/adrielus/features/cli/tmux/default.nix
index fa0d9d3..dbf7dc9 100644
--- a/home/adrielus/features/cli/tmux/default.nix
+++ b/home/adrielus/features/cli/tmux/default.nix
@@ -27,10 +27,11 @@ in
     ];
 
     extraConfig = ''
+      # Main config
       source ${./tmux.conf}
 
       # Theme
-      ${builtins.readFile (config.scheme base16-tmux)}
+      source ${config.scheme base16-tmux}
     '';
   };
 }
diff --git a/home/adrielus/features/desktop/common/polybar/default.nix b/home/adrielus/features/desktop/common/polybar/default.nix
index 1cfa5fb..9abade8 100644
--- a/home/adrielus/features/desktop/common/polybar/default.nix
+++ b/home/adrielus/features/desktop/common/polybar/default.nix
@@ -3,26 +3,29 @@ let
   base16-polybar = pkgs.fetchFromGitHub {
     owner = "tinted-theming";
     repo = "base16-polybar";
-    sha256 = "142fmqm324gy3qsv48vijm5k81v6mw85ym9mmhnvyv2q2ndg5rix";
-    rev = "2f6dd973a9075dabccd26f1cded09508180bf5fe";
+    sha256 = "1jcr9mmy6y2g06w1b8211lc1y419hqg55v3ly0a27cjgvg89774c";
+    rev = "47b7cc1cde79df5dc5e3cf8f9be607283eb5eb6e";
   };
+
+  script = ''
+    polybar main &
+  '';
 in
 {
   services.polybar = {
+    inherit script;
     enable = true;
     extraConfig = ''
       ; Generated theme
-      ${builtins.readFile (config.scheme base16-polybar)}
+      include-file = ${config.scheme base16-polybar}
 
       ; Actual config
-      include-file = ${paths.dotfiles}/polybar/config.ini
+      include-file = ${./polybar.ini}
     '';
   };
 
   xsession = {
     enable = true;
-    initExtra = ''
-      polybar main &
-    '';
+    initExtra = script;
   };
 }
diff --git a/home/adrielus/features/desktop/xmonad.nix b/home/adrielus/features/desktop/xmonad.nix
index 671773b..11ed2eb 100644
--- a/home/adrielus/features/desktop/xmonad.nix
+++ b/home/adrielus/features/desktop/xmonad.nix
@@ -1,3 +1,3 @@
 {
-  imports = [ ./common/rofi ];
+  imports = [ ./common/rofi ./common/polybar];
 }