diff --git a/home/packages/gui/default.nix b/home/packages/gui/default.nix
index 9c7f80c..83ea62f 100644
--- a/home/packages/gui/default.nix
+++ b/home/packages/gui/default.nix
@@ -2,6 +2,5 @@ _: {
   imports = [
     ./wayland.nix
     ./stremio.nix
-    ./nomacs.nix
   ];
 }
diff --git a/home/packages/gui/nomacs.nix b/home/packages/gui/nomacs.nix
deleted file mode 100644
index 33d003c..0000000
--- a/home/packages/gui/nomacs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  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 4147642..1ad2144 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.applications.stremio;
+  cfg = osConfig.myOptions.home-manager.programs.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 3f6620f..435e586 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.applications.spotify;
+  cfg = osConfig.myOptions.home-manager.programs.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 87f563e..8ef56eb 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.applications.vesktop;
+  cfg = osConfig.myOptions.home-manager.programs.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 3988409..896f025 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-bar0" = {
+      "eww-window@" = {
         Unit = {
-          Description = "Open bar0 eww (ElKowar's Wacky Widgets) window";
+          Description = "Open %I 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 bar0";
-          ExecStop = "${pkgs.eww}/bin/eww close bar0";
+          ExecStart = "${pkgs.eww}/bin/eww open %i";
+          ExecStop = "${pkgs.eww}/bin/eww close %i";
           Restart = "on-failure";
         };
 
diff --git a/hosts/herugrim/default.nix b/hosts/herugrim/default.nix
index 5872cd2..be8acf2 100644
--- a/hosts/herugrim/default.nix
+++ b/hosts/herugrim/default.nix
@@ -101,9 +101,8 @@
           mullvad-browser.enable = true;
           schizofox.enable = true;
         };
-        applications = {
-          spotify.enable = true;
-        };
+
+        spotify.enable = true;
       };
     };
   };
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index 1052e46..bc26a3c 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -166,14 +166,11 @@
           fastfetch.enable = true;
           hyfetch.enable = true;
         };
-        applications = {
-          spotify.enable = true;
-          stremio.enable = true;
-          vesktop = {
-            enable = true;
-            autoStart = true;
-          };
-          nomacs.enable = true;
+        spotify.enable = true;
+        stremio.enable = true;
+        vesktop = {
+          enable = true;
+          autoStart = true;
         };
       };
     };
diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix
index 4a91423..422399e 100644
--- a/options/home/programs/default.nix
+++ b/options/home/programs/default.nix
@@ -26,14 +26,11 @@ in
       schizofox.enable = mkEnableOption "Schizophrenic version of Firefox browser";
     };
 
-    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)";
+    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";
     };
 
     tools = {