diff --git a/modules/direnv.nix b/modules/direnv.nix
index 389068f..7c26805 100644
--- a/modules/direnv.nix
+++ b/modules/direnv.nix
@@ -3,9 +3,6 @@
     enable = true;
     enableBashIntegration = true;
     enableZshIntegration = true;
-    nix-direnv = {
-      enable = true;
-      enableFlakes = true;
-    };
+    nix-direnv.enable = true;
   };
 }
diff --git a/modules/kakoune.nix b/modules/kakoune.nix
index 61a9c48..e17bf61 100644
--- a/modules/kakoune.nix
+++ b/modules/kakoune.nix
@@ -225,18 +225,18 @@ in
             key = "<c-n>";
             effect = "<a-;>: insert-c-n<ret>";
           }
-          {
-            mode = "normal";
-            docstring = "Search";
-            key = "/";
-            effect = "/(?i)";
-          }
-          {
-            mode = "normal";
-            docstring = "Reverse search";
-            key = "<a-/>";
-            effect = "<a-/>(?i)";
-          }
+          # {
+          #   mode = "normal";
+          #   docstring = "Search";
+          #   key = "/";
+          #   effect = "/(?i)";
+          # }
+          # {
+          #   mode = "normal";
+          #   docstring = "Reverse search";
+          #   key = "<a-/>";
+          #   effect = "<a-/>(?i)";
+          # }
         ];
       hooks = with pkgs;
         [
diff --git a/modules/keep.nix b/modules/keep.nix
deleted file mode 100644
index 2051ad2..0000000
--- a/modules/keep.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-let
-  cmd = "${google-chrome}/bin/google-chrome-stable --app=https://keep.google.com";
-  desktopItem = pkgs.makeDesktopItem
-    {
-      name = "Keep";
-      type = "Application";
-      exec = cmd;
-      icon = "keep";
-      desktopName = "Keep";
-      comment = "Google Keep note app";
-      categories = "Office;";
-    };
-in
-{
-  home.packages = [
-    desktopItem
-  ];
-}
diff --git a/modules/notion.nix b/modules/notion.nix
deleted file mode 100644
index e5c4766..0000000
--- a/modules/notion.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-let
-  link = "https://notion.so";
-  cmd = "${google-chrome}/bin/google-chrome-stable --app=${link}";
-  desktopItem = pkgs.makeDesktopItem
-    {
-      name = "Notion";
-      type = "Application";
-      exec = cmd;
-      icon = "notion";
-      desktopName = "Notion";
-      comment = "Notion web client";
-      categories = "Office;";
-    };
-in
-{
-  home.packages = [
-    desktopItem
-  ];
-}
diff --git a/modules/twitch.nix b/modules/twitch.nix
deleted file mode 100644
index 40afb98..0000000
--- a/modules/twitch.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-let
-  link = "https://twitch.com";
-  cmd = "${google-chrome}/bin/google-chrome-stable --app=${link}";
-  desktopItem = pkgs.makeDesktopItem
-    {
-      name = "Twitch";
-      type = "Application";
-      exec = cmd;
-      icon = "twitch";
-      desktopName = "Twitch";
-      comment = "Twitch web client";
-      categories = "Office;";
-    };
-in
-{
-  home.packages = [
-    desktopItem
-  ];
-}
diff --git a/modules/webapp.nix b/modules/webapp.nix
new file mode 100644
index 0000000..df3a71d
--- /dev/null
+++ b/modules/webapp.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+# Categories: https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
+let
+  cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}";
+  links = [
+    { name = "YouTube"; link = "https://www.youtube.com"; categories = "AudioVideo"; }
+    { name = "Twitch"; link = "https://www.twitch.tv"; icon = builtins.fetchurl "https://static.twitchcdn.net/assets/favicon-32-e29e246c157142c94346.png"; categories = "AudioVideo"; }
+    { name = "Netflix"; link = "https://www.netflix.com"; categories = "AudioVideo"; }
+    { name = "Prime Video"; link = "https://primevideo.com"; categories = "AudioVideo"; }
+    { name = "Google Keep"; link = "https://keep.google.com"; categories = "Office"; }
+    { name = "Google Calendar"; link = "https://google.com/calendar"; icon = "calendar"; categories = "Calendar;Office"; }
+    { name = "Notion"; link = "https://notion.so"; categories = "Office"; }
+    { name = "WhatsApp"; link = "https://web.whatsapp.com/"; }
+  ];
+  webAppBuilder =
+    { name
+    , link
+    , icon ? lib.toLower name
+    , desktopName ? name
+    , comment ? null
+    , categories ? "Network"
+    }: pkgs.makeDesktopItem {
+      inherit name icon desktopName comment categories;
+      type = "Application";
+      exec = cmd link;
+    };
+in
+{
+  home.packages = map webAppBuilder links;
+}
diff --git a/modules/whatsapp.nix b/modules/whatsapp.nix
deleted file mode 100644
index 73fa61c..0000000
--- a/modules/whatsapp.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-let
-  link = "https://web.whatsapp.com";
-  cmd = "${google-chrome}/bin/google-chrome-stable --app=${link}";
-  desktopItem = pkgs.makeDesktopItem
-    {
-      name = "Whatsapp";
-      type = "Application";
-      exec = cmd;
-      icon = "whatsapp";
-      desktopName = "Whatsapp";
-      comment = "Whatsapp web client";
-      categories = "Office;";
-    };
-in
-{
-  home.packages = [
-    desktopItem
-  ];
-}
diff --git a/modules/youtube.nix b/modules/youtube.nix
deleted file mode 100644
index d82229a..0000000
--- a/modules/youtube.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-let
-  link = "https://youtube.com";
-  cmd = "${google-chrome}/bin/google-chrome-stable --app=${link}";
-  desktopItem = pkgs.makeDesktopItem
-    {
-      name = "YouTube";
-      type = "Application";
-      exec = cmd;
-      icon = "youtube";
-      desktopName = "YouTube";
-      comment = "YouTube web client";
-      categories = "Office;";
-    };
-in
-{
-  home.packages = [
-    desktopItem
-  ];
-}
diff --git a/odin.nix b/odin.nix
index 77bb237..98f4cb0 100644
--- a/odin.nix
+++ b/odin.nix
@@ -42,6 +42,7 @@
       docker-machine
 
       arandr
+      ark
       authy
       bitwarden
       blender
@@ -103,6 +104,7 @@
       tdesktop
       teams
       transmission-gtk
+      unrar
       virt-manager
       wget
       # wineFull
@@ -125,6 +127,7 @@
     ./modules/bottom.nix
     ./modules/broot.nix
     # ./modules/bspwm.nix
+    ./modules/calendar.nix
     ./modules/dircolors.nix
     ./modules/direnv.nix
     # ./modules/dunst.nix
@@ -138,7 +141,6 @@
     # ./modules/joystickwake.nix
     ./modules/jq.nix
     ./modules/kakoune.nix
-    ./modules/keep.nix
     # ./modules/keepassxc.nix
     ./modules/keychain.nix
     ./modules/latex.nix
@@ -150,7 +152,6 @@
     ./modules/megasync.nix
     ./modules/nix-index.nix
     ./modules/noti.nix
-    ./modules/notion.nix
     # ./modules/obs-studio.nix
     ./modules/office.nix
     ./modules/onedrive.nix
@@ -167,11 +168,9 @@
     ./modules/syncthing.nix
     ./modules/terminator.nix
     ./modules/tmux.nix
-    ./modules/twitch.nix
     ./modules/update_background.nix
-    ./modules/whatsapp.nix
+    ./modules/webapp.nix
     # ./modules/xidlehook.nix
-    ./modules/youtube.nix
     ./modules/zoxide.nix
     ./modules/zsh.nix
 
diff --git a/thor.nix b/thor.nix
index 4be3db6..00d87b4 100644
--- a/thor.nix
+++ b/thor.nix
@@ -42,6 +42,7 @@
       docker-machine
 
       arandr
+      ark
       authy
       bitwarden
       (blender.override { cudaSupport = true; })
@@ -49,7 +50,9 @@
       catgirl # IRC
       cava
       discord
+      # electrum
       element-desktop
+      evolution
       kmail
       file
       firefox
@@ -67,8 +70,10 @@
       kdiff3
       korganizer
       kontact
+      minecraft
       mmv-go
       mpv
+      mycrypto
       neofetch
       nix-prefetch-scripts
       nix-tree
@@ -84,6 +89,7 @@
       tdesktop
       teams
       transmission-gtk
+      unrar
       virt-manager
       wget
       # wineFull
@@ -128,7 +134,6 @@
     # ./modules/joystickwake.nix
     ./modules/jq.nix
     ./modules/kakoune.nix
-    ./modules/keep.nix
     # ./modules/keepassxc.nix
     ./modules/keychain.nix
     ./modules/latex.nix
@@ -139,7 +144,6 @@
     ./modules/megasync.nix
     ./modules/nix-index.nix
     ./modules/noti.nix
-    ./modules/notion.nix
     ./modules/obs-studio.nix
     ./modules/office.nix
     ./modules/onedrive.nix
@@ -156,11 +160,9 @@
     ./modules/syncthing.nix
     ./modules/terminator.nix
     ./modules/tmux.nix
-    ./modules/twitch.nix
     ./modules/update_background.nix
-    ./modules/whatsapp.nix
+    ./modules/webapp.nix
     # ./modules/xidlehook.nix
-    ./modules/youtube.nix
     ./modules/zoxide.nix
     ./modules/zsh.nix