diff --git a/home/packages/gui/default.nix b/home/packages/gui/default.nix
index 83ea62f..9c7f80c 100644
--- a/home/packages/gui/default.nix
+++ b/home/packages/gui/default.nix
@@ -2,5 +2,6 @@ _: {
   imports = [
     ./wayland.nix
     ./stremio.nix
+    ./nomacs.nix
   ];
 }
diff --git a/home/packages/gui/nomacs.nix b/home/packages/gui/nomacs.nix
new file mode 100644
index 0000000..33d003c
--- /dev/null
+++ b/home/packages/gui/nomacs.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.applications.nomacs;
+in {
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      nomacs
+    ];
+  };
+}
diff --git a/home/packages/gui/stremio.nix b/home/packages/gui/stremio.nix
index 1ad2144..4147642 100644
--- a/home/packages/gui/stremio.nix
+++ b/home/packages/gui/stremio.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.stremio;
+  cfg = osConfig.myOptions.home-manager.programs.applications.stremio;
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/programs/graphical/apps/spotify/default.nix b/home/programs/graphical/apps/spotify/default.nix
index 435e586..3f6620f 100644
--- a/home/programs/graphical/apps/spotify/default.nix
+++ b/home/programs/graphical/apps/spotify/default.nix
@@ -7,7 +7,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.spotify;
+  cfg = osConfig.myOptions.home-manager.programs.applications.spotify;
   spicePkgs = inputs.spicetify.packages.${pkgs.system}.default;
 in {
   imports = [inputs.spicetify.homeManagerModule];
diff --git a/home/programs/graphical/apps/vesktop/default.nix b/home/programs/graphical/apps/vesktop/default.nix
index 8ef56eb..87f563e 100644
--- a/home/programs/graphical/apps/vesktop/default.nix
+++ b/home/programs/graphical/apps/vesktop/default.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.vesktop;
+  cfg = osConfig.myOptions.home-manager.programs.applications.vesktop;
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [ vesktop ];
diff --git a/home/programs/graphical/bars/eww/default.nix b/home/programs/graphical/bars/eww/default.nix
index 896f025..3988409 100644
--- a/home/programs/graphical/bars/eww/default.nix
+++ b/home/programs/graphical/bars/eww/default.nix
@@ -62,9 +62,9 @@ in {
         Install.WantedBy = [ "graphical-session.target" ];
       };
 
-      "eww-window@" = {
+      "eww-window-bar0" = {
         Unit = {
-          Description = "Open %I eww (ElKowar's Wacky Widgets) window";
+          Description = "Open bar0 eww (ElKowar's Wacky Widgets) window";
           After = [ "eww.service" ];
           PartOf = [ "graphical-session.target" ];
         };
@@ -73,8 +73,8 @@ in {
           Type = "oneshot";
           RemainAfterExit = true;
           ExecStartPre = "${pkgs.eww}/bin/eww ping";
-          ExecStart = "${pkgs.eww}/bin/eww open %i";
-          ExecStop = "${pkgs.eww}/bin/eww close %i";
+          ExecStart = "${pkgs.eww}/bin/eww open bar0";
+          ExecStop = "${pkgs.eww}/bin/eww close bar0";
           Restart = "on-failure";
         };
 
diff --git a/hosts/herugrim/default.nix b/hosts/herugrim/default.nix
index be8acf2..5872cd2 100644
--- a/hosts/herugrim/default.nix
+++ b/hosts/herugrim/default.nix
@@ -101,8 +101,9 @@
           mullvad-browser.enable = true;
           schizofox.enable = true;
         };
-
-        spotify.enable = true;
+        applications = {
+          spotify.enable = true;
+        };
       };
     };
   };
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index bc26a3c..1052e46 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -166,11 +166,14 @@
           fastfetch.enable = true;
           hyfetch.enable = true;
         };
-        spotify.enable = true;
-        stremio.enable = true;
-        vesktop = {
-          enable = true;
-          autoStart = true;
+        applications = {
+          spotify.enable = true;
+          stremio.enable = true;
+          vesktop = {
+            enable = true;
+            autoStart = true;
+          };
+          nomacs.enable = true;
         };
       };
     };
diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix
index 422399e..4a91423 100644
--- a/options/home/programs/default.nix
+++ b/options/home/programs/default.nix
@@ -26,11 +26,14 @@ in
       schizofox.enable = mkEnableOption "Schizophrenic version of Firefox browser";
     };
 
-    spotify.enable = mkEnableOption "Spotify";
-    stremio.enable = mkEnableOption "Stremio free media center";
-    vesktop = {
-      enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
-      autoStart = mkEnableOption "Auto-Start for Vesktop";
+    applications = {
+      spotify.enable = mkEnableOption "Spotify";
+      stremio.enable = mkEnableOption "Stremio free media center";
+      vesktop = {
+        enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
+        autoStart = mkEnableOption "Auto-Start for Vesktop";
+      };
+      nomacs.enable = mkEnableOption "Nomacs (Qt-based image viewer)";
     };
 
     tools = {