diff --git a/options/custom/containers/adguardhome.nix b/options/custom/containers/adguardhome.nix
index 92e1cb8..a640dab 100644
--- a/options/custom/containers/adguardhome.nix
+++ b/options/custom/containers/adguardhome.nix
@@ -6,8 +6,8 @@
 with lib; let
   cfg = config.custom.containers.adguardhome;
 in {
-  options = {
-    custom.containers.adguardhome.enable = mkOption {default = false;};
+  options.custom.containers.adguardhome = {
+    enable = mkOption {default = false;};
   };
 
   config = mkIf cfg.enable {
diff --git a/options/custom/default.nix b/options/custom/default.nix
index b606b4a..3d177bd 100644
--- a/options/custom/default.nix
+++ b/options/custom/default.nix
@@ -29,10 +29,7 @@ in {
     ultrawide = mkOption {default = cfg.width * 9 / 16 > cfg.height;}; # Wider than 16:9
     hidpi = mkOption {default = cfg.scale > 1;};
     scale = mkOption {default = 1;};
-
-    # TODO: Use option for border size
     border = mkOption {default = 2;};
-
     gap = mkOption {default = 20;};
     padding = mkOption {default = 51;}; # ?? journalctl --user -u waybar.service | grep height:
     rounding = mkOption {default = 15;};
diff --git a/options/custom/scripts/default.nix b/options/custom/scripts/default.nix
index dd18841..f82f729 100644
--- a/options/custom/scripts/default.nix
+++ b/options/custom/scripts/default.nix
@@ -5,10 +5,8 @@
   ...
 }:
 with lib; let
-  # Use packages from local derivation
   git = config.home-manager.users.${config.custom.username}.programs.git.package;
-  hyprland =
-    config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.finalPackage;
+  hyprland = config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.finalPackage;
   walker = config.home-manager.users.${config.custom.username}.programs.walker.package;
   wofi = config.home-manager.users.${config.custom.username}.programs.wofi.package;
 in {
diff --git a/options/custom/services/flatpak.nix b/options/custom/services/flatpak.nix
index 73ea920..10c4590 100644
--- a/options/custom/services/flatpak.nix
+++ b/options/custom/services/flatpak.nix
@@ -1,8 +1,6 @@
 {
   config,
-  inputs,
   lib,
-  pkgs,
   ...
 }:
 with lib; let