diff --git a/home/default.nix b/home/default.nix
index 46e10b4..c886594 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,7 +3,7 @@
   ...
 }:
 let
-  colors = {
+  colors_light = {
     background = "fdf6e3";
     foreground = "657b83";
     regular0 = "eee8d5"; # background darker
@@ -23,6 +23,29 @@ let
     bright6 = "586e75"; # pretty dark grey
     bright7 = "002b36"; # dark navy blue
   };
+  colors_dark = {
+    cursor = "002b36 93a1a1";
+    background = "002b36";
+    foreground = "839496";
+    regular0 = "073642";
+    regular1 = "dc322f";
+    regular2 = "859900";
+    regular3 = "b58900";
+    regular4 = "268bd2";
+    regular5 = "d33682";
+    regular6 = "2aa198";
+    regular7 = "eee8d5";
+    bright0 = "002b36";
+    bright1 = "cb4b16";
+    bright2 = "586e75";
+    bright3 = "657b83";
+    bright4 = "839496";
+    bright5 = "6c71c4";
+    bright6 = "93a1a1";
+    bright7 = "fdf6e3";
+    selection-foreground = "93a1a1";
+    selection-background = "073642";
+  };
 in
 {
   imports = [
@@ -115,11 +138,10 @@ in
     enable = true;
     server.enable = false;
     settings = {
-      inherit colors;
+      colors = colors_dark;
       main = {
         shell = "tmux";
-        font = "Jetbrains Mono:size=8";
-        dpi-aware = true;
+        dpi-aware = false;
       };
       mouse.hide-when-typing = true;
       csd.preferred = "server";
diff --git a/home/git.nix b/home/git.nix
index c7006b6..3bed5cb 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -46,7 +46,7 @@ in
         navigate = true; # use n and N to move between diff sections
         side-by-side = false;
         line-numbers = true;
-        light = true;
+        light = false;
       };
       diff = {
         renames = "copies";
diff --git a/home/helix/config/config.toml b/home/helix/config/config.toml
index 41cf786..9f37e3f 100644
--- a/home/helix/config/config.toml
+++ b/home/helix/config/config.toml
@@ -1,4 +1,4 @@
-theme = "solarized_light"
+theme = "solarized_dark"
 
 [editor]
 line-number = "relative"
diff --git a/home/pkgs.nix b/home/pkgs.nix
index 9bb42dc..71c9472 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -29,7 +29,6 @@ with pkgs;
   iproute2
   iputils # tracepath
   irssi
-  jetbrains-mono
   jq
   keepassxc
   krita
diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix
index 0d0dc81..37726c5 100644
--- a/nixos/stolas/default.nix
+++ b/nixos/stolas/default.nix
@@ -52,6 +52,29 @@
     pkgs.fw-ectool
   ];
 
+  fonts = {
+    enableDefaultPackages = true;
+    packages = with pkgs; [
+      fira
+      fira-code
+      fira-code-symbols
+      fira-mono
+      font-awesome
+      uw-ttyp0
+    ];
+    fontconfig = {
+      enable = true;
+      allowBitmaps = true;
+      antialias = true;
+      useEmbeddedBitmaps = true;
+      defaultFonts.monospace = [
+        "Ttyp0"
+        "Siji"
+        "Symbola"
+      ];
+    };
+  };
+
   hardware = {
     # NOTE: hardware.framework.enableKmod requires kernel patching, but enables access to some EC features
     bluetooth.enable = true;