diff --git a/modules/home/default.nix b/modules/home/default.nix
index e8f7da5..e997ea1 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -43,7 +43,6 @@ in
             daVinci
             mpv
             freetube
-            dissent
             discordCanary
             vesktop
             element
@@ -57,13 +56,16 @@ in
             systemMonitor
             usbImager
             virtManager
-            # hypr
-            # wayland
+            hypr
+            wayland
             theming
             polychromatic
             dolphin
             espanso
             claudeCode
+            jamesDsp
+            zoom
+            academic
             ;
         };
       };
diff --git a/modules/home/gui/apps/academic/default.nix b/modules/home/gui/apps/academic/default.nix
new file mode 100755
index 0000000..da65bd2
--- /dev/null
+++ b/modules/home/gui/apps/academic/default.nix
@@ -0,0 +1,11 @@
+let
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}
diff --git a/modules/home/gui/apps/academic/jabref/default.nix b/modules/home/gui/apps/academic/jabref/default.nix
new file mode 100644
index 0000000..b0faee9
--- /dev/null
+++ b/modules/home/gui/apps/academic/jabref/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      jabref
+      ;
+  };
+}
diff --git a/modules/home/gui/apps/academic/paperlib/default.nix b/modules/home/gui/apps/academic/paperlib/default.nix
new file mode 100644
index 0000000..63f0ab0
--- /dev/null
+++ b/modules/home/gui/apps/academic/paperlib/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      paperlib
+      ;
+  };
+}
diff --git a/modules/home/gui/apps/academic/zotero/default.nix b/modules/home/gui/apps/academic/zotero/default.nix
new file mode 100644
index 0000000..757339a
--- /dev/null
+++ b/modules/home/gui/apps/academic/zotero/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      zotero-beta
+      ;
+  };
+}
diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
index 18545ac..84f0711 100755
--- a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
@@ -7,8 +7,7 @@
       sponsorblock
       ublock-origin
       unpaywall
-      vimium
-      side-view
+      zotero-connector
       ;
   };
 }
diff --git a/modules/home/gui/apps/browsers/floorp/config/search/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/search/config/flake/selfHosted.nix
index 0c4ccf4..8341073 100755
--- a/modules/home/gui/apps/browsers/floorp/config/search/config/flake/selfHosted.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/search/config/flake/selfHosted.nix
@@ -1,8 +1,9 @@
-{ flake, ... }:
+{ flake, osConfig, ... }:
 let
-  inherit (flake.config.services)
-    instances
-    ;
+  inherit (flake.config.services) instances;
+  inherit (flake.config.machines) devices;
+  localhost = instances.web.localhost.address0;
+  hostname = osConfig.networking.hostName;
 in
 {
   "${instances.jellyfin.label}" = {
@@ -34,7 +35,14 @@ in
     icon = ./icons/sx.png;
     urls = [
       {
-        template = "https://${instances.searx.subdomain}.${instances.web.domains.url0}/search?q={searchTerms}";
+        template =
+          (
+            if hostname == devices.mars.name then
+              "http://${localhost}:${toString instances.searx.ports.port0}"
+            else
+              "https://${instances.searx.subdomain}.${instances.web.domains.url0}"
+          )
+          + "/search?q={searchTerms}";
       }
     ];
   };
diff --git a/modules/home/gui/apps/browsers/floorp/config/search/default.nix b/modules/home/gui/apps/browsers/floorp/config/search/default.nix
index 87687b4..3390da3 100755
--- a/modules/home/gui/apps/browsers/floorp/config/search/default.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/search/default.nix
@@ -1,4 +1,4 @@
-{ flake, ... }:
+{ flake, osConfig, ... }:
 let
   configPath = ./config;
   flakedPath = configPath + /flake;
@@ -21,6 +21,7 @@ let
       // (import (flakedPath + "/${searchEngine}") {
         inherit
           flake
+          osConfig
           ;
       })
     ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
@@ -30,20 +31,21 @@ in
 {
   search = {
     force = true;
-    default = "Brave";
+    default = "SearXNG";
     engines = aggregatedSearchEngines;
     order = [
       "AlternativeTo"
+      "Brave"
       "Core Radio"
       "Hackage"
       "Hoogle"
       "Jellyfin"
-      "SearXNG"
       "Nix Home Manager"
       "Nix Options"
       "Nix Packages"
       "Nix Wiki"
       "PeerTube"
+      "SearXNG"
       "Sci-Hub"
       "Torrent Leech"
       "Urban Dictionary"
diff --git a/modules/home/gui/apps/browsers/floorp/default.nix b/modules/home/gui/apps/browsers/floorp/default.nix
index aeec0d9..8e75af1 100755
--- a/modules/home/gui/apps/browsers/floorp/default.nix
+++ b/modules/home/gui/apps/browsers/floorp/default.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   flake,
+  osConfig,
   ...
 }:
 let
@@ -14,7 +15,7 @@ in
       configPath = ./config;
       bookmarksPath = import (configPath + /bookmarks) { inherit flake; };
       extensionsPath = import (configPath + /extensions) { inherit pkgs; };
-      searchPath = import (configPath + /search) { inherit flake; };
+      searchPath = import (configPath + /search) { inherit flake osConfig; };
       settingsPath = import (configPath + /settings);
       themesPath = import (configPath + /themes);
     in
diff --git a/modules/home/gui/desktop/wayland/jamesDsp/default.nix b/modules/home/gui/desktop/wayland/jamesDsp/default.nix
new file mode 100755
index 0000000..ffd14e6
--- /dev/null
+++ b/modules/home/gui/desktop/wayland/jamesDsp/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      jamesdsp
+      ;
+  };
+}
diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
index b94427d..e24ce88 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
@@ -104,8 +104,8 @@ in
       tooltip = false;
       format-muted = " Muted";
       on-click = "easyeffects";
-      on-scroll-up = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink +5% ; pactl set-sink-volume @DEFAULT_SINK@ 5%";
-      on-scroll-down = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink -5% ; pactl set-sink-volume @DEFAULT_SINK@ -5%";
+      on-scroll-up = "pactl set-sink-volume @DEFAULT_SINK@ +5%";
+      on-scroll-down = "pactl set-sink-volume @DEFAULT_SINK@ -5%";
       scroll-step = 5;
       format-icons = {
         headphone = "";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index d17d1b3..b532b63 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -10,13 +10,12 @@ in
           mullvad
           syncthing
           ollama
-          # hypr
+          hypr
+          wayland
           searx
           portals
           xserver
           flatpak
-          plasma
-          sddm
           wireGuard
           ;
       };
diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix
index aa1fb43..967ebc1 100755
--- a/profiles/user0/default.nix
+++ b/profiles/user0/default.nix
@@ -53,23 +53,26 @@ in
               mars = devices.mars;
               deimos = devices.deimos;
               deviceLogic = if hostname == mars.name then deimos else mars;
+
+              vpnServers = [
+                "CA363"
+                "CA220"
+                "CA358"
+                "CA627"
+              ];
+
+              vpnCommands = lib.concatStrings (
+                lib.imap0 (i: server: ''
+                  vpn${toString i}:
+                      sudo systemctl start wg-quick-Proton-${server}.service
+
+                '') vpnServers
+              );
             in
             {
               text = ''
-                vpn0:
-                    sudo systemctl start wg-quick-Proton-CA363.service
-
-                vpn1:
-                    sudo systemctl start wg-quick-Proton-CA220.service
-
-                vpn2:
-                    sudo systemctl start wg-quick-Proton-CA358.service
-
-                vpn3:
-                    sudo systemctl start wg-quick-Proton-CA627.service
-
-                vpnoff:
-                    sudo systemctl stop wg-quick-Proton-*.service
+                rebuildboot:
+                    nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
 
                 rebuild:
                     nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
@@ -85,6 +88,11 @@ in
 
                 ${deviceLogic.name}:
                     ssh ${deviceLogic.ip.address0}
+
+                vpnoff:
+                    sudo systemctl stop wg-quick-Proton-*.service
+
+                ${vpnCommands}
               '';
             };
           "./Files/Scripts/list.sh" = {