diff --git a/custom/default.nix b/custom/default.nix
index 896be75..85f4da7 100644
--- a/custom/default.nix
+++ b/custom/default.nix
@@ -5,10 +5,9 @@
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
   self = {
-    gallery-tagger = callPackage ./gallery-tagger {};
     lockscreen = callPackage ./lockscreen {};
     update-background = callPackage ./update-background {};
-    joystickwake = callPackage ./joystickwake {};
+    # joystickwake = callPackage ./joystickwake {};
   };
 in
 (self)
diff --git a/custom/gallery-tagger/default.nix b/custom/gallery-tagger/default.nix
deleted file mode 100644
index 4552d62..0000000
--- a/custom/gallery-tagger/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv,
-  cargo,
-  rustc,
-  rustPlatform,
-  gexiv2,
-  glib,
-  gcc,
-  pkg-config
-}:
-
-rustPlatform.buildRustPackage rec {
-  version = "0.1.2";
-  pname = "gallery-tagger";
-  nativeBuildInputs = [ cargo rustc gcc pkg-config ];
-  buildInputs = [ gexiv2.dev glib.dev ];
-  src = builtins.fetchGit {
-    url = "git@gitlab.com:bertof/galllery-tagger.git";
-    ref = "5389813e62dfa790cf20441242d8a7d89f345fa9";
-  };
-  doCheck = true;
-  cargoSha256 = "sha256:0nskc778m8nj2v4qidq4jzrb3ac8yg9bjc1l546c1k984321k187";
-}
-
diff --git a/home.nix b/home.nix
index 51f9ab2..d5a7be6 100644
--- a/home.nix
+++ b/home.nix
@@ -2,9 +2,11 @@
 
 let
   nixpkgs = import <nixpkgs> {};
+  nixos-unstable = import <nixos-unstable> {};
+  nixos = import <nixos> {};
   nix-rice = fetchTarball {
-    url = "https://github.com/bertof/nix-rice/archive/refs/tags/v0.1.0.tar.gz";
-    sha256 = "0am3fnn8lqbi0mhz8jxqskchw1phy5s7kkmrk6jw519dasqq6an7";
+    url = "https://github.com/bertof/nix-rice/archive/refs/tags/v0.1.2.tar.gz";
+    sha256 = "15f97nwwvk828vnx6kk325zzjn4q37hrpp9aiqiz2qhfs06mr147";
   };
   callPackage = pkgs.lib.callPackageWith pkgs;
   nord = import ./themes/nord.nix;
@@ -67,7 +69,6 @@ in
       evolution
       firefox
       gallery-dl
-      # gallery-tagger
       gnome.dconf-editor
       gnome.easytag
       gnome.eog
@@ -81,6 +82,7 @@ in
       gnome.gnome-system-monitor
       gnome.gnome-tweaks
       gnome.nautilus
+      gnome.quadrapassel
       gnome.seahorse
       gnome.sushi
       google-chrome
@@ -114,6 +116,7 @@ in
       wineFull
       wireguard
       xclip
+      xournalpp
       zoom-us
       zotero
 
@@ -125,7 +128,11 @@ in
           theme = "cla";
         }
       )
-    ];
+    ] ++ (
+      with nixos; [
+        blender
+      ]
+    );
   };
 
   programs.zsh.enable = true;
@@ -173,6 +180,7 @@ in
     ./modules/tmux.nix
     ./modules/update_background.nix
     # ./modules/xidelhook.nix
+    ./modules/zathura.nix
     ./modules/zoxide.nix
     ./modules/zsh.nix
 
diff --git a/modules/bspwm.nix b/modules/bspwm.nix
index 740c2a2..f92dc9b 100644
--- a/modules/bspwm.nix
+++ b/modules/bspwm.nix
@@ -25,8 +25,8 @@ in
       "HDMI-0" = monitorPages;
     };
     extraConfig = ''
-      sleep 2
-      polybar-msg cmd restart
+      ${pkgs.wmname}/bin/wmname LG3D
+      ${pkgs.polybar}/bin/polybar-msg cmd restart
     '';
     startupPrograms = [];
   };
diff --git a/modules/joystickwake.nix b/modules/joystickwake.nix
index 40e3a73..25f0aaf 100644
--- a/modules/joystickwake.nix
+++ b/modules/joystickwake.nix
@@ -6,7 +6,7 @@ in
   systemd.user.services."joystickwake" = {
     Unit = {
       Description = "Keep lockscreen from activating";
-      After = [ "graphical-session.pre.target" ];
+      After = [ "graphical-session.target" ];
       PartOf = [ "graphical-session.target" ];
     };
     Install = {
diff --git a/modules/kakoune.nix b/modules/kakoune.nix
index 6df4741..f9320f6 100644
--- a/modules/kakoune.nix
+++ b/modules/kakoune.nix
@@ -12,6 +12,9 @@ let
   cppPlugins = with pkgs; [
     clang-tools
   ];
+  latexPlugins = with pkgs; [
+    texlab
+  ];
   pythonPlugins = with pkgs.python38Packages; [
     pyls-black
     python-language-server
@@ -78,6 +81,7 @@ in
         { mode = "user"; docstring = "Show hover info"; key = "q"; effect = ":lsp-hover<ret>"; }
         { mode = "user"; docstring = "Spellcheck English"; key = "S"; effect = ":spell en<ret>"; }
         { mode = "user"; docstring = "Spellcheck"; key = "s"; effect = ":spell "; }
+        { mode = "normal"; docstring = "Try next snippet placeholder"; key = "<c-n>"; effect = "<a-;>: insert-c-n<ret>"; }
       ];
       hooks = [
         { name = "BufCreate"; option = ".*"; commands = "editorconfig-load"; }
@@ -91,6 +95,19 @@ in
       "define-command -docstring 'save and quit' x 'write-all; quit' # Save and quit with 'x'"
       "add-highlighter global/ regex \\h+$ 0:Error                   # Highlight trailing spaces"
       "eval %sh{kak-lsp --kakoune -s \$kak_session}                  # Start kak-lsp"
+
+      # Kak-lsp snippet support
+      ''
+        def -hidden insert-c-n %{
+         try %{
+           lsp-snippets-select-next-placeholders
+           exec '<a-;>d'
+         } catch %{
+           exec -with-hooks '<c-n>'
+         }
+        }
+      ''
+
       "require-module prelude"
       "# require-module auto-pairs"
       "require-module connect"
@@ -113,7 +130,7 @@ in
       with nixpkgs; [
         kakounePlugins.connect-kak
       ]
-    ) ++ rustPlugins ++ cppPlugins ++ pythonPlugins ++ nixPlugins ++ spellingPlugins ++ dataFormats;
+    ) ++ rustPlugins ++ cppPlugins ++ pythonPlugins ++ latexPlugins ++ nixPlugins ++ spellingPlugins ++ dataFormats;
   };
   xdg.configFile."kak/colors/nord.kak".source = ../configs/kak/colors/nord.kak;
   xdg.configFile."kak-lsp/kak-lsp.toml".source = ../configs/kak-lsp/kak-lsp.toml;
diff --git a/modules/picom.nix b/modules/picom.nix
index f7cbe9c..99c97b5 100644
--- a/modules/picom.nix
+++ b/modules/picom.nix
@@ -2,10 +2,19 @@
 {
   services.picom = {
     enable = true;
+
     blur = true;
+    experimentalBackends = true;
     fade = true;
     shadow = true;
     vSync = true;
-    # backend = "xrender";
+    extraOptions = ''
+      blur:
+      {
+        method = "gaussian";
+        size = 10;
+        deviation = 7.0;
+      }
+    '';
   };
 }
diff --git a/modules/polybar.nix b/modules/polybar.nix
index a5c7dd9..5848652 100644
--- a/modules/polybar.nix
+++ b/modules/polybar.nix
@@ -61,7 +61,7 @@ let
       bottom.size = 0;
     };
     font = [
-      "FuraCode Nerd Font Mono:size=9;2"
+      "${pkgs.rice.font.monospace.name}:size=9;2"
       "Material Design Icons:size=9;2"
       "NotoEmoji Nerd Font Mono:size=9;0"
     ];
@@ -321,7 +321,7 @@ in
         format = colors.normal // {
           padding = 1;
         };
-        exec = "${playerStatus}";
+        exec = playerStatus;
         click.left = "${playerCtl} play-pause";
         scroll = {
           up = "${playerCtl} previous";
diff --git a/modules/sxhkd.nix b/modules/sxhkd.nix
index fa470a0..93484ba 100644
--- a/modules/sxhkd.nix
+++ b/modules/sxhkd.nix
@@ -9,6 +9,7 @@
     rofi = "${pkgs.rofi}/bin/rofi";
     terminator = "${pkgs.terminator}/bin/terminator";
     nautilus = "${pkgs.gnome.nautilus}/bin/nautilus";
+    pcmanfm = "${pkgs.pcmanfm}/bin/pcmanfm";
     update-backgroundCmd = "${pkgs.update-background}";
   in
     {
@@ -25,7 +26,7 @@
         "super + ctrl + {m,x,y,z}" = "${bspc} node -g {marked,locked,sticky,private}";
         "super + ctrl + shift + space" = "${bspc} query -N -d | xargs -I id -n 1 ${bspc} node id -p cancel";
         "super + ctrl + space" = "${bspc} node -p cancel";
-        "super + e" = "${nautilus} -w";
+        "super + {_,shift +} e" = "{${nautilus} -w, ${pcmanfm} -n}";
         "super + Escape" = "pkill -USR1 -x sxhkd";
         "super + g" = "${bspc} node -s biggest";
         "super + {grave,Tab}" = "${bspc} {node,desktop} -f last";
diff --git a/modules/zathura.nix b/modules/zathura.nix
new file mode 100644
index 0000000..399a7ef
--- /dev/null
+++ b/modules/zathura.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+let
+  strPalette = with pkgs.rice; palette.toRgbHex colorPalette;
+in
+{
+  home.packages = [ pkgs.rice.font.normal.package ];
+  programs.zathura = {
+    enable = true;
+    options = {
+      completion-bg = strPalette.bright.black;
+      default-bg = strPalette.normal.black;
+      font = "${pkgs.rice.font.normal.name} 10";
+      inputbar-bg = strPalette.bright.black;
+      inputbar-fg = strPalette.normal.cyan;
+      page-padding = 10;
+      recolor-lightcolor = strPalette.dim.cyan;
+      statusbar-bg = strPalette.bright.black;
+    };
+  };
+}