diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix
index 2cafdd9..79e5e55 100644
--- a/modules/home/appearance/base/default.nix
+++ b/modules/home/appearance/base/default.nix
@@ -10,6 +10,7 @@ let
 
   cfg = config.marleyos.appearance.base;
   inherit (config.marleyos.theme) colors;
+  inherit (config.marleyos) isDesktop;
 in
 {
   options.marleyos.appearance.base.enable = mkEnableOption "base";
@@ -22,22 +23,26 @@ in
     rose-pine.pointerCursor = mkIf colors.isRosePine enabled;
 
     marleyos.theme = {
-      default = "dark";
+      colors = {
+        default = "dark";
 
-      dark = {
-        base = "rose-pine";
-        flavor = "main";
+        dark = {
+          base = "rose-pine";
+          flavor = "main";
+        };
+
+        light = {
+          base = "rose-pine";
+          flavor = "dawn";
+        };
       };
 
-      light = {
-        base = "rose-pine";
-        flavor = "dawn";
+      icons = {
+        package = pkgs.kora-icon-theme;
+        name = "kora";
       };
-    };
 
-    marleyos.theme.icons = {
-      package = pkgs.kora-icon-theme;
-      name = "kora";
+      pinentry = if isDesktop then pkgs.pinentry-gtk2 else pkgs.pinentry-curses;
     };
 
     # TODO: package font with harfbuzz features.